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

Merge pull request #30382 from simonpuchert/geo-opt

Browse source 
Some small optimizations in core/math/geometry.h.
This commit is contained in:
Rémi Verschelde 2019-07-06 21:07:52 +02:00 • committed by GitHub
commit 44db85d6f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
core/math/geometry.h
View file

@ -455,16 +455,15 @@ public:
Vector3 p = p_point - p_segment[0]; Vector3 p = p_point - p_segment[0];
Vector3 n = p_segment[1] - p_segment[0]; Vector3 n = p_segment[1] - p_segment[0];
real_t l = n.length(); real_t l2 = n.length_squared();
if (l < 1e-10) if (l2 < 1e-20)
return p_segment[0]; // both points are the same, just give any return p_segment[0]; // both points are the same, just give any
n /= l;
real_t d = n.dot(p); real_t d = n.dot(p) / l2;
if (d <= 0.0) if (d <= 0.0)
return p_segment[0]; // before first point return p_segment[0]; // before first point
else if (d >= l) else if (d >= 1.0)
return p_segment[1]; // after first point return p_segment[1]; // after first point
else else
return p_segment[0] + n * d; // inside return p_segment[0] + n * d; // inside
@ -474,12 +473,11 @@ public:
Vector3 p = p_point - p_segment[0]; Vector3 p = p_point - p_segment[0];
Vector3 n = p_segment[1] - p_segment[0]; Vector3 n = p_segment[1] - p_segment[0];
real_t l = n.length(); real_t l2 = n.length_squared();
if (l < 1e-10) if (l2 < 1e-20)
return p_segment[0]; // both points are the same, just give any return p_segment[0]; // both points are the same, just give any
n /= l;
real_t d = n.dot(p); real_t d = n.dot(p) / l2;
return p_segment[0] + n * d; // inside return p_segment[0] + n * d; // inside
} }
@ -488,16 +486,15 @@ public:
Vector2 p = p_point - p_segment[0]; Vector2 p = p_point - p_segment[0];
Vector2 n = p_segment[1] - p_segment[0]; Vector2 n = p_segment[1] - p_segment[0];
real_t l = n.length(); real_t l2 = n.length_squared();
if (l < 1e-10) if (l2 < 1e-20)
return p_segment[0]; // both points are the same, just give any return p_segment[0]; // both points are the same, just give any
n /= l;
real_t d = n.dot(p); real_t d = n.dot(p) / l2;
if (d <= 0.0) if (d <= 0.0)
return p_segment[0]; // before first point return p_segment[0]; // before first point
else if (d >= l) else if (d >= 1.0)
return p_segment[1]; // after first point return p_segment[1]; // after first point
else else
return p_segment[0] + n * d; // inside return p_segment[0] + n * d; // inside
@ -521,12 +518,11 @@ public:
Vector2 p = p_point - p_segment[0]; Vector2 p = p_point - p_segment[0];
Vector2 n = p_segment[1] - p_segment[0]; Vector2 n = p_segment[1] - p_segment[0];
real_t l = n.length(); real_t l2 = n.length_squared();
if (l < 1e-10) if (l2 < 1e-20)
return p_segment[0]; // both points are the same, just give any return p_segment[0]; // both points are the same, just give any
n /= l;
real_t d = n.dot(p); real_t d = n.dot(p) / l2;
return p_segment[0] + n * d; // inside return p_segment[0] + n * d; // inside
} }