diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-11 16:09:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 16:09:02 +0200 |
| commit | b8438a21223b931683883b7d50d173fb45729ccb (patch) | |
| tree | a189f49f22118041d4e69cce1bb57946b3ccb44a /core/math | |
| parent | 32133a11b56761df99579ad96ee29a47d2aed6b4 (diff) | |
| parent | 83b630b8c27fc3307eba36fa2b6193690bd18e4c (diff) | |
Merge pull request #38663 from akien-mga/thirdparty-new-lightmapper
thirdparty: Cleanup after #38386, document provenance and copyright
Diffstat (limited to 'core/math')
| -rw-r--r-- | core/math/delaunay_2d.h (renamed from core/math/delaunay.h) | 8 | ||||
| -rw-r--r-- | core/math/delaunay_3d.h | 3 | ||||
| -rw-r--r-- | core/math/geometry.cpp | 3 | ||||
| -rw-r--r-- | core/math/geometry.h | 3 | ||||
| -rw-r--r-- | core/math/r128.cpp | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/core/math/delaunay.h b/core/math/delaunay_2d.h index 6f19f3e58a..b8252e9d16 100644 --- a/core/math/delaunay.h +++ b/core/math/delaunay_2d.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* delaunay.h */ +/* delaunay_2d.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef DELAUNAY_H -#define DELAUNAY_H +#ifndef DELAUNAY_2D_H +#define DELAUNAY_2D_H #include "core/math/rect2.h" @@ -170,4 +170,4 @@ public: } }; -#endif // DELAUNAY_H +#endif // DELAUNAY_2D_H diff --git a/core/math/delaunay_3d.h b/core/math/delaunay_3d.h index 6280ec8071..57f3a78d35 100644 --- a/core/math/delaunay_3d.h +++ b/core/math/delaunay_3d.h @@ -10,7 +10,8 @@ #include "core/print_string.h" #include "core/variant.h" #include "core/vector.h" -#include "thirdparty/r128/r128.h" + +#include "thirdparty/misc/r128.h" class Delaunay3D { struct Simplex; diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp index 65b80856cc..b0a46036f9 100644 --- a/core/math/geometry.cpp +++ b/core/math/geometry.cpp @@ -31,10 +31,11 @@ #include "geometry.h" #include "core/print_string.h" + #include "thirdparty/misc/clipper.hpp" #include "thirdparty/misc/triangulator.h" #define STB_RECT_PACK_IMPLEMENTATION -#include "thirdparty/stb_rect_pack/stb_rect_pack.h" +#include "thirdparty/misc/stb_rect_pack.h" #define SCALE_FACTOR 100000.0 // Based on CMP_EPSILON. diff --git a/core/math/geometry.h b/core/math/geometry.h index 5a8e21d02b..45c8558fac 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -31,13 +31,12 @@ #ifndef GEOMETRY_H #define GEOMETRY_H -#include "core/math/delaunay.h" +#include "core/math/delaunay_2d.h" #include "core/math/face3.h" #include "core/math/rect2.h" #include "core/math/triangulate.h" #include "core/math/vector3.h" #include "core/object.h" - #include "core/print_string.h" #include "core/vector.h" diff --git a/core/math/r128.cpp b/core/math/r128.cpp deleted file mode 100644 index fb1e4733ee..0000000000 --- a/core/math/r128.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#define R128_IMPLEMENTATION -#include "thirdparty/r128/r128.h" |