Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-26 21:57:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed the Polygon struct from NavigationPolygon.

Browse Source
This commit is contained in:
Relintai 2023-06-05 12:48:57 +02:00
parent 0bfa40bb09
commit 712eb8eb8a
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/resources/navigation_polygon.cpp
View File

@ -97,9 +97,7 @@ PoolVector<Vector2> NavigationPolygon::get_vertices() const {
}
void NavigationPolygon::add_polygon(const Vector<int> &p_polygon) {
Polygon polygon;
polygon.indices = p_polygon;
polygons.push_back(polygon);
polygons.push_back(p_polygon);
{
MutexLock lock(navmesh_generation);
navmesh.unref();
@ -117,7 +115,7 @@ int NavigationPolygon::get_polygon_count() const {
Vector<int> NavigationPolygon::get_polygon(int p_idx) {
ERR_FAIL_INDEX_V(p_idx, polygons.size(), Vector<int>());
return polygons[p_idx].indices;
return polygons[p_idx];
}
void NavigationPolygon::clear_polygons() {
@ -270,7 +268,7 @@ void NavigationPolygon::make_polygons_from_outlines() {
for (List<TriangulatorPoly>::Element *I = out_poly.front(); I; I = I->next()) {
TriangulatorPoly &tp = I->get();
struct Polygon p;
Vector<int> p;
for (int64_t i = 0; i < tp.GetNumPoints(); i++) {
RBMap<Vector2, int>::Element *E = points.find(tp[i]);
@ -278,7 +276,7 @@ void NavigationPolygon::make_polygons_from_outlines() {
E = points.insert(tp[i], vertices.size());
vertices.push_back(tp[i]);
}
p.indices.push_back(E->get());
p.push_back(E->get());
}
polygons.push_back(p);
@ -301,7 +299,7 @@ void NavigationPolygon::_set_polygons(const Array &p_array) {
}
polygons.resize(p_array.size());
for (int i = 0; i < p_array.size(); i++) {
polygons.write[i].indices = p_array[i];
polygons.write[i] = p_array[i];
}
}
@ -309,7 +307,7 @@ Array NavigationPolygon::_get_polygons() const {
Array ret;
ret.resize(polygons.size());
for (int i = 0; i < ret.size(); i++) {
ret[i] = polygons[i].indices;
ret[i] = polygons[i];
}
return ret;

5
scene/resources/navigation_polygon.h
View File

@ -79,10 +79,7 @@ protected:
private:
PoolVector<Vector2> vertices;
struct Polygon {
Vector<int> indices;
};
Vector<Polygon> polygons;
Vector<Vector<int>> polygons;
Vector<PoolVector<Vector2>> outlines;
mutable Rect2 item_rect;