Using Box as BoundingBox

ChangeLog.md

@@ -6,6 +6,8 @@
     * Moved setup of Room, Portal, Box, Sector, ... into their
       Constructors.
     * Fixed menu play button
+    * Removed Render flags fSprite, fRoomModel, fPortals
+    * Room BoundingBox now using Box object
 
     [ 20140504 ]
     * Forcing use of new Room and Sprite classes in World.

include/Render.h

@@ -19,6 +19,7 @@
 #include "Mesh.h"
 #include "Texture.h"
 #include "Camera.h"
+#include "RoomData.h"
 
 /*!
  * \brief OpenRaider Renderer class
@@ -36,21 +37,18 @@ public:
     } RenderMode;
 
     typedef enum {
-        fPortals                = (1 << 0),
-        fRoomAlpha              = (1 << 1),
-        fViewModel              = (1 << 2),
-        fSprites                = (1 << 3),
-        fRoomModels             = (1 << 4),
-        fEntityModels           = (1 << 5),
-        fFog                    = (1 << 6),
-        fUsePortals             = (1 << 7),
-        fGL_Lights              = (1 << 8),
-        fOneRoom                = (1 << 9),
-        fRenderPonytail         = (1 << 10),
-        // fMultiTexture           = (1 << 11), //! \todo Whats up with Multitexture stuff? Where is it needed?
-        fUpdateRoomListPerFrame = (1 << 12),
-        fAnimateAllModels       = (1 << 13),
-        fAllRooms               = (1 << 14)
+        fRoomAlpha              = (1 << 0),
+        fViewModel              = (1 << 1),
+        fEntityModels           = (1 << 2),
+        fFog                    = (1 << 3),
+        fUsePortals             = (1 << 4),
+        fGL_Lights              = (1 << 5),
+        fOneRoom                = (1 << 6),
+        fRenderPonytail         = (1 << 7),
+        // fMultiTexture           = (1 << 8), //! \todo Whats up with Multitexture stuff? Where is it needed?
+        fUpdateRoomListPerFrame = (1 << 9),
+        fAnimateAllModels       = (1 << 10),
+        fAllRooms               = (1 << 11)
     } RenderFlags;
 
     /*!
@@ -130,14 +128,6 @@ public:
     unsigned int getFlags();
 
     /*!
-     * \brief Check if a bounding box is in the View Volume
-     * \param bboxMin Start coordinates of a valid bounding box
-     * \param bboxMax End coordinates of a valid bounding box
-     * \returns true if bounding box is visible
-     */
-    bool isVisible(float bboxMin[3], float bboxMax[3]);
-
-    /*!
      * \brief Check if a point is in the View Volume
      * \param x X coordinate
      * \param y Y coordinate
@@ -156,6 +146,8 @@ public:
      */
     bool isVisible(float x, float y, float z, float radius);
 
+    bool isVisible(Box &box);
+
     /*!
      * \brief Renders a mesh.
      *
@@ -168,6 +160,7 @@ public:
 
     ViewVolume mViewVolume; //!< View Volume for frustum culling
     std::vector<SkeletalModel *> mModels;
+    Texture mTexture;                     //!< Texture subsystem
 
 private:
 
@@ -210,17 +203,6 @@ private:
     void drawModel(SkeletalModel *model);
 
     /*!
-     * Renders a room in 2 seperate passes to handle alpha.
-     *
-     * Currently doesnt sort alpha but looks pretty good.
-     * Texture must be initialized.
-     * Draw all rooms with alpha false, then again with alpha true.
-     * \param rRoom room to render
-     * \param draw_alpha once false, once true
-     */
-    void drawRoom(Room &rRoom, bool draw_alpha);
-
-    /*!
      * \brief Updates View Volume. Call once per render frame.
      */
     void updateViewVolume();
@@ -228,8 +210,6 @@ private:
     //! \fixme Let them eat cake...? O.o
     void tmpRenderModelMesh(model_mesh_t *r_mesh, texture_tri_t *ttri);
 
-    Texture mTexture;                     //!< Texture subsystem
-
     std::vector<Room *> mRoomRenderList;
 
     unsigned int mFlags;                  //!< Rendering flags

include/Room.h

@@ -24,18 +24,16 @@ public:
     Room(TombRaider &tr, unsigned int index);
     ~Room();
 
-    void setFlags(unsigned int f);
-    unsigned int getFlags();
+    Box &getBoundingBox();
+    Mesh &getMesh();
+    void display(bool alpha);
 
     unsigned int getNumXSectors();
-
     unsigned int getNumZSectors();
-
     void getPos(vec3_t p);
 
