Main menu rewrite as imgui window

ChangeLog.md

@@ -2,6 +2,11 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140312 ]
+    * Now including imguifilesystem dependency
+    * Completely re-wrote Main menu, now reading TOMBPC.DAT scripts
+    * Main menu is now just a full-screen ImGui window
+
     [ 20140310 ]
     * Tried to fix moveable loading. Fixed TR1 angle parser, but still not working better.
 

README.md

@@ -187,5 +187,7 @@ See the respective files in `cmake` for their licensing.
 
 The [clibs/commander](https://github.com/clibs/commander) dependency is Copyright (c) 2012 TJ Holowaychuk (tj@vision-media.ca) and licensed under the [MIT License](http://opensource.org/licenses/MIT).
 
-The included GUI lib, [imgui](https://github.com/ocornut/imgui/) is Copyright (c) 2014 Omar Cornut. See src/deps/imgui/LICENSE for more informations about the MIT license used.
+The included GUI lib, [imgui](https://github.com/ocornut/imgui/) is Copyright (c) 2014 Omar Cornut. See src/deps/imgui/LICENSE for more informations about the MIT license used. 
+
+Also included is the imgui addon [imguifilesystem by Flix01](https://gist.github.com/Flix01/f34b5efa91e50a241c1b).
 

include/Game.h

@@ -9,7 +9,6 @@
 #define _GAME_H_
 
 #include <string>
-#include <vector>
 
 #include "Entity.h"
 
@@ -18,7 +17,7 @@ class Game {
     static void destroy();
 
     static bool isLoaded() { return mLoaded; }
-    static int loadLevel(const char* level);
+    static int loadLevel(std::string level);
 
     static void handleAction(ActionEvents action, bool isFinished);
     static void handleMouseMotion(int xrel, int yrel, int xabs, int yabs);

include/Menu.h

@@ -1,6 +1,6 @@
 /*!
  * \file include/Menu.h
- * \brief Menu 'overlay' interface
+ * \brief Main Menu
  *
  * \author xythobuz
  */
@@ -8,57 +8,30 @@
 #ifndef _MENU_H_
 #define _MENU_H_
 
-#include <functional>
+#include <vector>
+
+#include "Script.h"
+#include "utils/Folder.h"
 
 class Menu {
   public:
+    static int initialize();
+    static void shutdown();
+    static void display();
 
-    virtual ~Menu() { }
-
-    virtual int initialize() = 0;
-
-    virtual void display() = 0;
-
-    virtual void handleKeyboard(KeyboardButton key, bool pressed) = 0;
-
-    virtual void handleMouseClick(unsigned int x, unsigned int y,
-                                  KeyboardButton button, bool released) = 0;
-
-    virtual void handleMouseScroll(int xrel, int yrel) = 0;
-
-    bool isVisible() { return visible; }
-
-    void setVisible(bool v) { visible = v; }
+    static bool isVisible() { return visible; }
+    static void setVisible(bool v) { visible = v; }
 
     static const glm::vec4 textColor;
     static const glm::vec4 selectedColor;
 
-  protected:
-
-    virtual void showDialog(std::string msg, std::string btn1, std::string btn2 = "",
-                            std::function<int (bool state)> callback = std::function<int (bool)>());
-
-    virtual void ackDialog();
-
-    virtual bool handleKeyboardDialog(KeyboardButton key, bool pressed);
-
-    virtual bool handleMouseClickDialog(unsigned int x, unsigned int y,
-                                        KeyboardButton button, bool released);
-
-    virtual bool handleMouseScrollDialog(int xrel, int yrel);
-
-    virtual void displayDialog();
-
-    bool dialogState;
-    std::string dialogText;
-    std::string dialogButton1;
-    std::string dialogButton2;
-    std::function<int (bool state)> dialogFunction;
-
-    bool visible;
+  private:
+    static bool visible;
+    static Folder* mapFolder;
+    static std::vector<Script> scripts;
+    static std::vector<Folder> paths;
+    static std::vector<int> images;
 };
 
-Menu& getMenu();
-
 #endif
 

include/MenuFolder.h

@@ -1,52 +0,0 @@
-/*!
- * \file include/MenuFolder.h
- * \brief File-Explorer like Menu
- *
- * \author xythobuz
- */
-
-#ifndef _MENU_FOLDER_H_
-#define _MENU_FOLDER_H_
-
-#include "Menu.h"
-#include "utils/Folder.h"
-
-/*!
- * \brief Menu 'overlay'
- */
-class MenuFolder : public Menu {
-  public:
-
-    /*!
-     * \brief Constructs an object of MenuFolder
-     */
-    MenuFolder();
-
-    /*!
-     * \brief Deconstructs an object of MenuFolder
-     */
-    virtual ~MenuFolder();
-
-    virtual int initialize();
-
-    virtual void display();
-    virtual void handleKeyboard(KeyboardButton key, bool pressed);
-    virtual void handleMouseClick(unsigned int x, unsigned int y,
-                                  KeyboardButton button, bool released);
-    virtual void handleMouseScroll(int xrel, int yrel);
-
-  private:
-
-    int init(std::string s);
-    int init(Folder* folder, bool filter = true);
-    virtual void loadOrOpen();
-
-    long mCursor;
-    long mMin;
-
-    Folder* mapFolder;
-    bool hiddenState;
-};
-
-#endif
-

include/Script.h

@@ -91,9 +91,8 @@ class Script {
     } ScriptItem;
 
     Script();
-    ~Script();
 
-    int load(const char* file);
+    int load(std::string file);
 
     unsigned int levelCount();
     std::string getLevelName(unsigned int i);
@@ -124,6 +123,9 @@ class Script {
     void registerScriptHandler(ScriptOpCode op, std::function<int (bool, uint16_t)> func);
     int runScript(unsigned int level);
 
+    std::string getDescription() { return description; }
+    std::string getLanguage();
+
   private:
 
     typedef enum {

include/utils/strings.h

@@ -16,5 +16,11 @@ std::string expandHomeDirectory(std::string s);
 
 bool stringEndsWith(std::string s, std::string suffix, bool casesensitive = false);
 
+std::string removeLastPathElement(std::string s);
+
+std::string getLastPathElement(std::string s);
+
+std::string convertPathDelimiter(std::string s);
+
 #endif
 

src/CMakeLists.txt

@@ -63,7 +63,6 @@ set (SRCS ${SRCS} "Game.cpp" "../include/Game.h")
 set (SRCS ${SRCS} "Log.cpp" "../include/Log.h")
 set (SRCS ${SRCS} "main.cpp")
 set (SRCS ${SRCS} "Menu.cpp" "../include/Menu.h")
-set (SRCS ${SRCS} "MenuFolder.cpp" "../include/MenuFolder.h")
 set (SRCS ${SRCS} "Mesh.cpp" "../include/Mesh.h")
 set (SRCS ${SRCS} "Render.cpp" "../include/Render.h")
 set (SRCS ${SRCS} "Room.cpp" "../include/Room.h")

src/Game.cpp

@@ -11,6 +11,7 @@
 #include "Game.h"
 #include "loader/Loader.h"
 #include "Log.h"
+#include "Menu.h"
 #include "Render.h"
 #include "SoundManager.h"
 #include "TextureManager.h"
@@ -37,7 +38,7 @@ void Game::destroy() {
     getWorld().destroy();
 }
 
-int Game::loadLevel(const char* level) {
+int Game::loadLevel(std::string level) {
     destroy();
 
     Log::get(LOG_INFO) << "Loading " << level << Log::endl;
@@ -63,11 +64,10 @@ int Game::loadLevel(const char* level) {
 
         mLoaded = true;
         Render::setMode(RenderMode::Texture);
+        Menu::setVisible(false);
 
         if (mLara == -1) {
             Log::get(LOG_WARNING) << "Can't find Lara entity in level?!" << Log::endl;
-            Console::setVisible(true);
-            UI::setVisible(true);
         } else {
             Camera::setPosition(glm::vec3(getLara().getPosition().x,
                                           getLara().getPosition().y - 1024.0f,

src/Menu.cpp

@@ -1,173 +1,230 @@
 /*!
  * \file src/Menu.cpp
- * \brief Menu 'overlay'
+ * \brief Main Menu
  *
  * \author xythobuz
  */
 
+#include "imgui/imgui.h"
+
 #include "global.h"
+#include "Console.h"
+#include "Game.h"
 #include "Log.h"
-#include "Menu.h"
+#include "RunTime.h"
+#include "UI.h"
+#include "TextureManager.h"
 #include "system/Font.h"
 #include "system/Window.h"
+#include "utils/random.h"
+#include "utils/strings.h"
+#include "Menu.h"
 
 const glm::vec4 Menu::textColor(0.5f, 0.7f, 1.0f, 1.0f);
 const glm::vec4 Menu::selectedColor(1.0f, 0.0f, 0.0f, 1.0f);
 
-void Menu::showDialog(std::string msg, std::string btn1, std::string btn2,
-                      std::function<int (bool state)> callback) {
-    // Only show one dialog at a time
-    assertEqual(dialogText.length(), 0);
-    assertEqual(dialogButton1.length(), 0);
-    assertEqual(dialogButton2.length(), 0);
-
-    assertGreaterThan(msg.length(), 0);
-    assertGreaterThan(btn1.length(), 0);
-
-    dialogText = msg;
-    dialogButton1 = btn1;
-    dialogButton2 = btn2;
-    dialogState = false;
-    dialogFunction = callback;
+bool Menu::visible = false;
+Folder* Menu::mapFolder = nullptr;
+std::vector<Script> Menu::scripts;
+std::vector<Folder> Menu::paths;
+std::vector<int> Menu::images;
+
+int Menu::initialize() {
+    shutdown();
+    mapFolder = new Folder(RunTime::getPakDir());
+
+    std::vector<File> files;
+    mapFolder->findRecursiveFilesEndingWith(files, "tombpc.dat");
+    for (auto& f : files) {
+        scripts.emplace_back();
+        auto s = scripts.size() - 1;
+
+        images.push_back(-1);
+        auto i = images.size() - 1;
+
+        std::string path = convertPathDelimiter(removeLastPathElement(f.getPath()));
+        paths.emplace_back(path);
+        auto p = paths.size() - 1;
+
+        if (scripts.at(s).load(f.getPath()) != 0) {
+            Log::get(LOG_ERROR) << "Invalid Script: \"" << f.getPath()
+                                << "\"!" << Log::endl;
+            scripts.pop_back();
+        } else {
+            // Load one of the pictures of this level
+            std::vector<File> texFiles;
+            paths.at(p).findRecursiveFilesEndingWith(texFiles, ".pcx");
+            paths.at(p).findRecursiveFilesEndingWith(texFiles, ".bmp");
+            paths.at(p).findRecursiveFilesEndingWith(texFiles, ".png");
+            paths.at(p).findRecursiveFilesEndingWith(texFiles, ".tga");
+            paths.at(p).findRecursiveFilesEndingWith(texFiles, ".jpg");
+
+            if (texFiles.size() > 0) {
+                int which = randomInteger(texFiles.size() - 1);
+                images.at(i) = TextureManager::loadImage(texFiles.at(which).getPath(),
+                               TextureStorage::SYSTEM);
+            }
+        }
+    }
 
-    Log::get(LOG_USER) << dialogText << Log::endl;
+    return 0;
 }
 
-void Menu::ackDialog() {
-    dialogText = "";
-    dialogButton1 = "";
-    dialogButton2 = "";
-
-    if (dialogFunction) {
-        int error = dialogFunction(dialogState);
-        if (error != 0) {
-            showDialog("Error processing dialog callback!", "OK", "");
-        }
+void Menu::shutdown() {
+    if (mapFolder != nullptr) {
+        delete mapFolder;
+        mapFolder = nullptr;
     }
 
-    dialogState = false;
+    scripts.clear();
+    paths.clear();
+    images.clear(); //! \TODO free texture slots
 }
 
-bool Menu::handleKeyboardDialog(KeyboardButton key, bool pressed) {
-    if (!pressed)
-        return (dialogText.length() > 0);
+void Menu::display() {
+    if (!visible)
+        return;
 
-    if (dialogText.length() > 0) {
-        if (dialogButton2.length() == 0) {
-            if (key == enterKey) {
-                ackDialog();
-            }
-        } else {
-            if (key == enterKey) {
-                ackDialog();
-            } else if (key == leftKey) {
-                dialogState = !dialogState;
-            } else if (key == rightKey) {
-                dialogState = !dialogState;
-            } else if (key == upKey) {
-                dialogState = !dialogState;
-            } else if (key == downKey) {
-                dialogState = !dialogState;
-            }
+    glm::vec2 size = Window::getSize();
+    if (!ImGui::Begin("Menu", nullptr, ImVec2(size.x, size.y), -1.0f, ImGuiWindowFlags_NoTitleBar
+                      | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoCollapse
+                      | ImGuiWindowFlags_NoSavedSettings)) {
+        ImGui::End();
+        return;
+    }
+
+    ImGui::SetWindowPos(ImVec2(0, 0));
+    ImGui::SetWindowSize(ImVec2(size.x, size.y));
+
+    // Draw heading with version string
+    auto headingSize = ImGui::CalcTextSize(VERSION);
+    headingSize.x *= 3.0f; headingSize.y *= 3.0f;
+    ImGui::SetWindowFontScale(3.0f);
+    ImGui::SameLine(0, (size.x / 2) - (headingSize.x / 2));
+    ImGui::TextColored(textColor, VERSION);
+    ImGui::SetWindowFontScale(1.0f);
+
+    static ImGuiFs::Dialog* dialog = nullptr;
+    const bool browseButtonPressed = ImGui::Button("Select Level File");
+    if (browseButtonPressed) {
+        if (dialog != nullptr)
+            delete dialog;
+        dialog = new ImGuiFs::Dialog();
+    }
+    if (dialog) {
+        dialog->chooseFileDialog(browseButtonPressed, RunTime::getPakDir().c_str(),
+                                 ".phd;.psx;.tub;.tr2", nullptr, ImVec2(400, 300), ImGui::GetMousePos());
+        std::string selectedFile = dialog->getChosenPath();
+        if (selectedFile.length() > 0) {
+            Game::loadLevel(selectedFile);
+            delete dialog;
+            dialog = nullptr;
         }
-        return true;
+    }
+    ImGui::SameLine();
+    if (ImGui::Button("Toggle Console")) {
+        Console::setVisible(!Console::isVisible());
+    }
+    ImGui::SameLine();
+    if (ImGui::Button("Toggle Debug Window")) {
+        UI::setVisible(!UI::isVisible());
     }
 
-    return false;
-}
+    ImGui::Separator();
 
-bool Menu::handleMouseClickDialog(unsigned int x, unsigned int y,
-                                  KeyboardButton button, bool released) {
-    //! \todo Allow mouse usage of Menu dialogs!
-    return (dialogText.length() > 0);
-}
+    // Set up columns for game list
+    ImGui::Columns(3, "menuscripts");
+    static bool offsets = false;
+    if (!offsets) {
+        ImGui::SetColumnOffset(1, 140.0f);
+        ImGui::SetColumnOffset(2, size.x - 200.0f);
+        offsets = true;
+    }
 
-bool Menu::handleMouseScrollDialog(int xrel, int yrel) {
-    //! \todo Allow mouse usage of Menu dialogs!
-    return (dialogText.length() > 0);
-}
+    // List found games
+    for (int i = 0; i < scripts.size(); i++) {
+        ImGui::PushID(i);
+        Script& s = scripts.at(i);
 
-void Menu::displayDialog() {
-    if (dialogText.length() > 0) {
-        unsigned int wMax = ((unsigned int)(Window::getSize().x * 0.66f));
-
-        unsigned int w0 = Font::widthText(1.0f, dialogText) + 20;
-        if (w0 > wMax)
-            w0 = wMax;
-        unsigned int h0 =  Font::heightText(1.0f, w0, dialogText) + 10;
-
-        assertGreaterThan(dialogButton1.length(), 0);
-        unsigned int w1 = Font::widthText(1.0f, dialogButton1) + 20;
-        if (w1 > wMax)
-            w1 = wMax;
-        unsigned int h1 = Font::heightText(1.0f, w1, dialogButton1) + 10;
-
-        unsigned int wOverlay = wMax, hOverlay, w2 = 0;
-
-        if (dialogButton2.length() > 0) {
-            // Show text and two buttons
-            w2 = Font::widthText(1.0f, dialogButton2) + 20;
-            if (w2 > wMax)
-                w2 = wMax;
-            unsigned int h2 = Font::heightText(1.0f, w2, dialogButton2) + 10;
-
-            if (w0 > (w1 + w2)) {
-                if (w0 < wMax) {
-                    wOverlay = w0;
-                }
-            } else if (w0 < (w1 + w2)) {
-                if ((w1 + w2) < wMax) {
-                    wOverlay = (w1 + w2);
+        if (images.at(i) >= 0) {
+            auto bm = TextureManager::getBufferManager(images.at(i), TextureStorage::SYSTEM);
+            ImGui::Image(bm, ImVec2(128, 128));
+        }
+        ImGui::NextColumn();
+
+        ImGui::TextWrapped("Language: %s", s.getLanguage().c_str());
+        ImGui::TextWrapped("Description: %s", s.getDescription().c_str());
+
+        if (ImGui::TreeNode("", "%d Levels", s.levelCount())) {
+            for (int l = 0; l < s.levelCount(); l++) {
+                ImGui::PushID(l);
+                ImGui::Bullet();
+                ImGui::TextWrapped("%s (%s)", s.getLevelName(l).c_str(), s.getLevelFilename(l).c_str());
+                ImGui::SameLine();
+                if (ImGui::Button("Play level")) {
+                    std::vector<File> levelFiles;
+                    paths.at(i).findRecursiveFilesEndingWith(levelFiles,
+                            getLastPathElement(s.getLevelFilename(l)));
+                    if (levelFiles.size() == 0) {
+                        Log::get(LOG_ERROR) << "Could not find level \""
+                                            << getLastPathElement(s.getLevelFilename(l))
+                                            << "\"!" << Log::endl;
+                    } else {
+                        Game::loadLevel(levelFiles.at(0).getPath());
+                    }
                 }
+                ImGui::PopID();
             }
+            ImGui::TreePop();
+        }
 
-            if ((w1 + w2) <= wMax) {
-                hOverlay = h0 + ((h1 + h2) / 2);
-            } else {
-                hOverlay = h0 + h1 + h2;
+        if (ImGui::TreeNode("", "%d Cut-Scenes", s.cutsceneCount())) {
+            for (int c = 0; c < s.cutsceneCount(); c++) {
+                ImGui::Bullet();
+                ImGui::TextWrapped("%s", s.getCutsceneFilename(c).c_str());
             }
-        } else {
-            // Show text and one button
-            if (w0 > w1) {
-                if (w0 < wMax) {
-                    wOverlay = w0;
-                }
-            } else if (w0 < w1) {
-                if (w1 < wMax) {
-                    wOverlay = w1;
-                }
+            ImGui::TreePop();
+        }
+
+        if (ImGui::TreeNode("", "%d Videos", s.videoCount())) {
+            for (int v = 0; v < s.videoCount(); v++) {
+                ImGui::Bullet();
+                ImGui::TextWrapped("%s", s.getVideoFilename(v).c_str());
             }
+            ImGui::TreePop();
+        }
 
-            hOverlay = h0 + h1;
+        if (ImGui::TreeNode("", "%d Pictures", s.pictureCount())) {
+            for (int p = 0; p < s.pictureCount(); p++) {
+                ImGui::Bullet();
+                ImGui::TextWrapped("%s", s.getPictureFilename(p).c_str());
+            }
+            ImGui::TreePop();
         }
 
-        unsigned int xOverlay = (Window::getSize().x - wOverlay) / 2;
-        unsigned int yOverlay = (Window::getSize().y - hOverlay) / 2;
-
-        /*
-        glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
-        glDisable(GL_TEXTURE_2D);
-        glRecti(xOverlay, yOverlay, xOverlay + wOverlay, yOverlay + hOverlay);
-        glEnable(GL_TEXTURE_2D);
-        */
-
-        Font::drawTextWrapped(xOverlay + 10, yOverlay + 5, 1.0f, textColor, w0, dialogText);
-        if (dialogButton2.length() > 0) {
-            if ((w1 + w2) <= wMax) {
-                Font::drawTextWrapped(xOverlay + 10, yOverlay + 10 + h0, 1.0f,
-                                      dialogState ? textColor : selectedColor, w1, dialogButton1);
-                Font::drawTextWrapped(xOverlay + 10 + w1, yOverlay + 10 + h0,
-                                      1.0f, dialogState ? selectedColor : textColor, w2, dialogButton2);
-            } else {
-                Font::drawTextWrapped((Window::getSize().x - w1) / 2,
-                                      yOverlay + 10 + h0, 1.0f, dialogState ? textColor : selectedColor, w1, dialogButton1);
-                Font::drawTextWrapped((Window::getSize().x - w2) / 2,
-                                      yOverlay + 10 + h0 + h1, 1.0f, dialogState ? selectedColor : textColor, w2, dialogButton2);
+        if (ImGui::TreeNode("", "%d Titles", s.titleCount())) {
+            for (int t = 0; t < s.titleCount(); t++) {
+                ImGui::Bullet();
+                ImGui::TextWrapped("%s", s.getTitleFilename(t).c_str());
             }
-        } else {
-            Font::drawTextWrapped((Window::getSize().x - w1) / 2,
-                                  yOverlay + 10 + h0, 1.0f, selectedColor, w1, dialogButton1);
+            ImGui::TreePop();
         }
+
+        ImGui::NextColumn();
+        ImGui::TextWrapped("Real Gameplay not yet implemented!");
+        ImGui::NextColumn();
+
+        if (i < (scripts.size() - 1))
+            ImGui::Separator();
+        ImGui::PopID();
+    }
+    ImGui::Columns(1);
+
+    if (scripts.size() == 0) {
+        ImGui::TextWrapped("OpenRaiders built-in TombRaider-Script detection mechanism could not find any suitable TR2/TR3 script files (called \"TOMBPC.DAT\") in your PAK folder \"%s\"! Use the \"Select Level File\" Button to load a single level without starting the entire game.",
+                           RunTime::getPakDir().c_str());
     }
+
+    ImGui::End();
 }
 

src/MenuFolder.cpp

@@ -1,215 +0,0 @@
-/*!
- * \file src/MenuFolder.cpp
- * \brief File-Explorer like menu
- *
- * \author xythobuz
- */
-
-#include "global.h"
-#include "Game.h"
-#include "loader/Loader.h"
-#include "Log.h"
-#include "Render.h"
-#include "RunTime.h"
-#include "MenuFolder.h"
-#include "system/Font.h"
-#include "system/Window.h"
-
-MenuFolder::MenuFolder() {
-    mCursor = 0;
-    mMin = 0;
-    mapFolder = nullptr;
-    hiddenState = false;
-    dialogState = false;
-    visible = false;
-}
-
-MenuFolder::~MenuFolder() {
-    delete mapFolder;
-    mapFolder = nullptr;
-}
-
-int MenuFolder::initialize() {
-    return init(RunTime::getPakDir());
-}
-
-int MenuFolder::init(std::string s) {
-    return init(new Folder(s));
-}
-
-int MenuFolder::init(Folder* folder, bool filter) {
-    if (mapFolder != nullptr)
-        delete mapFolder;
-
-    mapFolder = folder;
-    mMin = mCursor = 0;
-
-    if (filter) {
-        mapFolder->executeRemoveFiles([](File & f) {
-            // Filter files based on file name
-            if ((f.getName().length() > 4)
-                && (f.getName().compare(f.getName().length() - 4, 4, ".phd") != 0)
-                && (f.getName().compare(f.getName().length() - 4, 4, ".psx") != 0)
-                && (f.getName().compare(f.getName().length() - 4, 4, ".tub") != 0)
-                && (f.getName().compare(f.getName().length() - 4, 4, ".tr2") != 0)
-                && (f.getName().compare(f.getName().length() - 4, 4, ".tr4") != 0)
-                && (f.getName().compare(f.getName().length() - 4, 4, ".trc") != 0)) {
-                return true; // delete file from list
-            }
-
-            // Check maps for validity
-            Loader::LoaderVersion version = Loader::checkFile(f.getPath());
-            if (version == Loader::TR_UNKNOWN) {
-                Log::get(LOG_ERROR) << "Error: pak file '" << f.getName().c_str()
-                                    << "' invalid" << Log::endl;
-                return true; // delete file from list
-            }
-
-            return false; // keep file on list
-        });
-    }
-
-    if ((mapFolder->fileCount() + mapFolder->folderCount()) > 0)
-        mCursor = 1; // Don't select ".." by default
-
-    return 0;
-}
-
-void MenuFolder::display() {
-    if (!visible)
-        return;
-
-    Font::drawTextCentered(0, 10, 1.2f, textColor, Window::getSize().x, VERSION);
-
-    // Draw half-transparent overlay
-    glm::vec4 color(0.0f, 0.0f, 0.0f, 0.75f);
-    Render::drawTexture(0.0f, 0.0f, Window::getSize().x, Window::getSize().y,
-                        color, TEXTURE_WHITE, TextureStorage::SYSTEM);
-
-    // Draw heading
-    Font::drawTextCentered(0, 10, 1.2f, textColor, Window::getSize().x, VERSION);
-
-    // Estimate displayable number of items
-    int items = (Window::getSize().y - 60) / 25;
-
-    // Print list of "..", folders, files
-    for (long i = mMin; (i < (mMin + items))
-         && (i < (mapFolder->folderCount() + mapFolder->fileCount() + 1)); i++) {
-        if (i == 0) {
-            Font::drawText(25, 50, 0.75f, (mCursor == i) ? selectedColor : textColor, "..");
-        } else {
-            Font::drawText(25, (unsigned int)(50 + (25 * (i - mMin))), 0.75f,
-                           (mCursor == i) ? selectedColor : textColor,
-                           ((i - 1) < mapFolder->folderCount()) ?
-                           (mapFolder->getFolder(i - 1).getName() + "/")
-                           : mapFolder->getFile(i - 1 - mapFolder->folderCount()).getName());
-        }
-    }
-
-    displayDialog();
-}
-
-void MenuFolder::loadOrOpen() {
-    if (mCursor == 0) {
-        if (init(mapFolder->getParent().getPath()) != 0) {
-            showDialog("Error reading parent folder!", "OK", "");
-        }
-    } else if ((mCursor - 1) < mapFolder->folderCount()) {
-        if (init(mapFolder->getFolder(mCursor - 1).getPath()) != 0) {
-            showDialog("Error reading subfolder!", "OK", "");
-        }
-    } else {
-        showDialog("Loading...", "OK");
-        renderFrame();
-        int error = Game::loadLevel(mapFolder->getFile((unsigned long)mCursor
-                                    - 1 - mapFolder->folderCount()).getPath().c_str());
-        ackDialog();
-        if (error == 0) {
-            visible = false;
-        } else {
-            std::ostringstream err;
-            err << "Error loading map: " << error << "!";
-            showDialog(err.str(), "OK", "");
-        }
-    }
-}
-
-void MenuFolder::handleKeyboard(KeyboardButton key, bool pressed) {
-    if (handleKeyboardDialog(key, pressed))
-        return;
-
-    if (!pressed)
-        return;
-
-    assert(mapFolder != nullptr);
-    int items = (Window::getSize().y - 60) / 25;
-
-    if (key == upKey) {
-        if (mCursor > 0)
-            mCursor--;
-        else
-            mCursor = (long)(mapFolder->folderCount() + mapFolder->fileCount());
-    } else if (key == downKey) {
-        if (mCursor < (long)(mapFolder->folderCount() + mapFolder->fileCount()))
-            mCursor++;
-        else
-            mCursor = 0;
-    } else if (key == enterKey) {
-        loadOrOpen();
-    } else if (key == dotKey) {
-        hiddenState = !hiddenState;
-        init(mapFolder->getPath());
-    }
-
-    if (mCursor > (mMin + items - 1)) {
-        mMin = mCursor - items + 1;
-    } else if (mCursor < mMin) {
-        mMin = mCursor;
-    }
-}
-
-void MenuFolder::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button,
-                                  bool released) {
-    if (handleMouseClickDialog(x, y, button, released))
-        return;
-
-    int items = (Window::getSize().y - 60) / 25;
-
-    if (released || (button != leftmouseKey))
-        return;
-
-    if ((y >= 50) && (y <= (unsigned int)(50 + (25 * items)))
-        && ((mMin + (y / 25)) <= (mapFolder->folderCount() + mapFolder->fileCount() + 2))) {
-        y -= 50;
-        if (mCursor == (mMin + (y / 25)))
-            loadOrOpen();
-        else
-            mCursor = mMin + (y / 25);
-    }
-}
-
-void MenuFolder::handleMouseScroll(int xrel, int yrel) {
-    if (handleMouseScrollDialog(xrel, yrel))
-        return;
-
-    assert((xrel != 0) || (yrel != 0));
-    assert(mapFolder != nullptr);
-    int items = (Window::getSize().y - 60) / 25;
-
-    if ((mapFolder->folderCount() + mapFolder->fileCount() + 1) > items) {
-        if (yrel < 0) {
-            if (mMin < (mapFolder->folderCount() + mapFolder->fileCount() + 1 - items))
-                mMin++;
-        } else if (yrel > 0) {
-            if (mMin > 0)
-                mMin--;
-        }
-
-        if (mCursor < mMin) {
-            mCursor = mMin;
-        } else if (mCursor > (mMin + items - 1)) {
-            mCursor = mMin + items - 1;
-        }
-    }
-}
-

src/Render.cpp

@@ -12,6 +12,7 @@
 #include "global.h"
 #include "Camera.h"
 #include "Log.h"
+#include "Menu.h"
 #include "StaticMesh.h"
 #include "World.h"
 #include "system/Font.h"
@@ -280,6 +281,10 @@ void Render::displayUI() {
         if (ImGui::Button("New Splash##render")) {
             TextureManager::initializeSplash();
         }
+        ImGui::SameLine();
+        if (ImGui::Button("New Menu##render")) {
+            Menu::initialize();
+        }
     }
 }
 

src/Script.cpp

@@ -40,11 +40,7 @@ Script::Script() : puzzles(4), pickups(2), keys(4) {
     numGameStrings = 0;
 }
 
-Script::~Script() {
-
-}
-
-int Script::load(const char* file) {
+int Script::load(std::string file) {
     BinaryFile f;
 
     if (f.open(file) != 0)
@@ -351,3 +347,19 @@ int Script::runScript(unsigned int level) {
     return 0;
 }
 
+std::string Script::getLanguage() {
+    if (language == S_English) {
+        return "English (UK)";
+    } else if (language == S_French) {
+        return "French";
+    } else if (language == S_German) {
+        return "German";
+    } else if (language == S_American) {
+        return "English (US)";
+    } else if (language == S_Japanese) {
+        return "Japanese";
+    } else {
+        return "Unknown";
+    }
+}
+

src/TextureManager.cpp

@@ -84,6 +84,10 @@ int TextureManager::initializeSplash() {
     Folder f(RunTime::getPakDir());
     std::vector<File> files;
     f.findRecursiveFilesEndingWith(files, ".pcx");
+    f.findRecursiveFilesEndingWith(files, ".bmp");
+    f.findRecursiveFilesEndingWith(files, ".png");
+    f.findRecursiveFilesEndingWith(files, ".tga");
+    f.findRecursiveFilesEndingWith(files, ".jpg");
     if (files.size() == 0) {
         if (loadImage(RunTime::getDataDir() + "/splash.tga", TextureStorage::SYSTEM, TEXTURE_SPLASH) < 0) {
             return -2;

src/UI.cpp

@@ -88,7 +88,7 @@ int UI::initialize() {
     int width, height;
     io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);
     fontTex = TextureManager::loadBufferSlot(pixels, width, height, ColorMode::RGBA, 32,
-              TextureStorage::SYSTEM, -1, false);
+              TextureStorage::SYSTEM, -1, true);
     auto bm = TextureManager::getBufferManager(fontTex, TextureStorage::SYSTEM);
     io.Fonts->TexID = bm;
 
@@ -156,56 +156,27 @@ void UI::eventsFinished() {
 
     ImGui::NewFrame();
 
-    if (!(visible || Console::isVisible())) {
-        while (!clickEvents.empty()) {
-            auto i = clickEvents.front();
-            if (getMenu().isVisible()) {
-                getMenu().handleMouseClick(std::get<0>(i), std::get<1>(i),
-                                           std::get<2>(i), std::get<3>(i));
-            }
-            clickEvents.pop_front();
-        }
-
+    if (!(visible || Console::isVisible() || Menu::isVisible())) {
         while (!motionEvents.empty()) {
             auto i = motionEvents.front();
-            if (!getMenu().isVisible()) {
-                Game::handleMouseMotion(std::get<0>(i), std::get<1>(i),
-                                        std::get<2>(i), std::get<3>(i));
-            }
+            Game::handleMouseMotion(std::get<0>(i), std::get<1>(i),
+                                    std::get<2>(i), std::get<3>(i));
             motionEvents.pop_front();
         }
-
-        while (!scrollEvents.empty()) {
-            auto i = scrollEvents.front();
-            if (getMenu().isVisible()) {
-                getMenu().handleMouseScroll(std::get<0>(i), std::get<1>(i));
-            }
-            scrollEvents.pop_front();
-        }
     }
 
     while (!keyboardEvents.empty()) {
         auto i = keyboardEvents.front();
 
-        if (!(visible || Console::isVisible())) {
-            if (getMenu().isVisible()) {
-                getMenu().handleKeyboard(std::get<0>(i), std::get<1>(i));
-            } else {
-                for (int n = forwardAction; n < ActionEventCount; n++) {
-                    if (RunTime::getKeyBinding((ActionEvents)n) == std::get<0>(i))
-                        Game::handleAction((ActionEvents)n, !std::get<1>(i));
-                }
+        if (!(visible || Console::isVisible() || Menu::isVisible())) {
+            for (int n = forwardAction; n < ActionEventCount; n++) {
+                if (RunTime::getKeyBinding((ActionEvents)n) == std::get<0>(i))
+                    Game::handleAction((ActionEvents)n, !std::get<1>(i));
             }
         }
 
         if (std::get<1>(i)) {
-            if (!(visible || Console::isVisible())) {
-                if (RunTime::getKeyBinding(menuAction) == std::get<0>(i)) {
-                    getMenu().setVisible(!getMenu().isVisible());
-                }
-            }
-
-            if ((!io.WantCaptureKeyboard) || (!(visible || Console::isVisible()))) {
+            if ((!io.WantCaptureKeyboard) || (!(visible || Console::isVisible() || Menu::isVisible()))) {
                 if (!metaKeyIsActive) {
                     if (RunTime::getKeyBinding(debugAction) == std::get<0>(i)) {
                         visible = !visible;
@@ -214,6 +185,10 @@ void UI::eventsFinished() {
                     if (RunTime::getKeyBinding(consoleAction) == std::get<0>(i)) {
                         Console::setVisible(!Console::isVisible());
                     }
+
+                    if (RunTime::getKeyBinding(menuAction) == std::get<0>(i)) {
+                        Menu::setVisible(!Menu::isVisible());
+                    }
                 }
             }
         }
@@ -226,18 +201,16 @@ void UI::eventsFinished() {
     motionEvents.clear();
     scrollEvents.clear();
 
-    if ((visible || Console::isVisible()) && (
-            ((!io.WantCaptureKeyboard) && io.KeysDown[escapeKey])
-            || ((!io.WantCaptureMouse) && clicked)
-        )) {
+    // Allow clicking into the game to hide debug UI
+    if ((visible || Console::isVisible()) && ((!io.WantCaptureMouse) && clicked)) {
         visible = false;
         Console::setVisible(false);
     }
 
-    if (Window::getTextInput() != (visible || Console::isVisible()))
+    if (Window::getTextInput() != (visible || Console::isVisible() || Menu::isVisible()))
         Window::setTextInput(visible || Console::isVisible());
 
-    bool input = !(visible || Console::isVisible() || getMenu().isVisible());
+    bool input = !(visible || Console::isVisible() || Menu::isVisible());
     if (Window::getMousegrab() != input)
         Window::setMousegrab(input);
 
@@ -245,7 +218,7 @@ void UI::eventsFinished() {
 }
 
 void UI::display() {
-    if (RunTime::getShowFPS() && (!getMenu().isVisible())) {
+    if (RunTime::getShowFPS() && (!Menu::isVisible())) {
         if (ImGui::Begin("Debug Overlay", nullptr, ImVec2(0, 0), -1.0f,
                          ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize
                          | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings
@@ -266,6 +239,7 @@ void UI::display() {
         Camera::displayUI();
 
     Console::display();
+    Menu::display();
 
     if (!visible) {
         ImGui::Render();
@@ -441,7 +415,7 @@ void UI::handleControllerButton(KeyboardButton button, bool released) {
     if (visible || Console::isVisible())
         return;
 
-    if (getMenu().isVisible()) {
+    if (Menu::isVisible()) {
         if (button == aButton) {
             handleKeyboard(enterKey, !released);
         } else if (button == padUp) {
@@ -454,7 +428,7 @@ void UI::handleControllerButton(KeyboardButton button, bool released) {
             handleKeyboard(rightKey, !released);
         } else if (button == startButton) {
             if (!released)
-                getMenu().setVisible(false);
+                Menu::setVisible(false);
         }
     } else {
         if (button == aButton) {
@@ -477,7 +451,7 @@ void UI::handleControllerButton(KeyboardButton button, bool released) {
             Game::handleAction(walkAction, released);
         } else if (button == startButton) {
             if (!released)
-                getMenu().setVisible(true);
+                Menu::setVisible(true);
         }
     }
 }

src/deps/imgui/imconfig.h

@@ -24,21 +24,21 @@
 //#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS
 
 //---- Include imgui_user.inl at the end of imgui.cpp so you can include code that extends ImGui using its private data/functions.
-//#define IMGUI_INCLUDE_IMGUI_USER_INL
+#define IMGUI_INCLUDE_IMGUI_USER_INL
 
 //---- Include imgui_user.h at the end of imgui.h
-//#define IMGUI_INCLUDE_IMGUI_USER_H
+#define IMGUI_INCLUDE_IMGUI_USER_H
 
 //---- Define implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4.
-/*
-#define IM_VEC2_CLASS_EXTRA                                                 \
-        ImVec2(const MyVec2& f) { x = f.x; y = f.y; }                       \
-        operator MyVec2() const { return MyVec2(x,y); }
-
-#define IM_VEC4_CLASS_EXTRA                                                 \
-        ImVec4(const MyVec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; }     \
-        operator MyVec4() const { return MyVec4(x,y,z,w); }
-*/
+#include <glm/vec2.hpp>
+#define IM_VEC2_CLASS_EXTRA                                                \
+        ImVec2(const glm::vec2& f) { x = f.x; y = f.y; }                   \
+        operator glm::vec2() const { return glm::vec2(x, y); }
+
+#include <glm/vec4.hpp>
+#define IM_VEC4_CLASS_EXTRA                                                \
+        ImVec4(const glm::vec4& f) { x = f.x; y = f.y; z = f.z; w = f.w; } \
+        operator glm::vec4() const { return glm::vec4(x,y,z,w); }
 
 //---- Freely implement extra functions within the ImGui:: namespace.
 //---- Declare helpers or widgets implemented in imgui_user.inl or elsewhere, so end-user doesn't need to include multiple files.

src/deps/imgui/imgui_user.h

@@ -0,0 +1,2 @@
+#include "imguifilesystem/imguifilesystem.h"
+

src/deps/imgui/imgui_user.inl

@@ -0,0 +1,2 @@
+#include "imguifilesystem/imguifilesystem.cpp"
+

src/deps/imguifilesystem/README.txt

@@ -0,0 +1,13 @@
+imguifilesystem dialogs for imgui v.1.17 wip (https://github.com/ocornut/imgui).
+See also: https://github.com/ocornut/imgui/issues/88
+
+It's composed by three files:
+
+-    imguifilesystem.h (usage instructions are here)
+-    imguifilesystem.cpp
+-    dirent_portable.h
+
+It needs testing and feedback (expecially for Windows/VisualC++ and MacOS).
+
+It does not use any C++ string class: so it should be straightforward to merge its code
+into imgui.h/imgui.cpp if we want to (and if the code is robust enough). 

src/deps/imguifilesystem/imguifilesystem.h

@@ -0,0 +1,95 @@
+// This software is provided 'as-is', without any express or implied
+// warranty.  In no event will the authors be held liable for any damages
+// arising from the use of this software.
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+// 1. The origin of this software must not be misrepresented; you must not
+//    claim that you wrote the original software. If you use this software
+//    in a product, an acknowledgment in the product documentation would be
+//    appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//    misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+
+#ifndef IMGUI_FILESYSTEM_H_
+#define IMGUI_FILESYSTEM_H_
+
+// USAGE EXAMPLE:
+/*
+#include "imguifilesystem.h"                            // imguifilesystem.cpp must be compiled
+
+// Inside a ImGui window:
+const bool browseButtonPressed = ImGui::Button("...");  // we need a trigger boolean variable
+static ImGuiFs::Dialog dlg;                             // one per dialog (and must be static)
+dlg.chooseFileDialog(browseButtonPressed);              // see other dialog types and the full list of arguments for advanced usage
+if (strlen(dlg.getChosenPath())>0) {
+    ImGui::Text("Chosen file: \"%s\"",dlg.getChosenPath());
+}
+
+// If you want to copy the (valid) returned path somewhere, you can use something like:
+static char myPath[ImGuiFs::MAX_PATH_BYTES];
+if (strlen(dlg.getChosenPath())>0) {
+    strcpy(myPath,dlg.getChosenPath());
+}
+*/
+
+// MISSING FEATURES:
+/*
+-> [File and Folder] Links are NOT supported (they don't show up).
+-> Multiselections in chooseFileDialogs are NOT supported.
+-> Hidden and temporary files don't show up on nix systems (by design). Nothing has been done for Windows about it yet.
+*/
+
+// COMPILING AND TESTING:
+/*
+-> Compiled and tested using "ImGui library v1.17 wip"
+
+-> Successfully compiled using gcc, clang and mingw32 compilers.
+x> Never compiled on any other compiler (Visual C++'s cl.exe included).
+
+-> Tested on Ubuntu 64bit and Wine 32bit.
+x> Never tested on a real Windows OS and on MacOS.
+*/
+
+//#define DIRENT_USES_UTF8_CHARS  // Optional. Affects Windows users only. Needs recompilation of imguifilesystem.cpp. Enables long UTF8 paths instead of short ASCII paths.
+                                // Unfortunately it's NOT 100% functional (in my tests some folders can't be browsed). Patches are welcome. See "dirent_portable.h" for further info.
+                                // When experiencing problems on Windows, trying commenting this definition out is a good start.
+                                // On a second thought, I think we should leave this definition commented out (Windows users can always define it at the project level, if needed).
+
+namespace ImGuiFs {
+
+
+extern const int MAX_FILENAME_BYTES;
+extern const int MAX_PATH_BYTES;
+
+
+struct Dialog {
+    public:
+
+    // default arguments are usually what most users expect (better not touch them in most cases)
+    Dialog(bool noKnownDirectoriesSection=false,bool noCreateDirectorySection=false,bool noFilteringSection=false,bool detectKnownDirectoriesAtEachOpening=false,bool addDisplayByOption=false,bool dontFilterSaveFilePathsEnteredByTheUser=false);
+    ~Dialog();
+
+    // "dialogTriggerButton" is usually a bool variable connected to a ImGui::Button(...).
+    // returns the chosen path (internally stored). Users can check when the returned path has strlen()>0.
+    // "fileFilterExtensionString" can be something like ".png;.jpg;.jpeg;.bmp;.tga;.gif;.tiff;.txt". It's case insensitive.
+    // "directory" and "startingFileNameEntry" (only available in saveFileDialog(...)) are quite flexible and can be set to almost everything: the method will use the most resonable choice.
+    const char* chooseFileDialog(bool dialogTriggerButton,const char* directory=NULL,const char* fileFilterExtensionString=NULL,const char* windowTitle=NULL,const ImVec2& windowSize=ImVec2(-1,-1),const ImVec2& windowPos=ImVec2(-1,-1),const float windowAlpha=0.875f);
+    const char* chooseFolderDialog(bool dialogTriggerButton,const char* directory=NULL,const char* windowTitle=NULL,const ImVec2& windowSize=ImVec2(-1,-1),const ImVec2& windowPos=ImVec2(-1,-1),const float windowAlpha=0.875f);
+    const char* saveFileDialog(bool dialogTriggerButton,const char* directory=NULL,const char* startingFileNameEntry=NULL,const char* fileFilterExtensionString=NULL,const char* windowTitle=NULL,const ImVec2& windowSize=ImVec2(-1,-1),const ImVec2& windowPos=ImVec2(-1,-1),const float windowAlpha=0.875f);
+
+    // gets the chosen path (internally stored). It's valid (its strlen()>0) only when the user performs a valid selection.
+    const char* getChosenPath() const;
+    // returns the last directory browsed by the user using this class (internally stored). Can be passed as "directory" parameter in the methods above to reuse last used directory.
+    const char* getLastDirectory() const;
+
+    private:
+    struct Internal* internal;
+    friend const char* ChooseFileMainMethod(Dialog& ist,const char* directory,const bool _isFolderChooserDialog,const bool _isSaveFileDialog,const char* _saveFileName,const char* fileFilterExtensionString,const char* windowTitle,const ImVec2& windowSize,const ImVec2& windowPos,const float windowAlpha);
+};
+
+
+} // namespace ImGuiFs
+
+#endif //IMGUI_FILESYSTEM_H_

src/loader/LoaderTR2.cpp

@@ -931,20 +931,20 @@ void LoaderTR2::loadMoveables() {
         /*
         if (animation == 0xFFFF) {
         */
-            // Just add the frame indicated in frameOffset, nothing else
-            char* tmp = reinterpret_cast<char*>(&frames[0]) + frameOffset;
-            BinaryMemory frame(tmp, (numFrames * 2) - frameOffset);
+        // Just add the frame indicated in frameOffset, nothing else
+        char* tmp = reinterpret_cast<char*>(&frames[0]) + frameOffset;
+        BinaryMemory frame(tmp, (numFrames * 2) - frameOffset);
 
-            if (((numFrames * 2) - frameOffset) <= 0)
-                continue; // TR1/LEVEL3A crashes without this?!
+        if (((numFrames * 2) - frameOffset) <= 0)
+            continue; // TR1/LEVEL3A crashes without this?!
 
-            BoneFrame* bf = loadFrame(frame, numMeshes, startingMesh, meshTree, numMeshTrees, meshTrees);
-            AnimationFrame* af = new AnimationFrame(0);
-            af->add(bf);
+        BoneFrame* bf = loadFrame(frame, numMeshes, startingMesh, meshTree, numMeshTrees, meshTrees);
+        AnimationFrame* af = new AnimationFrame(0);
+        af->add(bf);
 
-            SkeletalModel* sm = new SkeletalModel(objectID);
-            sm->add(af);
-            getWorld().addSkeletalModel(sm);
+        SkeletalModel* sm = new SkeletalModel(objectID);
+        sm->add(af);
+        getWorld().addSkeletalModel(sm);
         /*
         } else {
             // TODO Add the whole animation hierarchy

src/main.cpp

@@ -11,7 +11,7 @@
 #include "global.h"
 #include "Camera.h"
 #include "Log.h"
-#include "MenuFolder.h"
+#include "Menu.h"
 #include "Render.h"
 #include "RunTime.h"
 #include "SoundManager.h"
@@ -27,14 +27,8 @@
 #include "utils/time.h"
 
 static std::string configFileToUse;
-
-static std::shared_ptr<MenuFolder> gMenu;
 static std::shared_ptr<World> gWorld;
 
-Menu& getMenu() {
-    return *gMenu;
-}
-
 World& getWorld() {
     return *gWorld;
 }
@@ -52,7 +46,6 @@ int main(int argc, char* argv[]) {
     // RunTime is required by other constructors
     RunTime::initialize();
 
-    gMenu.reset(new MenuFolder());
     gWorld.reset(new World());
 
     Command::fillCommandList();
@@ -106,23 +99,23 @@ int main(int argc, char* argv[]) {
         return -5;
     }
 
-    // Initialize Menu
-    error = getMenu().initialize();
+    // Initialize Debug UI
+    error = UI::initialize();
     if (error != 0) {
-        std::cout << "Could not initialize Menu (" << error << ")!" << std::endl;
+        std::cout << "Could not initialize Debug UI (" << error << ")!" << std::endl;
         return -6;
     }
 
-    // Initialize Debug UI
-    error = UI::initialize();
+    // Initialize Menu
+    error = Menu::initialize();
     if (error != 0) {
-        std::cout << "Could not initialize Debug UI (" << error << ")!" << std::endl;
+        std::cout << "Could not initialize Menu (" << error << ")!" << std::endl;
         return -7;
     }
 
     Log::get(LOG_INFO) << "Starting " << VERSION << Log::endl;
     Camera::setSize(Window::getSize());
-    getMenu().setVisible(true);
+    Menu::setVisible(true);
     systemTimerReset();
     RunTime::setRunning(true);
     Render::setMode(RenderMode::LoadScreen);
@@ -132,6 +125,7 @@ int main(int argc, char* argv[]) {
         renderFrame();
     }
 
+    Menu::shutdown();
     UI::shutdown();
     Font::shutdown();
     Sound::shutdown();
@@ -152,7 +146,6 @@ int main(int argc, char* argv[]) {
 
 void renderFrame() {
     Render::display();
-    getMenu().display();
     UI::display();
     Window::swapBuffers();
     RunTime::updateFPS();

src/utils/strings.cpp

@@ -43,3 +43,33 @@ bool stringEndsWith(std::string s, std::string suffix, bool casesensitive) {
     return false;
 }
 
+std::string removeLastPathElement(std::string s) {
+    auto pos = s.find_last_of("/\\");
+    if (pos == std::string::npos)
+        return s;
+    return s.erase(pos);
+}
+
+std::string getLastPathElement(std::string s) {
+    auto pos = s.find_last_of("/\\");
+    if (pos == std::string::npos)
+        return s;
+    return s.erase(0, pos + 1);
+}
+
+std::string convertPathDelimiter(std::string s) {
+    std::string::size_type pos;
+
+#ifdef _WIN32
+    while ((pos = s.find('/')) != std::string::npos) {
+        s.replace(pos, 1, 1, '\\');
+    }
+#else
+    while ((pos = s.find('\\')) != std::string::npos) {
+        s.replace(pos, 1, 1, '/');
+    }
+#endif
+
+    return s;
+}
+