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 /scene/resources/tile_set.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 'scene/resources/tile_set.cpp')
| -rw-r--r-- | scene/resources/tile_set.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index c17b6f8817..6992360df7 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -29,8 +29,10 @@ /*************************************************************************/ #include "tile_set.h" + #include "core/array.h" #include "core/engine.h" +#include "core/math/geometry_2d.h" bool TileSet::_set(const StringName &p_name, const Variant &p_value) { String n = p_name; @@ -1033,7 +1035,7 @@ void TileSet::_decompose_convex_shape(Ref<Shape2D> p_shape) { if (!convex.is_valid()) { return; } - Vector<Vector<Vector2>> decomp = Geometry::decompose_polygon_in_convex(convex->get_points()); + Vector<Vector<Vector2>> decomp = Geometry2D::decompose_polygon_in_convex(convex->get_points()); if (decomp.size() > 1) { Array sub_shapes; for (int i = 0; i < decomp.size(); i++) { |