-    void getBoundingBox(vec3_t box[2]);
-    bool inBox(vec_t x, vec_t y, vec_t z);
-    bool inBoxPlane(vec_t x, vec_t z);
+    void setFlags(unsigned int f);
+    unsigned int getFlags();
 
     unsigned int sizeAdjacentRooms();
     int getAdjacentRoom(unsigned int index);
@@ -51,7 +49,6 @@ public:
 
     unsigned int sizeModels();
     StaticModel &getModel(unsigned int index);
-    void sortModels();
 
     unsigned int sizeLights();
     Light &getLight(unsigned int index);
@@ -59,14 +56,15 @@ public:
     unsigned int sizeSprites();
     Sprite &getSprite(unsigned int index);
 
-    Mesh &getMesh();
-
 private:
+    void sortModels();
+
     unsigned int flags;
     unsigned int numXSectors;
     unsigned int numZSectors;
     vec3_t pos;
-    vec3_t bbox[2];
+
+    Box bbox;
     Mesh mesh;
 
     std::vector<int> adjacentRooms;

include/RoomData.h

@@ -75,6 +75,15 @@ 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:

src/Command.cpp

@@ -299,22 +299,6 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             getConsole().print("Invalid use of ralpha-command!");
             return -25;
         }
-    } else if (strcmp(command, "portal") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to portal command!");
-                return -26;
-            }
-            if (b)
-                getRender().setFlags(Render::fPortals);
-            else
-                getRender().clearFlags(Render::fPortals);
-            getConsole().print("Portals are now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of portal-command!");
-            return -27;
-        }
     } else if (strcmp(command, "vis") == 0) {
         if (args->size() > 0) {
             bool b;
@@ -347,38 +331,6 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             getConsole().print("Invalid use of upf-command!");
             return -31;
         }
-    } else if (strcmp(command, "sprite") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to sprite command!");
-                return -34;
-            }
-            if (b)
-                getRender().setFlags(Render::fSprites);
-            else
-                getRender().clearFlags(Render::fSprites);
-            getConsole().print("Sprites are now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of sprite-command!");
-            return -35;
-        }
-    } else if (strcmp(command, "roommodel") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to roommodel command!");
-                return -36;
-            }
-            if (b)
-                getRender().setFlags(Render::fRoomModels);
-            else
-                getRender().clearFlags(Render::fRoomModels);
-            getConsole().print("Roommodels are now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of roommodel-command!");
-            return -37;
-        }
     } else if (strcmp(command, "entmodel") == 0) {
         if (args->size() > 0) {
             bool b;
@@ -500,11 +452,8 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             getConsole().print("  pos       - Print position info");
             getConsole().print("  vmodel    - BOOL - View Model");
             getConsole().print("  ralpha    - BOOL - Room Alpha");
-            getConsole().print("  portal    - BOOL");
             getConsole().print("  vis       - BOOL - Use Portals");
             getConsole().print("  upf       - BOOL - Update Room List Per Frame");
-            getConsole().print("  sprite    - BOOL");
-            getConsole().print("  roommodel - BOOL");
             getConsole().print("  entmodel  - BOOL");
             getConsole().print("  oneroom   - BOOL");
             getConsole().print("  allrooms  - BOOL");

src/Render.cpp

@@ -54,8 +54,8 @@ Render::Render()
     mSkyMeshRotation = false;
     mMode = Render::modeDisabled;
     mLock = 0;
-    mFlags = (fRoomAlpha | fViewModel | fSprites |
-            fRoomModels | fEntityModels | fRenderPonytail |
+    mFlags = (fRoomAlpha | fViewModel |
+            fEntityModels | fRenderPonytail |
             fUsePortals | fUpdateRoomListPerFrame);
 }
 
@@ -496,7 +496,7 @@ void Render::display()
             lightRoom(room);
         }
 
-        drawRoom(room, false);
+        room.display(false);
     }
 
     // Draw all visible enities
@@ -561,7 +561,7 @@ void Render::display()
     {
         for (unsigned int i = 0; i < mRoomRenderList.size(); i++)
         {
-            drawRoom(*mRoomRenderList[i], true);
+            mRoomRenderList[i]->display(true);
         }
     }
 
