godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix C4724: potential mod by 0 warnings.

This commit is contained in:
Marcel Admiraal 2020-05-20 12:32:35 +01:00
parent b6c551e864
commit dac3504cc3
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/2d/collision_polygon_2d.cpp
View File

@ -65,9 +65,10 @@ void CollisionPolygon2D::_build_polygon() {
segments.resize(polygon.size() * 2); segments.resize(polygon.size() * 2);
PoolVector<Vector2>::Write w = segments.write(); PoolVector<Vector2>::Write w = segments.write();
for (int i = 0; i < polygon.size(); i++) { int polygon_count = polygon.size();
for (int i = 0; i < polygon_count; i++) {
w[(i << 1) + 0] = polygon[i]; w[(i << 1) + 0] = polygon[i];
w[(i << 1) + 1] = polygon[(i + 1) % polygon.size()]; w[(i << 1) + 1] = polygon[(i + 1) % polygon_count];
} }
w.release(); w.release();
@ -139,10 +140,11 @@ void CollisionPolygon2D::_notification(int p_what) {
break; break;
} }
for (int i = 0; i < polygon.size(); i++) { int polygon_count = polygon.size();
for (int i = 0; i < polygon_count; i++) {
Vector2 p = polygon[i]; Vector2 p = polygon[i];
Vector2 n = polygon[(i + 1) % polygon.size()]; Vector2 n = polygon[(i + 1) % polygon_count];
// draw line with width <= 1, so it does not scale with zoom and break pixel exact editing // draw line with width <= 1, so it does not scale with zoom and break pixel exact editing
draw_line(p, n, Color(0.9, 0.2, 0.0, 0.8), 1); draw_line(p, n, Color(0.9, 0.2, 0.0, 0.8), 1);
} }

45
scene/3d/navigation.cpp
View File

