Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-25 20:33:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24964 from godotengine/revert-24897-master

Browse Source 
Revert "fixed invalid implementation of Plane::intersects_segment and Plane::intersects_ray"
This commit is contained in:
Rémi Verschelde 2019-01-13 11:27:47 +01:00 committed by GitHub
commit 14c2cf01c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/math/plane.cpp
View File

@ -115,14 +115,15 @@ bool Plane::intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3
return false;
}
real_t dist = (-normal.dot(p_from) - d) / den;
real_t dist = (normal.dot(p_from) - d) / den;
//printf("dist is %i\n",dist);
if (dist < -CMP_EPSILON) { //this is a ray, before the emitting pos (p_from) doesn't exist
if (dist > CMP_EPSILON) { //this is a ray, before the emitting pos (p_from) doesn't exist
return false;
}
dist = -dist;
*p_intersection = p_from + segment * dist;
return true;
@ -139,7 +140,7 @@ bool Plane::intersects_segment(const Vector3 &p_begin, const Vector3 &p_end, Vec
return false;
}
real_t dist = (-normal.dot(p_begin) - d) / den;
real_t dist = (normal.dot(p_begin) - d) / den;
//printf("dist is %i\n",dist);
if (dist < -CMP_EPSILON || dist > (1.0 + CMP_EPSILON)) {
@ -147,6 +148,7 @@ bool Plane::intersects_segment(const Vector3 &p_begin, const Vector3 &p_end, Vec
return false;
}
dist = -dist;
*p_intersection = p_begin + segment * dist;
return true;