Fixed Sprite rotation, Sound upside-down, Entity UI

ChangeLog.md

@@ -6,7 +6,9 @@
     * Can click on RoomModels and RoomSprites
     * This will show their BoundingSpheres
     * Fixed Mouse Selector Depth Sorting Issue
-    * Improved Room List UI
+    * Improved Room List UI, added Entity List UI
+    * Fixed Room and Entity Sprite rotation Issue
+    * Fixed upside-down Sound Listener positioning
 
     [ 20150803 ]
     * Started working on ray casting for mouse object selection

include/Entity.h

@@ -14,6 +14,7 @@ class Entity {
         : id(i), room(r), pos(po), rot(ro), cache(-1), cacheType(-1),
           sprite(0), animation(0), frame(0) { }
     void display(glm::mat4 VP);
+    void displayUI();
 
     int getID() { return id; }
     int getRoom() { return room; }
@@ -35,6 +36,8 @@ class Entity {
     static bool getShowEntityModels() { return showEntityModels; }
 
   private:
+    void find();
+
     int id;
     int room;
     glm::vec3 pos;

src/Camera.cpp

@@ -209,7 +209,7 @@ bool Camera::update() {
         calculateFrustumPlanes();
 
     glm::vec3 at(0.0f, 0.0f, -1.0f);
-    glm::vec3 up(0.0f, -1.0f, 0.0f);
+    glm::vec3 up(0.0f, 1.0f, 0.0f);
     Sound::listenAt(pos, quaternion * at, quaternion * up);
 
     dirty = false;

src/Entity.cpp

@@ -12,6 +12,7 @@
 #include "Entity.h"
 
 #include <glm/gtc/matrix_transform.hpp>
+#include <imgui/imgui.h>
 
 #define CACHE_SPRITE 0
 #define CACHE_MESH 1
@@ -21,8 +22,8 @@ bool Entity::showEntitySprites = true;
 bool Entity::showEntityMeshes = false;
 bool Entity::showEntityModels = false;
 
-void Entity::display(glm::mat4 VP) {
-    if ((cache == -1) || (cacheType == -1)) {
+void Entity::find() {
+    if ((cache <= -1) || (cacheType <= -1)) {
         /*
          * The order in which to look for matching objects with the same ID
          * seems to be very important!
@@ -60,11 +61,15 @@ void Entity::display(glm::mat4 VP) {
         orAssertGreaterThan(cache, -1);
         orAssertGreaterThan(cacheType, -1);
     }
+}
+
+void Entity::display(glm::mat4 VP) {
+    find();
 
     glm::mat4 translate = glm::translate(glm::mat4(1.0f), pos);
     glm::mat4 rotate;
-    if (cacheType == 0) {
-        rotate = glm::rotate(glm::mat4(1.0f), Camera::getRotation().x, glm::vec3(0.0f, 1.0f, 0.0f));
+    if (cacheType == CACHE_SPRITE) {
+        rotate = glm::rotate(glm::mat4(1.0f), -Camera::getRotation().x, glm::vec3(0.0f, 1.0f, 0.0f));
     } else {
         rotate = glm::rotate(glm::mat4(1.0f), rot.y, glm::vec3(0.0f, 1.0f, 0.0f));
     }
@@ -83,3 +88,20 @@ void Entity::display(glm::mat4 VP) {
     }
 }
 
+void Entity::displayUI() {
+    find();
+
+    ImGui::Text("%03d", id);
+    ImGui::NextColumn();
+    if (cacheType == CACHE_SPRITE) {
+        ImGui::Text("SpriteSequence");
+    } else if (cacheType == CACHE_MESH) {
+        ImGui::Text("StaticMesh");
+    } else if (cacheType == CACHE_MODEL) {
+        ImGui::Text("SkeletalModel");
+    }
+    ImGui::NextColumn();
+    ImGui::Text("%03d", cache);
+    ImGui::NextColumn();
+}
+

src/RoomData.cpp

@@ -77,11 +77,8 @@ void RoomSprite::displayBoundingSphere(glm::mat4 VP, glm::vec3 color) {
 
 void RoomSprite::display(glm::mat4 VP) {
     glm::mat4 translate = glm::translate(glm::mat4(1.0f), pos);
-
-    //! \fixme Calculate angle between camera and sprite
-    glm::mat4 rotate = glm::rotate(glm::mat4(1.0f), Camera::getRotation().x,
+    glm::mat4 rotate = glm::rotate(glm::mat4(1.0f), -Camera::getRotation().x,
                                    glm::vec3(0.0f, 1.0f, 0.0f));
-
     World::getSprite(sprite).display(VP * (translate * rotate));
 }
 

src/UI.cpp

@@ -296,9 +296,9 @@ void UI::display() {
 
         Render::displayUI();
         RunTime::display();
-        TextureManager::display();
-        SoundManager::display();
         World::displayUI();
+        SoundManager::display();
+        TextureManager::display();
 
         if (ImGui::CollapsingHeader("Library Versions")) {
             ImGui::TextWrapped("%s", VERSION);

src/World.cpp

@@ -122,7 +122,7 @@ Mesh& World::getMesh(unsigned long index) {
 void World::displayUI() {
     // Rooms
     static bool offsets = false;
-    if (ImGui::CollapsingHeader("Rooms")) {
+    if (ImGui::CollapsingHeader("Room Listing")) {
         ImGui::Columns(8, "rooms");
         ImGui::Text("No");
         ImGui::NextColumn();
@@ -159,22 +159,49 @@ void World::displayUI() {
         ImGui::Columns(1);
     }
 
-    // Static Meshes
+    // Entities
     static bool offsets2 = false;
-    if (ImGui::CollapsingHeader("StaticMeshes")) {
-        ImGui::Columns(3, "staticmeshes");
+    if (ImGui::CollapsingHeader("Entity Listing")) {
+        ImGui::Columns(4, "entities");
         ImGui::Text("No");
         ImGui::NextColumn();
         ImGui::Text("ID");
         ImGui::NextColumn();
-        ImGui::Text("Mesh");
+        ImGui::Text("Type");
+        ImGui::NextColumn();
+        ImGui::Text("Index");
         ImGui::NextColumn();
         ImGui::Separator();
         if (!offsets2) {
             ImGui::SetColumnOffset(1, 40.0f);
             ImGui::SetColumnOffset(2, 80.0f);
+            ImGui::SetColumnOffset(3, 200.0f);
             offsets2 = true;
         }
+        for (int i = 0; i < entities.size(); i++) {
+            ImGui::Text("%03d", i);
+            ImGui::NextColumn();
+            entities.at(i)->displayUI();
+        }
+        ImGui::Columns(1);
+    }
+
+    // Static Meshes
+    static bool offsets3 = false;
+    if (ImGui::CollapsingHeader("StaticMesh Listing")) {
+        ImGui::Columns(3, "staticmeshes");
+        ImGui::Text("No");
+        ImGui::NextColumn();
+        ImGui::Text("ID");
+        ImGui::NextColumn();
+        ImGui::Text("Mesh");
+        ImGui::NextColumn();
+        ImGui::Separator();
+        if (!offsets3) {
+            ImGui::SetColumnOffset(1, 40.0f);
+            ImGui::SetColumnOffset(2, 80.0f);
+            offsets3 = true;
+        }
         for (int i = 0; i < staticMeshes.size(); i++) {
             ImGui::Text("%03d", i);
             ImGui::NextColumn();