Return of (animated) textile and sprite viewer

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140204 ]
+    * Return of textile, animated textile and sprite viewer, in TextureManager
+
     [ 20140203 ]
     * Updated imgui to newest version, supporting Images
     * Texture viewer is back, using imgui Images

include/Sprite.h

@@ -15,9 +15,13 @@ class Sprite {
     Sprite(int tile, int x, int y, int width, int height);
     void display(glm::mat4 MVP);
 
+    int getTexture() { return texture; }
+    glm::vec4 getUVs() { return uv2D; }
+
   private:
     int texture;
     ShaderBuffer vertices, uvs;
+    glm::vec4 uv2D;
 };
 
 class SpriteSequence {
@@ -27,6 +31,8 @@ class SpriteSequence {
     void display(glm::mat4 MVP, int index);
 
     int getID() { return id; }
+    int getStart() { return start; }
+    int size() { return length; }
 
   private:
     int id;

include/TextureManager.h

@@ -106,10 +106,12 @@ class TextureManager {
     static void addAnimatedTile(int index, int tile);
     static int numAnimatedTiles();
     static int getFirstTileAnimation(int index);
-    static int getNextTileAnimation(int tile);
+    static int getNextTileAnimation(int index, int tile);
 
     static BufferManager* getBufferManager(int tex, TextureStorage store);
 
+    static void display();
+
   private:
     static std::vector<unsigned int>& getIds(TextureStorage s);
     static std::vector<int>& getUnits(TextureStorage s);

src/Sprite.cpp

@@ -41,6 +41,8 @@ Sprite::Sprite(int tile, int x, int y, int width, int height) : texture(tile) {
 
     vertices.bufferData(vert);
     uvs.bufferData(uv);
+
+    uv2D = glm::vec4(uv.at(0), uv.at(2));
 }
 
 void Sprite::display(glm::mat4 MVP) {

src/TextureManager.cpp

@@ -6,11 +6,14 @@
  * \author xythobuz
  */
 
+#include "imgui/imgui.h"
 #include "stb/stb_image.h"
 
 #include "global.h"
+#include "Game.h"
 #include "Log.h"
 #include "RunTime.h"
+#include "World.h"
 #include "utils/Folder.h"
 #include "utils/pcx.h"
 #include "utils/pixel.h"
@@ -228,15 +231,14 @@ int TextureManager::getFirstTileAnimation(int index) {
     return animations.at(index).at(0);
 }
 
-int TextureManager::getNextTileAnimation(int tile) {
-    for (int a = 0; a < animations.size(); a++) {
-        for (int i = 0; i < animations.at(a).size(); i++) {
-            if (animations.at(a).at(i) == tile) {
-                if (i < (animations.at(a).size() - 1))
-                    return animations.at(a).at(i + 1);
-                else
-                    return animations.at(a).at(0);
-            }
+int TextureManager::getNextTileAnimation(int index, int tile) {
+    assert(index < animations.size());
+    for (int i = 0; i < animations.at(index).size(); i++) {
+        if (animations.at(index).at(i) == tile) {
+            if (i < (animations.at(index).size() - 1))
+                return animations.at(index).at(i + 1);
+            else
+                return animations.at(index).at(0);
         }
     }
     return -1;
@@ -313,6 +315,206 @@ std::vector<int>& TextureManager::getUnits(TextureStorage s) {
         return systemUnits;
 }
 
+void TextureManager::display() {
+    if (ImGui::CollapsingHeader("Texture Viewer")) {
+        static bool game = Game::isLoaded();
+        static int index = 0;
+        ImGui::SliderInt("##texslide", &index, 0, TextureManager::numTextures(
+                             game ? TextureStorage::GAME : TextureStorage::SYSTEM) - 1);
+        ImGui::SameLine();
+        if (ImGui::Button("+##texplus", ImVec2(0, 0), true)) {
+            if (index < (numTextures(
+                             game ? TextureStorage::GAME : TextureStorage::SYSTEM) - 1))
+                index++;
+            else
+                index = 0;
+        }
+        ImGui::SameLine();
+        if (ImGui::Button("-##texminus", ImVec2(0, 0), true)) {
+            if (index > 0)
+                index--;
+            else
+                index = numTextures(
+                            game ? TextureStorage::GAME : TextureStorage::SYSTEM) - 1;
+        }
+
+        if ((numTextures(TextureStorage::GAME) > 0)) {
+            ImGui::SameLine();
+            ImGui::Checkbox("Game##texgame", &game);
+        } else {
+            game = false;
+        }
+
+        if (index >= numTextures(game ? TextureStorage::GAME : TextureStorage::SYSTEM)) {
+            index = numTextures(game ? TextureStorage::GAME : TextureStorage::SYSTEM) - 1;
+            if (index < 0) {
+                game = false;
+                index = 0;
+            }
+        }
+
+        auto bm = getBufferManager(index, game ? TextureStorage::GAME
+                                                            : TextureStorage::SYSTEM);
+        ImGui::Image(bm, ImVec2(ImGui::GetColumnWidth() * 2 / 3, ImGui::GetColumnWidth() * 2 / 3));
+    }
+
+    if (ImGui::CollapsingHeader("Textile Viewer")) {
+        if (numTiles() > 0) {
+            static int index = 0;
+            ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5f);
+            ImGui::SliderInt("##tileslide", &index, 0, numTiles() - 1);
+            ImGui::PopItemWidth();
+            ImGui::SameLine();
+            if (ImGui::Button("+##tileplus", ImVec2(0, 0), true)) {
+                if (index < (numTiles() - 1))
+                    index++;
+                else
+                    index = 0;
+            }
+            ImGui::SameLine();
+            if (ImGui::Button("-##tileminus", ImVec2(0, 0), true)) {
+                if (index > 0)
+                    index--;
+                else
+                    index = numTiles() - 1;
+            }
+
+            if (index >= numTiles())
+                index = 0;
+
+            auto& tile = getTile(index);
+            auto bm = getBufferManager(tile.getTexture(), TextureStorage::GAME);
+            ImVec2 size(ImGui::GetColumnWidth() * 2 / 3, ImGui::GetColumnWidth() * 2 / 3);
+            auto uvA = tile.getUV(0);
+            auto uvB = tile.getUV(2);
+            ImVec2 uv1(uvA.x, uvA.y);
+            ImVec2 uv2(uvB.x, uvB.y);
+            ImGui::Image(bm, size, uv1, uv2);
+        } else {
+            ImGui::Text("No textiles are currently loaded...!");
+        }
+    }
+
+    if (ImGui::CollapsingHeader("Animated Textile Viewer")) {
+        if (numAnimatedTiles() > 0) {
+            static int index = 0;
+            static int tile = getFirstTileAnimation(index);
+            if (ImGui::SliderInt("##animslide", &index, 0, numAnimatedTiles() - 1)) {
+                tile = getFirstTileAnimation(index);
+            }
+            ImGui::SameLine();
+            if (ImGui::Button("+##animplus", ImVec2(0, 0), true)) {
+                if (index < (numAnimatedTiles() - 1))
+                    index++;
+                else
+                    index = 0;
+                tile = getFirstTileAnimation(index);
+            }
+            ImGui::SameLine();
+            if (ImGui::Button("-##animminus", ImVec2(0, 0), true)) {
+                if (index > 0)
+                    index--;
+                else
+                    index = numAnimatedTiles() - 1;
+                tile = getFirstTileAnimation(index);
+            }
+
+            if (index >= numAnimatedTiles()) {
+                index = 0;
+                tile = getFirstTileAnimation(index);
+            }
+
+            int next = getNextTileAnimation(index, tile);
+            if (next == -1) {
+                index = 0;
+                tile = getFirstTileAnimation(index);
+            }
+
+            ImGui::SameLine();
+            ImGui::Text("%d", tile);
+
+            auto& t = getTile(tile);
+            auto bm = getBufferManager(t.getTexture(), TextureStorage::GAME);
+            ImVec2 size(ImGui::GetColumnWidth() * 2 / 3, ImGui::GetColumnWidth() * 2 / 3);
+            auto uvA = t.getUV(0);
+            auto uvB = t.getUV(2);
+            ImVec2 uv1(uvA.x, uvA.y);
+            ImVec2 uv2(uvB.x, uvB.y);
+            ImGui::Image(bm, size, uv1, uv2);
+
+            static int fr = 0;
+            if (fr > 0) {
+                fr--;
+            } else {
+                fr = RunTime::getFPS() / 2;
+                tile = next;
+            }
+        } else {
+            ImGui::Text("No animated textures are currently loaded...!");
+        }
+    }
+
+    if (ImGui::CollapsingHeader("Sprite Sequence Viewer")) {
+        if (getWorld().sizeSprite() <= 0) {
+            ImGui::Text("Please load a level containing sprites!");
+        } else {
+            static int index = 0;
+            static int sprite = 0;
+            if (ImGui::SliderInt("##spriteslide", &index, 0, getWorld().sizeSpriteSequence() - 1)) {
+                sprite = 0;
+            }
+            ImGui::SameLine();
+            if (ImGui::Button("+##spriteplus", ImVec2(0, 0), true)) {
+                if (index < (getWorld().sizeSpriteSequence() - 1))
+                    index++;
+                else
+                    index = 0;
+                sprite = 0;
+            }
+            ImGui::SameLine();
+            if (ImGui::Button("-##spriteminus", ImVec2(0, 0), true)) {
+                if (index > 0)
+                    index--;
+                else
+                    index = getWorld().sizeSpriteSequence() - 1;
+                sprite = 0;
+            }
+
+            if (index >= getWorld().sizeSpriteSequence()) {
+                index = 0;
+                sprite = 0;
+            }
+
+            if (sprite >= getWorld().getSpriteSequence(index).size()) {
+                sprite = 0;
+            }
+
+            ImGui::SameLine();
+            ImGui::Text("Sprite %d/%d", sprite + 1, getWorld().getSpriteSequence(index).size());
+
+            auto& s = getWorld().getSprite(getWorld().getSpriteSequence(index).getStart() + sprite);
+            auto bm = getBufferManager(s.getTexture(), TextureStorage::GAME);
+            ImVec2 size(ImGui::GetColumnWidth() * 2 / 3, ImGui::GetColumnWidth() * 2 / 3);
+            auto uv = s.getUVs();
+            ImVec2 uv1(uv.x, uv.w);
+            ImVec2 uv2(uv.z, uv.y);
+            ImGui::Image(bm, size, uv1, uv2);
+
+            static int fr = 0;
+            if (fr > 0) {
+                fr--;
+            } else {
+                fr = RunTime::getFPS() / 10;
+                if (sprite < (getWorld().getSpriteSequence(index).size() - 1))
+                    sprite++;
+                else
+                    sprite = 0;
+            }
+
+        }
+    }
+}
+
 // ----------------------------------------------------------------------------
 
 glm::vec2 TextureTile::getUV(unsigned int i) {

src/UI.cpp

@@ -16,9 +16,6 @@
 #include "RunTime.h"
 #include "SoundManager.h"
 #include "TextureManager.h"
-#include "World.h"
-#include "commands/Command.h"
-#include "system/Sound.h"
 #include "system/Window.h"
 #include "utils/time.h"
 #include "UI.h"
@@ -273,225 +270,10 @@ void UI::display() {
     if (ImGui::Begin("Engine", &visible, ImVec2(400, 400))) {
         Render::displayUI();
         RunTime::display();
-
-        if (ImGui::CollapsingHeader("Texture Viewer")) {
-            static bool game = Game::isLoaded();
-            static int index = 0;
-            ImGui::SliderInt("##texslide", &index, 0, TextureManager::numTextures(
-                                 game ? TextureStorage::GAME : TextureStorage::SYSTEM) - 1);
-            ImGui::SameLine();
-            if (ImGui::Button("+##texplus", ImVec2(0, 0), true)) {
-                if (index < (TextureManager::numTextures(
-                                 game ? TextureStorage::GAME : TextureStorage::SYSTEM) - 1))
-                    index++;
-                else
-                    index = 0;
-            }
-            ImGui::SameLine();
-            if (ImGui::Button("-##texminus", ImVec2(0, 0), true)) {
-                if (index > 0)
-                    index--;
-                else
-                    index = TextureManager::numTextures(
-                                game ? TextureStorage::GAME : TextureStorage::SYSTEM) - 1;
-            }
-
-            if ((TextureManager::numTextures(TextureStorage::GAME) > 0)) {
-                ImGui::SameLine();
-                ImGui::Checkbox("Game##texgame", &game);
-            } else {
-                game = false;
-            }
-
-            if (index >= TextureManager::numTextures(game ? TextureStorage::GAME : TextureStorage::SYSTEM)) {
-                index = TextureManager::numTextures(game ? TextureStorage::GAME : TextureStorage::SYSTEM) - 1;
-                if (index < 0) {
-                    game = false;
-                    index = 0;
-                }
-            }
-
-            auto bm = TextureManager::getBufferManager(index, game ? TextureStorage::GAME
-                                                                : TextureStorage::SYSTEM);
-            ImGui::Image(bm, ImVec2(ImGui::GetColumnWidth() * 2 / 3, ImGui::GetColumnWidth() * 2 / 3));
-        }
-
+        TextureManager::display();
         SoundManager::display();
 
-        /*
-        static bool visibleTex = false;
-        static bool visibleTile = false;
-        static bool visibleAnim = false;
-        static bool visibleSprite = false;
-
-
-        if (ImGui::CollapsingHeader("Textile Viewer")) {
-            if (TextureManager::numTiles() > 0) {
-                static int index = 0;
-                ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5f);
-                ImGui::SliderInt("##tileslide", &index, 0, TextureManager::numTiles() - 1);
-                ImGui::PopItemWidth();
-                ImGui::SameLine();
-                if (ImGui::Button("+##tileplus", ImVec2(0, 0), true)) {
-                    if (index < (TextureManager::numTiles() - 1))
-                        index++;
-                    else
-                        index = 0;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("-##tileminus", ImVec2(0, 0), true)) {
-                    if (index > 0)
-                        index--;
-                    else
-                        index = TextureManager::numTiles() - 1;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Show##tileshow")) {
-                    visibleTile = true;
-                    visibleTex = false;
-                    visibleAnim = false;
-                    visibleSprite = false;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear##tileclear")) {
-                    getRender().debugDisplayTextile();
-                    visibleTile = false;
-                }
-                if (visibleTile && (index < TextureManager::numTiles())) {
-                    ImGui::Text(TextureManager::.getTile(index).isTriangle() ? "Triangle" : "Rectangle");
-                }
-                if (visibleTile) {
-                    getRender().debugDisplayTextile(index,
-                                                    ImGui::GetWindowPos().x - (ImGui::GetWindowWidth() / 2),
-                                                    ImGui::GetWindowPos().y,
-                                                    (ImGui::GetWindowWidth() / 2), (ImGui::GetWindowWidth() / 2));
-                }
-            } else {
-                ImGui::Text("Please load a level using the new loader!");
-            }
-        }
-
-        if (ImGui::CollapsingHeader("Animated Textile Viewer")) {
-            if (TextureManager::.numAnimatedTiles() > 0) {
-                static int index = 0;
-                static int tile = TextureManager::.getFirstTileAnimation(index);
-                ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5f);
-                if (ImGui::SliderInt("##animslide", &index, 0, TextureManager::.numAnimatedTiles() - 1)) {
-                    tile = TextureManager::.getFirstTileAnimation(index);
-                }
-                ImGui::PopItemWidth();
-                ImGui::SameLine();
-                if (ImGui::Button("+##animplus", ImVec2(0, 0), true)) {
-                    if (index < (TextureManager::.numAnimatedTiles() - 1))
-                        index++;
-                    else
-                        index = 0;
-                    tile = TextureManager::.getFirstTileAnimation(index);
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("-##animminus", ImVec2(0, 0), true)) {
-                    if (index > 0)
-                        index--;
-                    else
-                        index = TextureManager::.numAnimatedTiles() - 1;
-                    tile = TextureManager::.getFirstTileAnimation(index);
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Show##animshow")) {
-                    visibleAnim = true;
-                    visibleTex = false;
-                    visibleTile = false;
-                    visibleSprite = false;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear##animclear")) {
-                    getRender().debugDisplayTextile();
-                    visibleAnim = false;
-                }
-                if (visibleAnim) {
-                    static int fr = 0;
-                    if (fr > 0) {
-                        fr--;
-                    } else {
-                        getRender().debugDisplayTextile(tile,
-                                                        ImGui::GetWindowPos().x - (ImGui::GetWindowWidth() / 2),
-                                                        ImGui::GetWindowPos().y,
-                                                        (ImGui::GetWindowWidth() / 2), (ImGui::GetWindowWidth() / 2));
-                        fr = RunTime::getFPS() / 2;
-                        tile = TextureManager::.getNextTileAnimation(tile);
-                    }
-                    ImGui::Text("Current Tile: %d", tile);
-                }
-            } else {
-                ImGui::Text("Please load a level with animated textures!");
-            }
-        }
-
-        if (ImGui::CollapsingHeader("Sprite Sequence Viewer")) {
-            if (getWorld().sizeSprite() <= 0) {
-                ImGui::Text("Please load a level containing sprites!");
-            } else {
-                static int index = 0;
-                static int sprite = 0;
-                ImGui::PushItemWidth(ImGui::GetWindowWidth() * 0.5f);
-                if (ImGui::SliderInt("##spriteslide", &index, 0, getWorld().sizeSprite() - 1))
-                    sprite = 0;
-                ImGui::PopItemWidth();
-                ImGui::SameLine();
-                if (ImGui::Button("+##spriteplus", ImVec2(0, 0), true)) {
-                    if (index < (getWorld().sizeSprite() - 1))
-                        index++;
-                    else
-                        index = 0;
-                    sprite = 0;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("-##spriteminus", ImVec2(0, 0), true)) {
-                    if (index > 0)
-                        index--;
-                    else
-                        index = getWorld().sizeSprite() - 1;
-                    sprite = 0;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Show##spriteshow")) {
-                    visibleSprite = true;
-                    visibleTex = false;
-                    visibleTile = false;
-                    visibleAnim = false;
-                    sprite = 0;
-                }
-                ImGui::SameLine();
-                if (ImGui::Button("Clear##spriteclear")) {
-                    getRender().debugDisplaySprite();
-                    visibleSprite = false;
-                }
-                if (visibleSprite) {
-                    static int fr = 0;
-                    if (fr > 0) {
-                        fr--;
-                    } else {
-                        getRender().debugDisplaySprite(index, sprite,
-                                                       ImGui::GetWindowPos().x - (ImGui::GetWindowWidth() / 2),
-                                                       ImGui::GetWindowPos().y,
-                                                       (ImGui::GetWindowWidth() / 2), (ImGui::GetWindowWidth() / 2));
-                        fr = RunTime::getFPS() / 10;
-                        if (sprite < (getWorld().getSprite(index).size() - 1))
-                            sprite++;
-                        else
-                            sprite = 0;
-                    }
-
-                    ImGui::Text("Sprite %d/%d", sprite + 1, getWorld().getSprite(index).size());
-                }
-            }
-        }
-        */
-
         if (ImGui::CollapsingHeader("ImGui/Debug UI Help")) {
-            //ImGui::TextWrapped("DebugViewer Textures/Textiles/Sprites will be drawn on"
-            //                   " the left side and scale with the size of this window!");
-            //ImGui::Separator();
             ImGui::ShowUserGuide();
             ImGui::Separator();
             if (ImGui::Button("Show/Hide Test Window")) {