Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused navigation polygon properties #93485

Merged
merged 1 commit into from
Jun 24, 2024
Merged

Remove unused navigation polygon properties #93485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions modules/navigation/nav_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,13 +1127,6 @@ void NavMap::sync() {
new_polygon.points.push_back({ closest_end_point, get_point_key(closest_end_point) });
new_polygon.points.push_back({ closest_end_point, get_point_key(closest_end_point) });

Vector3 center;
for (int p = 0; p < 4; ++p) {
center += new_polygon.points[p].pos;
}
new_polygon.center = center / real_t(new_polygon.points.size());
new_polygon.clockwise = true;

// Setup connections to go forward in the link.
{
gd::Edge::Connection entry_connection;
Expand Down
17 changes: 0 additions & 17 deletions modules/navigation/nav_region.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,6 @@ void NavRegion::update_polygons() {
polygon.surface_area = _new_polygon_surface_area;
_new_region_surface_area += _new_polygon_surface_area;

Vector3 polygon_center;
real_t sum(0);

for (int j(0); j < navigation_mesh_polygon_size; j++) {
int idx = indices[j];
if (idx < 0 || idx >= len) {
Expand All @@ -290,25 +287,11 @@ void NavRegion::update_polygons() {
Vector3 point_position = transform.xform(vertices_r[idx]);
polygon.points[j].pos = point_position;
polygon.points[j].key = map->get_point_key(point_position);

polygon_center += point_position; // Composing the center of the polygon

if (j >= 2) {
Vector3 epa = transform.xform(vertices_r[indices[j - 2]]);
Vector3 epb = transform.xform(vertices_r[indices[j - 1]]);

sum += map->get_up().dot((epb - epa).cross(point_position - epa));
}
}

if (!valid) {
ERR_BREAK_MSG(!valid, "The navigation mesh set in this region is not valid!");
}

polygon.clockwise = sum > 0;
if (!navigation_mesh_polygon.is_empty()) {
polygon.center = polygon_center / real_t(navigation_mesh_polygon.size());
}
}

surface_area = _new_region_surface_area;
Expand Down
6 changes: 0 additions & 6 deletions modules/navigation/nav_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,9 @@ struct Polygon {
/// The points of this `Polygon`
LocalVector<Point> points;

/// Are the points clockwise?
bool clockwise;

/// The edges of this `Polygon`
LocalVector<Edge> edges;

/// The center of this `Polygon`
Vector3 center;

real_t surface_area = 0.0;
};

Expand Down
Loading