textile triangle display

ChangeLog.md

@@ -4,6 +4,7 @@
 
     [ 20141127 ]
     * Started work on loading the object texture mapping, with debug UI
+    * Textiles debug UI also draws triangles “properly”
 
     [ 20141126 ]
     * Reduced code duplication for BinaryFile/BinaryMemory

include/TextureManager.h

@@ -30,10 +30,13 @@ class TextureTile {
     ~TextureTile();
 
     void add(TextureTileVertex* t);
+    bool isTriangle();
+    void display(float x, float y, float w, float h, float z);
 
+  private:
+    void displayTriangle(float x, float y, float w, float h, float z);
     void displayRectangle(float x, float y, float w, float h, float z);
 
-  private:
     uint16_t attribute;
     uint16_t texture;
     std::vector<TextureTileVertex*> vertices;

src/Game.cpp

@@ -73,20 +73,16 @@ int Game::loadLevel(const char* level) {
     auto loader = Loader::createLoader(level);
     if (loader) {
         // First Loader test
+        getLog() << "Trying to load using new loader..." << Log::endl;
         error = loader->load(level);
-        if (error == 0) {
-            getLog() << "Tried new Loader (0)..." << Log::endl;
-        } else {
+        if (error != 0) {
             getLog() << "Error while trying new loader (" << error << ")..." << Log::endl;
+            destroy();
         }
     }
 
     if ((!loader) || (error != 0)) {
-        // Clean-Up between new & old loader
-        if (error != 0)
-            destroy();
-
-        // Old TombRaider level loader
+        getLog() << "Falling back to old level loader..." << Log::endl;
         error = mTombRaider.Load(levelName.c_str());
         if (error != 0)
             return error;
@@ -99,7 +95,9 @@ int Game::loadLevel(const char* level) {
             tmp += "MAIN.SFX";
             error = mTombRaider.loadSFX(tmp.c_str());
             if (error != 0)
-                getLog() << "Could not load " << tmp << Log::endl;
+                getLog() << "Could not load SFX " << tmp << Log::endl;
+            else
+                getLog() << "Loaded external SFX file!" << Log::endl;
         }
 
         // Process data

src/Render.cpp

@@ -539,7 +539,7 @@ void Render::drawTextile(float x, float y, float w, float h, unsigned int textil
     if (mFlags & Render::fGL_Lights)
         glDisable(GL_LIGHTING);
 
-    getTextureManager().getTile(textile).displayRectangle(x, y, w, h, z);
+    getTextureManager().getTile(textile).display(x, y, w, h, z);
 
     if (mFlags & Render::fGL_Lights)
         glEnable(GL_LIGHTING);

src/TextureManager.cpp

@@ -40,14 +40,75 @@ void TextureTile::add(TextureTileVertex* t) {
     vertices.push_back(t);
 }
 
-void TextureTile::displayRectangle(float x, float y, float w, float h, float z) {
-    assert(vertices.size() == 4);
+bool TextureTile::isTriangle() {
+    assert(vertices.size() >= 3);
+
+    if (vertices.size() == 3)
+        return true;
+
+    return ((vertices.at(3)->xPixel == 0)
+            & (vertices.at(3)->xCoordinate == 0)
+            & (vertices.at(3)->yPixel == 0)
+            & (vertices.at(3)->yCoordinate == 0));
+}
 
+void TextureTile::display(float x, float y, float w, float h, float z) {
     getTextureManager().bindTextureId(texture);
-    //glBegin(GL_TRIANGLE_STRIP);
-    glBegin(GL_QUADS);
 
+    //! \fixme TR Rosetta Stone says this, but looks strange?
+    /*
+    if (attribute == 0) {
+        // Ignore transparency
+        glDisable(GL_BLEND);
+    }
+    */
+
+    if (isTriangle())
+        displayTriangle(x, y, w, h, z);
+    else
+        displayRectangle(x, y, w, h, z);
+
+    /*
+    if (attribute == 0) {
+        glEnable(GL_BLEND);
+    }
+    */
+}
+
+void TextureTile::displayRectangle(float x, float y, float w, float h, float z) {
+    float xmin = 256.0f, xmax = 0.0f;
+    float ymin = 256.0f, ymax = 0.0f;
     for (int i = 0; i < 4; i++) {
+        if (vertices.at(i)->xCoordinate == 255) {
+            if (vertices.at(i)->xPixel > xmax)
+                xmax = vertices.at(i)->xPixel;
+        } else {
+            if (vertices.at(i)->xPixel < xmin)
+                xmin = vertices.at(i)->xPixel;
+        }
+
+        if (vertices.at(i)->yCoordinate == 255) {
+            ymax = vertices.at(i)->yPixel;
+        } else {
+            ymin = vertices.at(i)->yPixel;
+        }
+    }
+
+    glBegin(GL_QUADS);
+    glTexCoord2f(xmin / 256.0f, ymin / 256.0f);
+    glVertex3f(x, y, z);
+    glTexCoord2f(xmax / 256.0f, ymin / 256.0f);
+    glVertex3f(x + w, y, z);
+    glTexCoord2f(xmax / 256.0f, ymax / 256.0f);
+    glVertex3f(x + w, y + h, z);
+    glTexCoord2f(xmin / 256.0f, ymax / 256.0f);
+    glVertex3f(x, y + h, z);
+    glEnd();
+}
+
+void TextureTile::displayTriangle(float x, float y, float w, float h, float z) {
+    glBegin(GL_TRIANGLE_STRIP);
+    for (int i = 0; i < 3; i++) {
         glTexCoord2f(vertices.at(i)->xPixel / 256.0f,
                 vertices.at(i)->yPixel / 256.0f);
 
@@ -65,7 +126,6 @@ void TextureTile::displayRectangle(float x, float y, float w, float h, float z)
             }
         }
     }
-
     glEnd();
 }
 

src/UI.cpp

@@ -200,7 +200,7 @@ void UI::display() {
                         : TextureManager::TextureStorage::SYSTEM) - 1);
             ImGui::PopItemWidth();
             ImGui::SameLine();
-            if (ImGui::Button("+##texplus")) {
+            if (ImGui::Button("+##texplus", ImVec2(0, 0), true)) {
                 if (index < (getTextureManager().numTextures(
                                 game ? TextureManager::TextureStorage::GAME
                                 : TextureManager::TextureStorage::SYSTEM) - 1))
@@ -209,7 +209,7 @@ void UI::display() {
                     index = 0;
             }
             ImGui::SameLine();
-            if (ImGui::Button("-##texminus")) {
+            if (ImGui::Button("-##texminus", ImVec2(0, 0), true)) {
                 if (index > 0)
                     index--;
                 else
@@ -250,14 +250,14 @@ void UI::display() {
                 ImGui::SliderInt("##tileslide", &index, 0, getTextureManager().numTiles() - 1);
                 ImGui::PopItemWidth();
                 ImGui::SameLine();
-                if (ImGui::Button("+##tileplus")) {
+                if (ImGui::Button("+##tileplus", ImVec2(0, 0), true)) {
                     if (index < (getTextureManager().numTiles() - 1))
                         index++;
                     else
                         index = 0;
                 }
                 ImGui::SameLine();
-                if (ImGui::Button("-##tileminus")) {
+                if (ImGui::Button("-##tileminus", ImVec2(0, 0), true)) {
                     if (index > 0)
                         index--;
                     else
@@ -273,6 +273,9 @@ void UI::display() {
                     getRender().debugDisplayTextile();
                     visibleTile = false;
                 }
+                if (visibleTile && (index < getTextureManager().numTiles())) {
+                    ImGui::Text(getTextureManager().getTile(index).isTriangle() ? "Triangle" : "Rectangle");
+                }
                 if (visibleTile) {
                     getRender().debugDisplayTextile(index,
                             ImGui::GetWindowPos().x - (ImGui::GetWindowWidth() / 2),