Individual toggles for bounding box visualisation.

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140109 ]
+    * Display of Bounding Boxes can be individually toggled for Rooms/StaticMeshes
+
     [ 20140108 ]
     * FPS and Camera position now displayed in imgui Overlay
     * Removed many unnecessary includes

TODO.md

@@ -21,5 +21,5 @@
 
 * Depend on physfs for easier file location management
 * Depend on libcdio, use it to read original CDs or CUE/TOC/ISO images
-* Add ability to play the FMVs. Format? VLC can play them!
+* Add ability to play the FMVs. QuickTime, ima4 Audio, h264 avc1 Video!
 

include/Camera.h

@@ -25,7 +25,7 @@ class Camera {
 
     //! \fixme The Y axis seems to be the source of all evil?
     static void setPosition(glm::vec3 p) { pos = glm::vec3(p.x, -p.y, p.z); }
-    static glm::vec3 getPosition() { return pos; }
+    static glm::vec3 getPosition() { return glm::vec3(pos.x, -pos.y, pos.z); }
 
     static glm::vec2 getRotation() { return rot; }
     static glm::mat4 getProjectionMatrix() { return projection; }

include/Room.h

@@ -62,6 +62,9 @@ class Room {
     Sprite& getSprite(unsigned long index);
     void addSprite(Sprite* s);
 
+    static void setShowBoundingBox(bool s) { showBoundingBox = s; }
+    static bool getShowBoundingBox() { return showBoundingBox; }
+
   private:
     glm::vec3 pos;
     glm::mat4 model;
@@ -79,8 +82,7 @@ class Room {
     std::vector<std::unique_ptr<Sector>> sectors;
     std::vector<std::unique_ptr<Light>> lights;
 
-    // Was used for "depth sorting" render list, but never assigned...?!
-    //float dist; // Distance to near plane, move to room?
+    static bool showBoundingBox;
 };
 
 #endif

include/StaticMesh.h

@@ -20,10 +20,15 @@ class StaticMesh {
 
     int getID() { return id; }
 
+    static void setShowBoundingBox(bool s) { showBoundingBox = s; }
+    static bool getShowBoundingBox() { return showBoundingBox; }
+
   private:
     int id;
     int mesh;
     std::unique_ptr<BoundingBox> bbox1, bbox2;
+
+    static bool showBoundingBox;
 };
 
 #endif

src/Render.cpp

@@ -11,6 +11,7 @@
 #include "global.h"
 #include "Camera.h"
 #include "Log.h"
+#include "StaticMesh.h"
 #include "World.h"
 #include "system/Shader.h"
 #include "system/Window.h"
@@ -180,7 +181,7 @@ void Render::displayUI() {
             item = 2;
         else if (mode == RenderMode::Solid)
             item = 3;
-        if (ImGui::Combo("Mode", &item, modeStrings, modeStringCount)) {
+        if (ImGui::Combo("Render Mode", &item, modeStrings, modeStringCount)) {
             if (item == 0)
                 mode = RenderMode::LoadScreen;
             else if (item == 1)
@@ -191,12 +192,26 @@ void Render::displayUI() {
                 mode = RenderMode::Solid;
         }
 
+        ImGui::Separator();
+        ImGui::Text("Camera:");
         bool updateViewFrustum = Camera::getUpdateViewFrustum();
         if (ImGui::Checkbox("Update Frustum##render", &updateViewFrustum)) {
             Camera::setUpdateViewFrustum(updateViewFrustum);
         }
         ImGui::SameLine();
         ImGui::Checkbox("Show Frustum##render", &displayViewFrustum);
+
+        ImGui::Separator();
+        ImGui::Text("Bounding Boxes:");
+        bool showBoundingBox = Room::getShowBoundingBox();
+        if (ImGui::Checkbox("Room##bbox", &showBoundingBox)) {
+            Room::setShowBoundingBox(showBoundingBox);
+        }
+        ImGui::SameLine();
+        bool showBoundingBox2 = StaticMesh::getShowBoundingBox();
+        if (ImGui::Checkbox("StaticMesh##bbox", &showBoundingBox2)) {
+            StaticMesh::setShowBoundingBox(showBoundingBox2);
+        }
     }
 }
 

src/Room.cpp

@@ -7,12 +7,13 @@
 
 #include "global.h"
 #include "Log.h"
-#include "Render.h"
 #include "Room.h"
 
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/intersect.hpp>
 
+bool Room::showBoundingBox = false;
+
 Room::Room(glm::vec3 _pos, BoundingBox* _bbox, RoomMesh* _mesh, unsigned int f,
            int a, int x, int z) : pos(_pos), bbox(_bbox), mesh(_mesh), flags(f),
                                   alternateRoom(a), numXSectors(x), numZSectors(z) {
@@ -28,7 +29,7 @@ void Room::display(glm::mat4 VP) {
         m->display(VP);
     }
 
-    if (Render::getMode() == RenderMode::Wireframe)
+    if (showBoundingBox)
         bbox->display(VP, glm::vec3(0.0f, 1.0f, 0.0f), glm::vec3(1.0f, 0.0f, 1.0f));
 }
 

src/StaticMesh.cpp

@@ -6,14 +6,15 @@
  */
 
 #include "global.h"
-#include "Render.h"
 #include "World.h"
 #include "StaticMesh.h"
 
+bool StaticMesh::showBoundingBox = false;
+
 void StaticMesh::display(glm::mat4 MVP) {
     getWorld().getMesh(mesh).display(MVP);
 
-    if (Render::getMode() == RenderMode::Wireframe) {
+    if (showBoundingBox) {
         bbox1->display(MVP, glm::vec3(1.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
         bbox2->display(MVP, glm::vec3(1.0f, 0.0f, 1.0f), glm::vec3(0.0f, 0.0f, 1.0f));
     }