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

Fix Visual Studio C4724 warning (potential mod by 0)

This commit is contained in:
Rémi Verschelde 2020-05-19 10:19:08 +02:00
parent e6a3499bef
commit f390749439
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/3d/navigation.cpp
View File

@ -251,6 +251,7 @@ void Navigation::_clip_path(Vector<Vector3> &path, Polygon *from_poly, const Vec
while (from_poly != p_to_poly) { while (from_poly != p_to_poly) {
int pe = from_poly->prev_edge; int pe = from_poly->prev_edge;
ERR_FAIL_COND(from_poly->edges.size() == 0);
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[(pe + 1) % from_poly->edges.size()].point);
@ -261,7 +262,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(path[path.size() - 1]) > CMP_EPSILON) { if (inters.distance_to(p_to_point) > CMP_EPSILON && inters.distance_to(from) > CMP_EPSILON) {
path.push_back(inters); path.push_back(inters);
} }
} }
@ -457,6 +458,7 @@ Vector<Vector3> Navigation::get_simple_path(const Vector3 &p_start, const Vector
right = begin_point; right = begin_point;
} else { } else {
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) % p->edges.size(); 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);
@ -529,6 +531,7 @@ 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 prev_n = (p->prev_edge + 1) % p->edges.size(); int prev_n = (p->prev_edge + 1) % p->edges.size();
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
@ -586,6 +589,7 @@ Vector3 Navigation::get_closest_point_to_segment(const Vector3 &p_from, const Ve
Vector3 a, b; Vector3 a, b;
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[(i + 1) % p.edges.size()].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);