@@ -648,9 +648,7 @@ void Render::newRoomRenderList(int index)
 
             for (unsigned int i = 0; i < getWorld().sizeRoom(); i++)
             {
-                vec3_t bbox[2];
-                getWorld().getRoom(i).getBoundingBox(bbox);
-                if (!isVisible(bbox[0], bbox[1]))
+                if (!isVisible(getWorld().getRoom(i).getBoundingBox()))
                     continue;
 
                 mRoomRenderList.push_back(&getWorld().getRoom(i));
@@ -667,9 +665,7 @@ void Render::buildRoomRenderList(Room &room)
 
     // Must be visible
     //! \fixme Add depth sorting here - remove multipass
-    vec3_t bbox[2];
-    room.getBoundingBox(bbox);
-    if (!isVisible(bbox[0], bbox[1]))
+    if (!isVisible(room.getBoundingBox()))
         return;
 
     // Must not already be cached
@@ -791,12 +787,10 @@ void Render::drawObjects()
     }
 
     // Mongoose 2002.03.22, Draw sprites after player to handle alpha
-    if (mFlags & Render::fSprites) {
-        for (unsigned int i = 0; i < getWorld().sizeSprite(); i++) {
-            SpriteSequence &sprite = getWorld().getSprite(i);
-            for (unsigned int j = 0; j < sprite.size(); j++)
-                sprite.get(j).display();
-        }
+    for (unsigned int i = 0; i < getWorld().sizeSprite(); i++) {
+        SpriteSequence &sprite = getWorld().getSprite(i);
+        for (unsigned int j = 0; j < sprite.size(); j++)
+            sprite.get(j).display();
     }
 }
 
@@ -984,168 +978,6 @@ void Render::drawModel(SkeletalModel *model)
 }
 
 
-void draw_bbox(vec3_t min, vec3_t max, bool draw_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(max[0], max[1], max[2]);
-    glVertex3f(min[0], min[1], min[2]);
-
-    if (draw_points)
-    {
-        glVertex3f(max[0], min[1], max[2]);
-        glVertex3f(min[0], max[1], max[2]);
-        glVertex3f(max[0], max[1], min[2]);
-        glVertex3f(min[0], min[1], max[2]);
-        glVertex3f(min[0], max[1], min[2]);
-        glVertex3f(max[0], min[1], min[2]);
-    }
-
-    glEnd();
-
-    glColor3fv(c2);
-
-    glBegin(GL_LINES);
-    // max, top quad
-    glVertex3f(max[0], max[1], max[2]);
-    glVertex3f(max[0], min[1], max[2]);
-
-    glVertex3f(max[0], max[1], max[2]);
-    glVertex3f(min[0], max[1], max[2]);
-
-    glVertex3f(max[0], max[1], max[2]);
-    glVertex3f(max[0], max[1], min[2]);
-
-    // max-min, vertical quads
-    glVertex3f(min[0], max[1], max[2]);
-    glVertex3f(min[0], max[1], min[2]);
-
-    glVertex3f(max[0], min[1], max[2]);
-    glVertex3f(max[0], min[1], min[2]);
-
-    glVertex3f(max[0], min[1], max[2]);
-    glVertex3f(min[0], min[1], max[2]);
-
-    // min-max, vertical quads
-    glVertex3f(max[0], max[1], min[2]);
-    glVertex3f(max[0], min[1], min[2]);
-
-    glVertex3f(max[0], max[1], min[2]);
-    glVertex3f(min[0], max[1], min[2]);
-
-    glVertex3f(min[0], max[1], max[2]);
-    glVertex3f(min[0], min[1], max[2]);
-
-
-    // min, bottom quad
-    glVertex3f(min[0], min[1], min[2]);
-    glVertex3f(min[0], max[1], min[2]);
-
-    glVertex3f(min[0], min[1], min[2]);
-    glVertex3f(max[0], min[1], min[2]);
-
-    glVertex3f(min[0], min[1], min[2]);
-    glVertex3f(min[0], min[1], max[2]);
-    glEnd();
-
-    glPointSize(1.0);
-    //glLineWidth(1.0);
-}
-
-
-void Render::drawRoom(Room &room, bool draw_alpha)
-{
-    if (!(mFlags & Render::fRoomAlpha) && draw_alpha)
-        return;
-
-    glPushMatrix();
-    //LightingSetup();
-
-    mTexture.bindTextureId(0); // WHITE texture
-
-    if (!draw_alpha &&
-            (mFlags & Render::fPortals || mMode == Render::modeWireframe)) {
-        glLineWidth(2.0);
-        glColor3fv(RED);
-
-        for (unsigned int i = 0; i < room.sizePortals(); i++) {
-            Portal &portal = room.getPortal(i);
-            vec3_t vertices[4];
-            portal.getVertices(vertices);
-
-            glBegin(GL_LINE_LOOP);
-            glVertex3fv(vertices[0]);
-            glVertex3fv(vertices[1]);
-            glVertex3fv(vertices[2]);
-            glVertex3fv(vertices[3]);
-            glEnd();
-        }
-
-        glLineWidth(1.0);
-    }
-
-    if (mMode == Render::modeWireframe && !draw_alpha) {
-        vec3_t bbox[2];
-        room.getBoundingBox(bbox);
-        draw_bbox(bbox[0], bbox[1], true, RED, GREEN);
-    }
-
-    vec3_t pos;
-    room.getPos(pos);
-    glTranslated(pos[0], pos[1], pos[2]);
-
-    // Reset since GL_MODULATE used, reset to WHITE
-    glColor3fv(WHITE);
-
-    switch (mMode)
-    {
-        case modeWireframe:
-            room.getMesh().mMode = Mesh::MeshModeWireframe;
-            break;
-        case modeSolid:
-            room.getMesh().mMode = Mesh::MeshModeSolid;
-            break;
-        default:
-            room.getMesh().mMode = Mesh::MeshModeTexture;
-            break;
-    }
-
-    if (draw_alpha)
-        room.getMesh().drawAlpha();
-    else
-        room.getMesh().drawSolid();
-
-    glPopMatrix();
-
-    //mTexture.bindTextureId(0);
-
-    // Draw other room meshes and sprites
-    if (draw_alpha || mMode == modeWireframe || mMode == modeSolid) {
-        if (mFlags & Render::fRoomModels) {
-            room.sortModels();
-            for (unsigned int i = 0; i < room.sizeModels(); i++) {
-                room.getModel(i).display();
-            }
-        }
-
-        // Draw other room alpha polygon objects
-        if (mFlags & Render::fSprites) {
-            for (unsigned int i = 0; i < room.sizeSprites(); i++) {
-                room.getSprite(i).display();
-            }
-        }
-    }
-}
-
-
 void Render::tmpRenderModelMesh(model_mesh_t *r_mesh, texture_tri_t *ttri)
 {
     glBegin(GL_TRIANGLES);
@@ -1354,23 +1186,13 @@ void Render::updateViewVolume()
     mViewVolume.updateFrame(proj, mdl);
 }
 
