Changeset 1020 for cpp/frams/util/3d.cpp

Timestamp:

07/24/20 21:44:10 (5 years ago)

Author:

Maciej Komosinski

Message:

Added double Pt3D::minComponent() and maxComponent()

File:

• cpp/frams/util/3d.cpp (modified) (9 diffs)

cpp/frams/util/3d.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -6 +6 @@
 #include <common/log.h>
 #include "3d.h"
+#include <algorithm> // std::min(), std::max()
 
 Pt3D operator+(const Pt3D &p1, const Pt3D &p2) { return Pt3D(p1.x + p2.x, p1.y + p2.y, p1.z + p2.z); }
@@ -16 +17 @@
 double Pt3D::operator()() const
 {
-        double q = x*x + y*y + z*z;
+        double q = x * x + y * y + z * z;
         if (q < 0) { if (report_errors) logPrintf("Pt3D", "operator()", LOG_ERROR, "sqrt(%g): domain error", q); return 0; }
         return sqrt(q);
@@ -34 +35 @@
         double dy = y - p.y;
         double dz = z - p.z;
-        return sqrt(dx*dx + dy*dy + dz*dz);
+        return sqrt(dx * dx + dy * dy + dz * dz);
 }
 
@@ -48 +49 @@
 {
         double s = sin(k), c = cos(k);
-        double t = c*x - s*y;
-        y = s*x + c*y;
+        double t = c * x - s * y;
+        y = s * x + c * y;
         x = t;
 }
@@ -55 +56 @@
 void rotate2D(double s, double c, double &x, double &y)
 {
-        double t = c*x - s*y;
-        y = s*x + c*y;
+        double t = c * x - s * y;
+        y = s * x + c * y;
         x = t;
 }
@@ -105 +106 @@
 }
 
+double Pt3D::minComponent() const
+{
+        return std::min(x, std::min(y, z));
+}
+
+double Pt3D::maxComponent() const
+{
+        return std::max(x, std::max(y, z));
+}
+
 void Pt3D::vectorProduct(const Pt3D& a, const Pt3D& b)
 {
-        x = a.y*b.z - a.z*b.y;
-        y = a.z*b.x - a.x*b.z;
-        z = a.x*b.y - a.y*b.x;
+        x = a.y * b.z - a.z * b.y;
+        y = a.z * b.x - a.x * b.z;
+        z = a.x * b.y - a.y * b.x;
 }
 
@@ -146 +157 @@
 double d2(double x, double y)
 {
-        double q = x*x + y*y;
+        double q = x * x + y * y;
         if (q < 0) { if (Pt3D::report_errors) logPrintf("", "d2()", LOG_ERROR, "sqrt(%g): domain error", q); return 0; }
         return sqrt(q);
@@ -192 +203 @@
 void Orient::transform(Pt3D& target, const Pt3D &s) const
 {
-        target.x = s.x*x.x + s.y*y.x + s.z*z.x;
-        target.y = s.x*x.y + s.y*y.y + s.z*z.y;
-        target.z = s.x*x.z + s.y*y.z + s.z*z.z;
+        target.x = s.x * x.x + s.y * y.x + s.z * z.x;
+        target.y = s.x * x.y + s.y * y.y + s.z * z.y;
+        target.z = s.x * x.z + s.y * y.z + s.z * z.z;
 }
 
 void Orient::revTransform(Pt3D& target, const Pt3D &s) const
 {
-        target.x = s.x*x.x + s.y*x.y + s.z*x.z;
-        target.y = s.x*y.x + s.y*y.y + s.z*y.z;
-        target.z = s.x*z.x + s.y*z.y + s.z*z.z;
+        target.x = s.x * x.x + s.y * x.y + s.z * x.z;
+        target.y = s.x * y.x + s.y * y.y + s.z * y.z;
+        target.z = s.x * z.x + s.y * z.y + s.z * z.z;
 }