summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authormzuenni <michi.zuendorf@gmail.com>2024-08-10 21:29:15 +0200
committermzuenni <michi.zuendorf@gmail.com>2024-08-10 21:29:15 +0200
commitfdb4d0c1b54c0987367069d57a0ee56d30243431 (patch)
treee488d178c3badf9b2b138c72d22879cafb7a9474 /content
parent4fae4bbe35af1eb349623123dc8f7e5f40f772e2 (diff)
more tests
Diffstat (limited to 'content')
-rw-r--r--content/geometry/formulas3d.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/content/geometry/formulas3d.cpp b/content/geometry/formulas3d.cpp
index dee3ce8..63de2ce 100644
--- a/content/geometry/formulas3d.cpp
+++ b/content/geometry/formulas3d.cpp
@@ -26,23 +26,23 @@ int ccw(pt3 a, pt3 b, pt3 c, pt3 p) {
return (orien > EPS) - (orien < -EPS);
}
-// Entfernung von Punkt p zur Ebene a,b,c.
+// Entfernung von Punkt p zur Ebene a, b, c.
double distToPlane(pt3 a, pt3 b, pt3 c, pt3 p) {
- pt3 n = cross(b-a, c-a);
- return (abs(dot(n, p)) - dot(n, a)) / abs(n);
+ pt3 n = cross(b - a, c - a);
+ return abs(dot(n, a - p)) / abs(n);
}
-// Liegt p in der Ebene a,b,c?
+// Liegt p in der Ebene a, b, c?
bool pointOnPlane(pt3 a, pt3 b, pt3 c, pt3 p) {
return ccw(a, b, c, p) == 0;
}
-// Schnittpunkt von der Grade a-b und der Ebene c,d,e
+// Schnittpunkt von der Grade a-b und der Ebene c, d, e
// die Grade darf nicht parallel zu der Ebene sein!
pt3 linePlaneIntersection(pt3 a, pt3 b, pt3 c, pt3 d, pt3 e) {
- pt3 n = cross(d-c, e-c);
- pt3 d = b - a;
- return a - d * (dot(n, a) - dot(n, c)) / dot(n, d);
+ pt3 n = cross(d - c, e - c);
+ pt3 dir = b - a;
+ return a + dir * dot(n, c - a) / dot(n, dir);
}
// Abstand zwischen der Grade a-b und c-d