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 /servers/rendering/rendering_server_canvas.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 'servers/rendering/rendering_server_canvas.cpp')
-rw-r--r-- | servers/rendering/rendering_server_canvas.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/servers/rendering/rendering_server_canvas.cpp b/servers/rendering/rendering_server_canvas.cpp index 0c9290a765..5c0741bb3b 100644 --- a/servers/rendering/rendering_server_canvas.cpp +++ b/servers/rendering/rendering_server_canvas.cpp @@ -29,6 +29,8 @@ /*************************************************************************/ #include "rendering_server_canvas.h" + +#include "core/math/geometry_2d.h" #include "rendering_server_globals.h" #include "rendering_server_raster.h" #include "rendering_server_viewport.h" @@ -774,7 +776,7 @@ void RenderingServerCanvas::canvas_item_add_polygon(RID p_item, const Vector<Poi ERR_FAIL_COND(color_size != 0 && color_size != 1 && color_size != pointcount); ERR_FAIL_COND(uv_size != 0 && (uv_size != pointcount)); #endif - Vector<int> indices = Geometry::triangulate_polygon(p_points); + Vector<int> indices = Geometry2D::triangulate_polygon(p_points); ERR_FAIL_COND_MSG(indices.empty(), "Invalid polygon data, triangulation failed."); Item::CommandPolygon *polygon = canvas_item->alloc_command<Item::CommandPolygon>(); |