Created BoundingBox class

ChangeLog.md

@@ -8,6 +8,8 @@
       - Audio output optional, added Null Sound implementation
       - Added support for getting home folder location in Windows
       - Added support for recursively looking for level paks in Windows
+    * Removed unused BoundingVolume, Box, Sphere from ViewVolume,
+      split double used Box class into Box and BoundingBox.
 
     [ 20140505 ]
     * Moved setup of Room, Portal, Box, Sector, ... into their

include/Render.h

@@ -146,7 +146,7 @@ public:
      */
     bool isVisible(float x, float y, float z, float radius);
 
-    bool isVisible(Box &box);
+    bool isVisible(BoundingBox &box);
 
     /*!
      * \brief Renders a mesh.

include/Room.h

@@ -24,7 +24,7 @@ public:
     Room(TombRaider &tr, unsigned int index);
     ~Room();
 
-    Box &getBoundingBox();
+    BoundingBox &getBoundingBox();
     Mesh &getMesh();
     void display(bool alpha);
 
@@ -64,7 +64,7 @@ private:
     unsigned int numZSectors;
     vec3_t pos;
 
-    Box bbox;
+    BoundingBox bbox;
     Mesh mesh;
 
     std::vector<int> adjacentRooms;

include/RoomData.h

@@ -14,6 +14,19 @@
 #include "math/Matrix.h"
 #include "TombRaider.h"
 
+class BoundingBox {
+public:
+    BoundingBox();
+    void getBoundingBox(vec3_t box[2]);
+    void setBoundingBox(vec3_t min, vec3_t max);
+    void display(bool points, const vec4_t c1, const vec4_t c2);
+    bool inBox(vec_t x, vec_t y, vec_t z);
+    bool inBoxPlane(vec_t x, vec_t z);
+
+private:
+    vec3_t a, b;
+};
+
 class Light {
 public:
     /*!
@@ -75,15 +88,6 @@ private:
 
 class Box {
 public:
-    // For use as bounding box
-    Box();
-    void getBoundingBox(vec3_t box[2]);
-    void setBoundingBox(vec3_t min, vec3_t max);
-    void display(bool points, const vec4_t c1, const vec4_t c2);
-    bool inBox(vec_t x, vec_t y, vec_t z);
-    bool inBoxPlane(vec_t x, vec_t z);
-
-    // For use as box in rooms
     Box(TombRaider &tr, unsigned int room, unsigned int index);
 
 private:

include/ViewVolume.h

@@ -9,33 +9,7 @@
 #define _VIEWVOLUME_H_
 
 #include "math/Matrix.h"
-
-/*!
- * \brief Defines a 3D sphere.
- */
-class BoundingSphere {
-public:
-    vec3_t mCenter; //!< Center of bounding sphere
-    vec_t mRadius; //!< Raduis of bounding sphere
-};
-
-/*!
- * \brief Defines a 3D rectangle.
- */
-class BoundingBox {
-public:
-    vec3_t mMin; //!< Bounding box MIN point
-    vec3_t mMax; //!< Bounding box MAX point
-};
-
-/*!
- * \brief Defines a 3D sphere and/or rectangle.
- */
-class BoundingVolume {
-public:
-    BoundingSphere mSphere; //!< Bounding sphere of this volume
-    BoundingBox mBox; //!< Bounding box of this volume
-};
+#include "RoomData.h"
 
 /*!
  * \brief Viewing Volume for culling use
@@ -71,27 +45,6 @@ public:
     ViewVolume();
 
     /*!
-     * \brief Check if bounding volume is in view volume
-     * \param bvol bounding volume to check
-     * \returns true if frustum contains the given bounding volume
-     */
-    bool isBoundingVolumeInFrustum(BoundingVolume bvol);
-
-    /*!
-     * \brief Check if bounding sphere is in view volume
-     * \param bvol bounding sphere to check
-     * \returns true if frustum contains the given bounding volume
-     */
-    bool isBoundingSphereInFrustum(BoundingSphere bvol);
-
-    /*!
-     * \brief Check if bounding box is in view volume
-     * \param bvol bounding box to check
-     * \returns true if frustum contains the given bounding volume
-     */
-    bool isBoundingBoxInFrustum(BoundingBox bvol);
-
-    /*!
      * \brief Check if point is in view volume
      * \param x X coordinate of point
      * \param y Y coordinate of point

src/Render.cpp

@@ -1190,7 +1190,7 @@ void Render::updateViewVolume()
     mViewVolume.updateFrame(proj, mdl);
 }
 
-bool Render::isVisible(Box &box) {
+bool Render::isVisible(BoundingBox &box) {
     vec3_t bbox[2];
     box.getBoundingBox(bbox);
     // For debugging purposes

src/Room.cpp

@@ -602,7 +602,7 @@ Sprite &Room::getSprite(unsigned int index) {
     return *sprites.at(index);
 }
 
-Box &Room::getBoundingBox() {
+BoundingBox &Room::getBoundingBox() {
     return bbox;
 }
 

src/RoomData.cpp

@@ -16,6 +16,114 @@
 #include "main.h"
 #include "RoomData.h"
 
+BoundingBox::BoundingBox() {
+    a[0] = a[1] = a[2] = 0;
+    b[0] = b[1] = b[2] = 0;
+}
+
+void BoundingBox::getBoundingBox(vec3_t box[2]) {
+    box[0][0] = a[0];
+    box[1][0] = b[0];
+    box[0][1] = a[1];
+    box[1][1] = b[1];
+    box[0][2] = a[2];
+    box[1][2] = b[2];
+}
+
+void BoundingBox::setBoundingBox(vec3_t min, vec3_t max) {
+    a[0] = min[0];
+    b[0] = max[0];
+    a[1] = min[1];
+    b[1] = max[1];
+    a[2] = min[2];
+    b[2] = max[2];
+}
+
+bool BoundingBox::inBox(vec_t x, vec_t y, vec_t z) {
+    return ((y > a[1]) && (y < b[1]) && inBoxPlane(x, z));
+}
+
+bool BoundingBox::inBoxPlane(vec_t x, vec_t z) {
+    return ((x > a[0]) && (x < b[0])
+            && (z > a[2]) && (z < b[2]));
+}
+
+void BoundingBox::display(bool points, const vec4_t c1, const vec4_t c2) {
+    // Bind before entering now
+    //glBindTexture(GL_TEXTURE_2D, 1);
+    glPointSize(4.0);
+    //glLineWidth(1.25);
+
+    //! \fixme Need to make custom color key for this
+    glColor3fv(c1);
+
+    glBegin(GL_POINTS);
+    glVertex3f(b[0], b[1], b[2]);
+    glVertex3f(a[0], a[1], a[2]);
+
+    if (points)
+    {
+        glVertex3f(b[0], a[1], b[2]);
+        glVertex3f(a[0], b[1], b[2]);
+        glVertex3f(b[0], b[1], a[2]);
+        glVertex3f(a[0], a[1], b[2]);
+        glVertex3f(a[0], b[1], a[2]);
+        glVertex3f(b[0], a[1], a[2]);
+    }
+
+    glEnd();
+
+    glColor3fv(c2);
+
+    glBegin(GL_LINES);
+    // max, top quad
+    glVertex3f(b[0], b[1], b[2]);
+    glVertex3f(b[0], a[1], b[2]);
+
+    glVertex3f(b[0], b[1], b[2]);
+    glVertex3f(a[0], b[1], b[2]);
+
+    glVertex3f(b[0], b[1], b[2]);
+    glVertex3f(b[0], b[1], a[2]);
+
+    // max-min, vertical quads
+    glVertex3f(a[0], b[1], b[2]);
+    glVertex3f(a[0], b[1], a[2]);
+
+    glVertex3f(b[0], a[1], b[2]);
+    glVertex3f(b[0], a[1], a[2]);
+
+    glVertex3f(b[0], a[1], b[2]);
+    glVertex3f(a[0], a[1], b[2]);
+
+    // min-max, vertical quads
+    glVertex3f(b[0], b[1], a[2]);
+    glVertex3f(b[0], a[1], a[2]);
+
+    glVertex3f(b[0], b[1], a[2]);
+    glVertex3f(a[0], b[1], a[2]);
+
+    glVertex3f(a[0], b[1], b[2]);
+    glVertex3f(a[0], a[1], b[2]);
+
+
+    // min, bottom quad
+    glVertex3f(a[0], a[1], a[2]);
+    glVertex3f(a[0], b[1], a[2]);
+
+    glVertex3f(a[0], a[1], a[2]);
+    glVertex3f(b[0], a[1], a[2]);
+
+    glVertex3f(a[0], a[1], a[2]);
+    glVertex3f(a[0], a[1], b[2]);
+    glEnd();
+
+    glPointSize(1.0);
+    //glLineWidth(1.0);
+}
+
+// ----------------------------------------------------------------------------
+
 Light::Light(TombRaider &tr, unsigned int room, unsigned int index) {
     unsigned int lightFlags, lightType;
 
@@ -130,112 +238,6 @@ int Portal::getAdjoiningRoom() {
 
 // ----------------------------------------------------------------------------
 
-Box::Box() {
-    a[0] = a[1] = a[2] = 0;
-    b[0] = b[1] = b[2] = 0;
-}
-
-void Box::getBoundingBox(vec3_t box[2]) {
-    box[0][0] = a[0];
-    box[1][0] = b[0];
-    box[0][1] = a[1];
-    box[1][1] = b[1];
-    box[0][2] = a[2];
-    box[1][2] = b[2];
-}
-
-void Box::setBoundingBox(vec3_t min, vec3_t max) {
-    a[0] = min[0];
-    b[0] = max[0];
-    a[1] = min[1];
-    b[1] = max[1];
-    a[2] = min[2];
-    b[2] = max[2];
-}
-
-bool Box::inBox(vec_t x, vec_t y, vec_t z) {
-    return ((y > a[1]) && (y < b[1]) && inBoxPlane(x, z));
-}
-
-bool Box::inBoxPlane(vec_t x, vec_t z) {
-    return ((x > a[0]) && (x < b[0])
-            && (z > a[2]) && (z < b[2]));
-}
-
-void Box::display(bool points, const vec4_t c1, const vec4_t c2) {
-    // Bind before entering now
-    //glBindTexture(GL_TEXTURE_2D, 1);
-    glPointSize(4.0);
-    //glLineWidth(1.25);
-
-    //! \fixme Need to make custom color key for this
-    glColor3fv(c1);
-
-    glBegin(GL_POINTS);
-    glVertex3f(b[0], b[1], b[2]);
-    glVertex3f(a[0], a[1], a[2]);
-
-    if (points)
-    {
-        glVertex3f(b[0], a[1], b[2]);
-        glVertex3f(a[0], b[1], b[2]);
-        glVertex3f(b[0], b[1], a[2]);
-        glVertex3f(a[0], a[1], b[2]);
-        glVertex3f(a[0], b[1], a[2]);
-        glVertex3f(b[0], a[1], a[2]);
-    }
-
-    glEnd();
-
-    glColor3fv(c2);
-
-    glBegin(GL_LINES);
-    // max, top quad
-    glVertex3f(b[0], b[1], b[2]);
-    glVertex3f(b[0], a[1], b[2]);
-
-    glVertex3f(b[0], b[1], b[2]);
-    glVertex3f(a[0], b[1], b[2]);
-
-    glVertex3f(b[0], b[1], b[2]);
-    glVertex3f(b[0], b[1], a[2]);
-
-    // max-min, vertical quads
-    glVertex3f(a[0], b[1], b[2]);
-    glVertex3f(a[0], b[1], a[2]);
-
-    glVertex3f(b[0], a[1], b[2]);
-    glVertex3f(b[0], a[1], a[2]);
-
-    glVertex3f(b[0], a[1], b[2]);
-    glVertex3f(a[0], a[1], b[2]);
-
-    // min-max, vertical quads
-    glVertex3f(b[0], b[1], a[2]);
-    glVertex3f(b[0], a[1], a[2]);
-
-    glVertex3f(b[0], b[1], a[2]);
-    glVertex3f(a[0], b[1], a[2]);
-
-    glVertex3f(a[0], b[1], b[2]);
-    glVertex3f(a[0], a[1], b[2]);
-
-
-    // min, bottom quad
-    glVertex3f(a[0], a[1], a[2]);
-    glVertex3f(a[0], b[1], a[2]);
-
-    glVertex3f(a[0], a[1], a[2]);
-    glVertex3f(b[0], a[1], a[2]);
-
-    glVertex3f(a[0], a[1], a[2]);
-    glVertex3f(a[0], a[1], b[2]);
-    glEnd();
-
-    glPointSize(1.0);
-    //glLineWidth(1.0);
-}
-
 Box::Box(TombRaider &tr, unsigned int room, unsigned int index) {
     tr.getRoomBox(room, index, a, b, c, d);
 }

src/ViewVolume.cpp

@@ -20,22 +20,6 @@ ViewVolume::ViewVolume() {
     mFrustum[5][0] = mFrustum[5][1] = mFrustum[5][2] = mFrustum[5][3] = 0.0f;
 }
 
-bool ViewVolume::isBoundingVolumeInFrustum(BoundingVolume bvol) {
-    return (isBoundingSphereInFrustum(bvol.mSphere) &&
-            isBoundingBoxInFrustum(bvol.mBox));
-}
-
-bool ViewVolume::isBoundingSphereInFrustum(BoundingSphere bvol) {
-    return (isSphereInFrustum(bvol.mCenter[0],
-                bvol.mCenter[1],
-                bvol.mCenter[2],
-                bvol.mRadius));
-}
-
-bool ViewVolume::isBoundingBoxInFrustum(BoundingBox bvol) {
-    return (isBboxInFrustum(bvol.mMin, bvol.mMax));
-}
-
 bool ViewVolume::isPointInFrustum(vec_t x, vec_t y, vec_t z) {
     for (unsigned int p = 0; p < 6; ++p) {
         if (mFrustum[p][0] * x + mFrustum[p][1] * y + mFrustum[p][2] * z +