Changeset 3628 for trunk/packages/vizservers/nanovis/vrmath/include/vrmath/BBox.h

Timestamp:

Apr 11, 2013, 12:26:04 PM (11 years ago)

Author:

ldelgass

Message:

Some cleanups in vrmath lib, e.g. add copy/assignment ops

File:

• trunk/packages/vizservers/nanovis/vrmath/include/vrmath/BBox.h (modified) (5 diffs)

trunk/packages/vizservers/nanovis/vrmath/include/vrmath/BBox.h

@@ -35 +35 @@
     BBox(const Vector3f& min, const Vector3f& max);
 
+    BBox& operator=(const BBox& other)
+    {
+        if (&other != this) {
+            min = other.min;
+            max = other.max;
+        }
+        return *this;
+    }
+
     /**
      * @brief make an empty bounding box
@@ -51 +60 @@
      */
     bool isEmpty();
+    bool isEmptyX();
+    bool isEmptyY();
+    bool isEmptyZ();
 
     /**
@@ -63 +75 @@
 
     /**
-     * @brief transform a bounding box with an matrix and set the bounding box
+     * @brief transform a bounding box with a matrix and set the bounding box
      */
     void transform(const BBox& box, const Matrix4x4d& mat);
@@ -73 +85 @@
 
     /**
-     * @brief check if the bounding box intersect with a point
+     * @brief check if the bounding box contains a point
      */
-    bool intersect(const Vector3f& point);
+    bool contains(const Vector3f& point);
 
     float getRadius() const;
@@ -93 +105 @@
 {
     Vector3f temp;
-    temp.x = (max.x+ min.x) * 0.5f;
+    temp.x = (max.x + min.x) * 0.5f;
     temp.y = (max.y + min.y) * 0.5f;
     temp.z = (max.z + min.z) * 0.5f;