-
-bool Render::isVisible(float bbox_min[3], float bbox_max[3])
-{
+bool Render::isVisible(Box &box) {
+    vec3_t bbox[2];
+    box.getBoundingBox(bbox);
     // For debugging purposes
     if (mMode == Render::modeWireframe)
-    {
-        //glPointSize(5.0);
-        //glColor3fv(PINK);
-        //glBegin(GL_POINTS);
-        //glVertex3fv(bbox_min);
-        //glVertex3fv(bbox_max);
-        //glEnd();
-
-        draw_bbox(bbox_min, bbox_max, true, PINK, RED);
-    }
-
-    return mViewVolume.isBboxInFrustum(bbox_min, bbox_max);
+        box.display(true, PINK, RED);
+    return mViewVolume.isBboxInFrustum(bbox[0], bbox[1]);
 }
 
 

src/Room.cpp

@@ -5,6 +5,14 @@
  * \author xythobuz
  */
 
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#endif
+
 #include <algorithm>
 #include <assert.h>
 
@@ -12,6 +20,7 @@
 #include "Room.h"
 
 Room::Room(TombRaider &tr, unsigned int index) {
+    vec3_t box[2];
     Matrix transform;
 
     if (!tr.isRoomValid(index)) {
@@ -21,13 +30,15 @@ Room::Room(TombRaider &tr, unsigned int index) {
         return;
     }
 
-    tr.getRoomInfo(index, &flags, pos, bbox[0], bbox[1]);
+    tr.getRoomInfo(index, &flags, pos, box[0], box[1]);
 
     // Adjust positioning for OR world coordinate translation
-    bbox[0][0] += pos[0];
-    bbox[1][0] += pos[0];
-    bbox[0][2] += pos[2];
-    bbox[1][2] += pos[2];
+    box[0][0] += pos[0];
+    box[1][0] += pos[0];
+    box[0][2] += pos[2];
+    box[1][2] += pos[2];
+
+    bbox.setBoundingBox(box[0], box[1]);
 
     // Mongoose 2002.04.03, Setup 3D transform
     transform.setIdentity();
@@ -71,7 +82,7 @@ Room::Room(TombRaider &tr, unsigned int index) {
     for (unsigned int i = 0; i < count; i++)
         sprites.push_back(new Sprite(tr, index, i));
 
-#define EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
+//#define EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
 #ifdef EXPERIMENTAL_UNIFIED_ROOM_GEOMETERY
     unsigned int vertexCount, normalCount, colorCount, triCount;
     vec_t *vertexArray;
@@ -438,6 +449,75 @@ Room::~Room() {
     EMPTY_VECTOR(lights);
 }
 
+void Room::display(bool alpha) {
+    glPushMatrix();
+    //LightingSetup();
+
+    getRender().mTexture.bindTextureId(0); // WHITE texture
+
+    if ((!alpha) && getRender().getMode() == Render::modeWireframe) {
+        glLineWidth(2.0);
+        glColor3fv(RED);
+
+        for (unsigned int i = 0; i < sizePortals(); i++) {
+            Portal &portal = getPortal(i);
+            vec3_t vertices[4];
+            portal.getVertices(vertices);
+
+            glBegin(GL_LINE_LOOP);
+            glVertex3fv(vertices[0]);
+            glVertex3fv(vertices[1]);
+            glVertex3fv(vertices[2]);
+            glVertex3fv(vertices[3]);
+            glEnd();
+        }
+
+        glLineWidth(1.0);
+    }
+
+    if (getRender().getMode() == Render::modeWireframe && (!alpha)) {
+        bbox.display(true, RED, GREEN);
+    }
+
+    glTranslated(pos[0], pos[1], pos[2]);
+
+    // Reset since GL_MODULATE used, reset to WHITE
+    glColor3fv(WHITE);
+
+    switch (getRender().getMode())
+    {
+        case Render::modeWireframe:
+            getMesh().mMode = Mesh::MeshModeWireframe;
+            break;
+        case Render::modeSolid:
+            getMesh().mMode = Mesh::MeshModeSolid;
+            break;
+        default:
+            getMesh().mMode = Mesh::MeshModeTexture;
+            break;
+    }
+
+    if (alpha)
+        getMesh().drawAlpha();
+    else
+        getMesh().drawSolid();
+
+    glPopMatrix();
+
+    //getRender().mTexture.bindTextureId(0);
+
+    // Draw other room meshes and sprites
+    if (alpha || (getRender().getMode() == Render::modeWireframe)
+            || (getRender().getMode() == Render::modeSolid)) {
+        sortModels();
+        for (unsigned int i = 0; i < sizeModels(); i++)
+            getModel(i).display();
+
+        for (unsigned int i = 0; i < sizeSprites(); i++)
+            getSprite(i).display();
+    }
+}
+
 unsigned int Room::getFlags() {
     return flags;
 }
@@ -455,21 +535,6 @@ void Room::getPos(vec3_t p) {
         p[i] = pos[i];
 }
 
-void Room::getBoundingBox(vec3_t box[2]) {
-    for (unsigned int i = 0; i < 2; i++)
-        for (unsigned int j = 0; j < 3; j++)
-            box[i][j] = bbox[i][j];
-}
-
-bool Room::inBox(vec_t x, vec_t y, vec_t z) {
-    return ((y > bbox[0][1]) && (y < bbox[1][1]) && inBoxPlane(x, z));
-}
-
-bool Room::inBoxPlane(vec_t x, vec_t z) {
-    return ((x > bbox[0][0]) && (x < bbox[1][0])
-            && (z > bbox[0][2]) && (z < bbox[1][2]));
-}
-
 unsigned int Room::sizeAdjacentRooms() {
     return adjacentRooms.size();
 }
@@ -537,6 +602,10 @@ Sprite &Room::getSprite(unsigned int index) {
     return *sprites.at(index);
 }
 
+Box &Room::getBoundingBox() {
+    return bbox;
+}
+
 Mesh &Room::getMesh() {
     return mesh;
 }

src/RoomData.cpp

@@ -130,6 +130,112 @@ 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/World.cpp

@@ -276,7 +276,7 @@ int World::getRoomByLocation(int index, float x, float y, float z)
     assert(index < (int)mRooms.size());
     Room &room = *mRooms.at(index);
 
-    if (room.inBox(x, y, z))
+    if (room.getBoundingBox().inBox(x, y, z))
         return index;
     else
         return getRoomByLocation(x, y, z);
@@ -287,8 +287,8 @@ int World::getRoomByLocation(float x, float y, float z) {
     int hop = -1;
 
     for (unsigned int i = 0; i < mRooms.size(); i++) {
-        if (mRooms.at(i)->inBoxPlane(x, z)) {
-            if (mRooms.at(i)->inBox(x, y, z))
+        if (mRooms.at(i)->getBoundingBox().inBoxPlane(x, z)) {
+            if (mRooms.at(i)->getBoundingBox().inBox(x, y, z))
                 return i;
             else
                 hop = i; // This room is above or below current position