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

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.h (modified) (3 diffs)

cpp/frams/util/3d.h

@@ -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.
 
@@ -29 +29 @@
         Pt3D() {} ///< coords will be not initialized!
         Pt3D(const Pt3D &p) :x(p.x), y(p.y), z(p.z) {} ///< copy from another point
-        bool    operator==(const Pt3D& p)       { return (x == p.x) && (y == p.y) && (z == p.z); }
-        void    operator+=(const Pt3D& p)       { x += p.x; y += p.y; z += p.z; }
-        void    operator-=(const Pt3D& p)       { x -= p.x; y -= p.y; z -= p.z; }
-        void    operator*=(double d)    { x *= d; y *= d; z *= d; }
-        Pt3D    operator*(const Pt3D &p) const { return Pt3D(y*p.z - z*p.y, z*p.x - x*p.z, x*p.y - y*p.x); }
-        void    operator/=(double d)    { x /= d; y /= d; z /= d; }
+        bool    operator==(const Pt3D& p) { return (x == p.x) && (y == p.y) && (z == p.z); }
+        void    operator+=(const Pt3D& p) { x += p.x; y += p.y; z += p.z; }
+        void    operator-=(const Pt3D& p) { x -= p.x; y -= p.y; z -= p.z; }
+        void    operator*=(double d) { x *= d; y *= d; z *= d; }
+        Pt3D    operator*(const Pt3D &p) const { return Pt3D(y * p.z - z * p.y, z * p.x - x * p.z, x * p.y - y * p.x); }
+        void    operator/=(double d) { x /= d; y /= d; z /= d; }
         //Pt3D  operator+(const Pt3D& p) const {return Pt3D(x+p.x,y+p.y,z+p.z);}
         //Pt3D  operator-(const Pt3D& p) const {return Pt3D(x-p.x,y-p.y,z-p.z);}
         Pt3D    operator-() const { return Pt3D(-x, -y, -z); }
-        Pt3D    operator*(double d) const { return Pt3D(x*d, y*d, z*d); }
+        Pt3D    operator*(double d) const { return Pt3D(x * d, y * d, z * d); }
         Pt3D    operator/(double d) const { return Pt3D(x / d, y / d, z / d); }
-        bool    allCoordsLowerThan(const Pt3D& p) const { return (x < p.x) && (y < p.y) && (z<p.z); }
-        bool    allCoordsHigherThan(const Pt3D& p) const { return (x>p.x) && (y > p.y) && (z > p.z); }
+        bool    allCoordsLowerThan(const Pt3D& p) const { return (x < p.x) && (y < p.y) && (z < p.z); }
+        bool    allCoordsHigherThan(const Pt3D& p) const { return (x > p.x) && (y > p.y) && (z > p.z); }
         void getMin(const Pt3D& p);
         void getMax(const Pt3D& p);
+        double minComponent() const;
+        double maxComponent() const;
         /** vector length = \f$\sqrt{x^2+y^2+z^2}\f$  */
         double operator()() const;
         /** vector length = \f$\sqrt{x^2+y^2+z^2}\f$  */
         double length() const { return operator()(); }
-        double length2() const { return x*x + y*y + z*z; }
+        double length2() const { return x * x + y * y + z * z; }
         double distanceTo(const Pt3D& p) const;
         double manhattanDistanceTo(const Pt3D& p) const;
@@ -56 +58 @@
         void getAngles(const Pt3D& X, const Pt3D& dir);
         void vectorProduct(const Pt3D& a, const Pt3D& b);
-        Pt3D vectorProduct(const Pt3D& p) const { return (*this)*p; }
-        Pt3D entrywiseProduct(const Pt3D &p) const { return Pt3D(x*p.x, y*p.y, z*p.z); } ///< also known as Hadamard product or Schur product
-        double dotProduct(const Pt3D& p) const { return x*p.x + y*p.y + z*p.z; }
+        Pt3D vectorProduct(const Pt3D& p) const { return (*this) * p; }
+        Pt3D entrywiseProduct(const Pt3D &p) const { return Pt3D(x * p.x, y * p.y, z * p.z); } ///< also known as Hadamard product or Schur product
+        double dotProduct(const Pt3D& p) const { return x * p.x + y * p.y + z * p.z; }
         bool normalize();
 };