asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24897 from GlaDos28/master

Browse source 
fixed invalid implementation of Plane::intersects_segment and Plane::intersects_ray
This commit is contained in:
Rémi Verschelde 2019-01-11 22:56:03 +01:00 committed by GitHub
commit 3652442a92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/math/plane.cpp
View file

@ -115,15 +115,14 @@ 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;
@ -140,7 +139,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)) {
@ -148,7 +147,6 @@ 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;