@ -147,12 +147,12 @@ void Navigation::_navmesh_unlink(int p_id) {
Polygon &p = E->get(); Polygon &p = E->get();
int ec = p.edges.size(); int edge_count = p.edges.size();
Polygon::Edge *edges = p.edges.ptrw(); Polygon::Edge *edges = p.edges.ptrw();
for (int i = 0; i < ec; i++) { for (int i = 0; i < edge_count; i++) {
int next = (i + 1) % ec;
int next = (i + 1) % edge_count;
EdgeKey ek(edges[i].point, edges[next].point); EdgeKey ek(edges[i].point, edges[next].point);
Map<EdgeKey, Connection>::Element *C = connections.find(ek); Map<EdgeKey, Connection>::Element *C = connections.find(ek);
@ -249,11 +249,12 @@ void Navigation::_clip_path(Vector<Vector3> &path, Polygon *from_poly, const Vec
cut_plane.d = cut_plane.normal.dot(from); cut_plane.d = cut_plane.normal.dot(from);
while (from_poly != p_to_poly) { while (from_poly != p_to_poly) {
int edge_count = from_poly->edges.size();
ERR_FAIL_COND_MSG(edge_count == 0, "Polygon has no edges.");
int pe = from_poly->prev_edge; int pe = from_poly->prev_edge;
ERR_FAIL_COND(from_poly->edges.size() == 0); int next = (pe + 1) % edge_count;
Vector3 a = _get_vertex(from_poly->edges[pe].point); Vector3 a = _get_vertex(from_poly->edges[pe].point);
Vector3 b = _get_vertex(from_poly->edges[(pe + 1) % from_poly->edges.size()].point); Vector3 b = _get_vertex(from_poly->edges[next].point);
from_poly = from_poly->edges[pe].C; from_poly = from_poly->edges[pe].C;
ERR_FAIL_COND(!from_poly); ERR_FAIL_COND(!from_poly);
@ -262,7 +263,7 @@ void Navigation::_clip_path(Vector<Vector3> &path, Polygon *from_poly, const Vec
Vector3 inters; Vector3 inters;
if (cut_plane.intersects_segment(a, b, &inters)) { if (cut_plane.intersects_segment(a, b, &inters)) {
if (inters.distance_to(p_to_point) > CMP_EPSILON && inters.distance_to(from) > CMP_EPSILON) { if (inters.distance_to(p_to_point) > CMP_EPSILON && inters.distance_to(path[path.size() - 1]) > CMP_EPSILON) {
path.push_back(inters); path.push_back(inters);
} }
} }
@ -327,16 +328,18 @@ Vector<Vector3> Navigation::get_simple_path(const Vector3 &p_start, const Vector
bool found_route = false; bool found_route = false;
List<Polygon *> open_list; List<Polygon *> open_list;
int begin_edge_count = begin_poly->edges.size();
for (int i = 0; i < begin_poly->edges.size(); i++) { for (int i = 0; i < begin_edge_count; i++) {
if (begin_poly->edges[i].C) { if (begin_poly->edges[i].C) {
begin_poly->edges[i].C->prev_edge = begin_poly->edges[i].C_edge; begin_poly->edges[i].C->prev_edge = begin_poly->edges[i].C_edge;
#ifdef USE_ENTRY_POINT #ifdef USE_ENTRY_POINT
int next = (i + 1) % begin_edge_count;
Vector3 edge[2] = { Vector3 edge[2] = {
_get_vertex(begin_poly->edges[i].point), _get_vertex(begin_poly->edges[i].point),
_get_vertex(begin_poly->edges[(i + 1) % begin_poly->edges.size()].point) _get_vertex(begin_poly->edges[next].point)
}; };
Vector3 entry = Geometry::get_closest_point_to_segment(begin_poly->entry, edge); Vector3 entry = Geometry::get_closest_point_to_segment(begin_poly->entry, edge);
@ -385,7 +388,8 @@ Vector<Vector3> Navigation::get_simple_path(const Vector3 &p_start, const Vector
break; break;
} }
for (int i = 0; i < p->edges.size(); i++) { int edge_count = p->edges.size();
for (int i = 0; i < edge_count; i++) {
Polygon::Edge &e = p->edges.write[i]; Polygon::Edge &e = p->edges.write[i];
@ -393,9 +397,10 @@ Vector<Vector3> Navigation::get_simple_path(const Vector3 &p_start, const Vector
continue; continue;
#ifdef USE_ENTRY_POINT #ifdef USE_ENTRY_POINT
int next = (i + 1) % edge_count;
Vector3 edge[2] = { Vector3 edge[2] = {
_get_vertex(p->edges[i].point), _get_vertex(p->edges[i].point),
_get_vertex(p->edges[(i + 1) % p->edges.size()].point) _get_vertex(p->edges[next].point)
}; };
Vector3 entry = Geometry::get_closest_point_to_segment(p->entry, edge); Vector3 entry = Geometry::get_closest_point_to_segment(p->entry, edge);
@ -457,9 +462,10 @@ Vector<Vector3> Navigation::get_simple_path(const Vector3 &p_start, const Vector
left = begin_point; left = begin_point;
right = begin_point; right = begin_point;
} else { } else {
int edge_count = p->edges.size();
ERR_FAIL_COND_V_MSG(edge_count == 0, Vector<Vector3>(), "Polygon has no edges.");
int prev = p->prev_edge; int prev = p->prev_edge;
ERR_FAIL_COND_V(p->edges.size() == 0, Vector<Vector3>()); int prev_n = (p->prev_edge + 1) % edge_count;
int prev_n = (p->prev_edge + 1) % p->edges.size();
left = _get_vertex(p->edges[prev].point); left = _get_vertex(p->edges[prev].point);
right = _get_vertex(p->edges[prev_n].point); right = _get_vertex(p->edges[prev_n].point);
@ -531,8 +537,9 @@ Vector<Vector3> Navigation::get_simple_path(const Vector3 &p_start, const Vector
#ifdef USE_ENTRY_POINT #ifdef USE_ENTRY_POINT
Vector3 point = p->entry; Vector3 point = p->entry;
#else #else
ERR_FAIL_COND_V(p->edges.size() == 0, Vector<Vector3>()); int edge_count = p->edges.size();
int prev_n = (p->prev_edge + 1) % p->edges.size(); ERR_FAIL_COND_V_MSG(edge_count == 0, Vector<Vector3>(), "Polygon has no edges.");
int prev_n = (p->prev_edge + 1) % edge_count;
Vector3 point = (_get_vertex(p->edges[prev].point) + _get_vertex(p->edges[prev_n].point)) * 0.5; Vector3 point = (_get_vertex(p->edges[prev].point) + _get_vertex(p->edges[prev_n].point)) * 0.5;
#endif #endif
path.push_back(point); path.push_back(point);
@ -585,12 +592,12 @@ Vector3 Navigation::get_closest_point_to_segment(const Vector3 &p_from, const Ve
if (!use_collision) { if (!use_collision) {
for (int i = 0; i < p.edges.size(); i++) { int edge_count = p.edges.size();
for (int i = 0; i < edge_count; i++) {
Vector3 a, b; Vector3 a, b;
int next = (i + 1) % edge_count;
ERR_FAIL_COND_V(p.edges.size() == 0, Vector3()); Geometry::get_closest_points_between_segments(p_from, p_to, _get_vertex(p.edges[i].point), _get_vertex(p.edges[next].point), a, b);
Geometry::get_closest_points_between_segments(p_from, p_to, _get_vertex(p.edges[i].point), _get_vertex(p.edges[(i + 1) % p.edges.size()].point), a, b);
float d = a.distance_to(b); float d = a.distance_to(b);
if (d < closest_point_d) { if (d < closest_point_d) {