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

Merge pull request #32670 from aaronfranke/mono-plane 

[Mono] Change Plane intersect methods to return nullable Vector3
This commit is contained in:
Rémi Verschelde 2019-10-23 21:44:05 +02:00 committed by GitHub
parent 2408e214a7 643874f8ca
commit e96319c7f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/math/plane.cpp
View File

@ -91,7 +91,7 @@ bool Plane::intersect_3(const Plane &p_plane1, const Plane &p_plane2, Vector3 *r
real_t denom = vec3_cross(normal0, normal1).dot(normal2);
if (ABS(denom) <= CMP_EPSILON)
if (Math::is_zero_approx(denom))
return false;
if (r_result) {

23
modules/mono/glue/Managed/Files/Plane.cs
View File

@ -82,12 +82,12 @@ namespace Godot
return Mathf.Abs(dist) <= epsilon;
}
public Vector3 Intersect3(Plane b, Plane c)
public Vector3? Intersect3(Plane b, Plane c)
{
real_t denom = _normal.Cross(b._normal).Dot(c._normal);
if (Mathf.Abs(denom) <= Mathf.Epsilon)
return new Vector3();
if (Mathf.IsZeroApprox(denom))
return null;
Vector3 result = b._normal.Cross(c._normal) * D +
c._normal.Cross(_normal) * b.D +
@ -96,34 +96,35 @@ namespace Godot
return result / denom;
}
public Vector3 IntersectRay(Vector3 from, Vector3 dir)
public Vector3? IntersectRay(Vector3 from, Vector3 dir)
{
real_t den = _normal.Dot(dir);
if (Mathf.Abs(den) <= Mathf.Epsilon)
return new Vector3();
if (Mathf.IsZeroApprox(den))
return null;
real_t dist = (_normal.Dot(from) - D) / den;
// This is a ray, before the emitting pos (from) does not exist
if (dist > Mathf.Epsilon)
return new Vector3();
return null;
return from + dir * -dist;
}
public Vector3 IntersectSegment(Vector3 begin, Vector3 end)
public Vector3? IntersectSegment(Vector3 begin, Vector3 end)
{
Vector3 segment = begin - end;
real_t den = _normal.Dot(segment);
if (Mathf.Abs(den) <= Mathf.Epsilon)
return new Vector3();
if (Mathf.IsZeroApprox(den))
return null;
real_t dist = (_normal.Dot(begin) - D) / den;
// Only allow dist to be in the range of 0 to 1, with tolerance.
if (dist < -Mathf.Epsilon || dist > 1.0f + Mathf.Epsilon)
return new Vector3();
return null;
return begin + segment * -dist;
}