diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-29 12:10:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-29 12:10:37 +0200 |
commit | 1620669f4e37c21fa45991a9bc37410014845419 (patch) | |
tree | cb9162147bba330ff007c12b349dba070b385a3a /modules/csg/csg_shape.cpp | |
parent | 6aa399be59b886e1c8c371f4ceb09f41c86a0584 (diff) | |
parent | 69d5de632e04d48a247d50c1dc2c09322129c73a (diff) | |
download | redot-engine-1620669f4e37c21fa45991a9bc37410014845419.tar.gz |
Merge pull request #39051 from Xrayez/geometry-split
Split `Geometry` singleton into `Geometry2D` and `Geometry3D`
Diffstat (limited to 'modules/csg/csg_shape.cpp')
-rw-r--r-- | modules/csg/csg_shape.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index 7df65b04c4..cea006364f 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "csg_shape.h" +#include "core/math/geometry_2d.h" #include "scene/3d/path_3d.h" void CSGShape3D::set_use_collision(bool p_enable) { @@ -1728,7 +1729,7 @@ CSGBrush *CSGPolygon3D::_build_brush() { final_polygon.invert(); } - Vector<int> triangles = Geometry::triangulate_polygon(final_polygon); + Vector<int> triangles = Geometry2D::triangulate_polygon(final_polygon); if (triangles.size() < 3) { return nullptr; |