Removed OpenRaider class, added RunTime class

ChangeLog.md

@@ -4,7 +4,9 @@
 
     [ 20140903 ]
     * Finishing imgui integration, but now as UI layer and not on top of everything
-    * All global objects are now explicitly allocated in main
+    * All global objects are now explicitly allocated in main and stored in shared_ptrs
+    * Created RunTime class for run time settings/options storage
+    * Completely removed OpenRaider class
 
     [ 20140901 ]
     * Created abstract UI class handling “windows” like menu and console. Windows

TODO.md

@@ -14,6 +14,10 @@
 ## Bugs
 
 * Screenshots are sometimes not written, sometimes distorted?
+* imgui integration still very much unfinished
+    * toggling with ‘q’ means one can’t use input ‘q’ into a text field
+    * clicking outside of the debug window does nothing
+    * it seems as if colors aren’t rendering properly
 
 ## Cmake
 

include/OpenRaider.h → include/RunTime.h

@@ -1,30 +1,22 @@
 /*!
- * \file include/OpenRaider.h
- * \brief Main Game Object
+ * \file include/RunTime.h
+ * \brief run time configuration storage
  *
  * \author xythobuz
  */
 
-#ifndef _OPENRAIDER_H_
-#define _OPENRAIDER_H_
+#ifndef _RUNTIME_H_
+#define _RUNTIME_H_
 
 #include <string>
 
 /*!
  * \brief Main Game Singleton
  */
-class OpenRaider {
+class RunTime {
 public:
 
-    OpenRaider();
-
-    int initialize();
-
-    /*!
-     * \brief Load the configuration file
-     * \returns 0 on success
-     */
-    int loadConfig(std::string config);
+    RunTime();
 
     std::string getBaseDir();
     void setBaseDir(std::string dir);
@@ -35,22 +27,27 @@ public:
     std::string getDataDir();
     void setDataDir(std::string dir);
 
-    void run();
-    void frame();
+    KeyboardButton getKeyBinding(ActionEvents event);
+    void setKeyBinding(ActionEvents event, KeyboardButton button);
 
-    //! \fixme should be private
-    KeyboardButton keyBindings[ActionEventCount];
-    bool mRunning;
-    bool mFPS;
+    bool isRunning();
+    void start();
+
+    bool getFPS();
+    void setFPS(bool fps);
 
 private:
     std::string baseDir;
     std::string pakDir;
     std::string audioDir;
     std::string dataDir;
+
+    KeyboardButton keyBindings[ActionEventCount];
+    bool gameIsRunning;
+    bool showFPS;
 };
 
-OpenRaider &getOpenRaider();
+RunTime &getRunTime();
 
 #endif
 

include/commands/Command.h

@@ -23,6 +23,7 @@ public:
 
     static void fillCommandList();
     static int command(std::string c);
+    static int executeFile(std::string file);
 
 private:
     static std::vector<std::shared_ptr<Command>> commands;

include/global.h

@@ -15,6 +15,8 @@
 #define DEFAULT_WIDTH 640
 #define DEFAULT_HEIGHT 480
 
+void renderFrame();
+
 // Supported pixelmap color formats
 enum ColorMode {
     GREYSCALE,

src/CMakeLists.txt

@@ -60,10 +60,10 @@ set (SRCS ${SRCS} "main.cpp")
 set (SRCS ${SRCS} "Menu.cpp")
 set (SRCS ${SRCS} "MenuFolder.cpp")
 set (SRCS ${SRCS} "Mesh.cpp")
-set (SRCS ${SRCS} "OpenRaider.cpp")
 set (SRCS ${SRCS} "Render.cpp")
 set (SRCS ${SRCS} "Room.cpp")
 set (SRCS ${SRCS} "RoomData.cpp")
+set (SRCS ${SRCS} "RunTime.cpp")
 set (SRCS ${SRCS} "Script.cpp")
 set (SRCS ${SRCS} "SkeletalModel.cpp")
 set (SRCS ${SRCS} "Sound.cpp")

src/Game.cpp

@@ -15,7 +15,6 @@
 #include "Console.h"
 #include "Game.h"
 #include "loader/Loader.h"
-#include "OpenRaider.h"
 #include "Render.h"
 #include "Sound.h"
 #include "StaticMesh.h"
@@ -40,8 +39,6 @@ Game::Game() {
 }
 
 Game::~Game() {
-    destroy();
-
     UI::removeWindow(this);
 }
 

src/MenuFolder.cpp

@@ -10,7 +10,7 @@
 #include "Font.h"
 #include "Game.h"
 #include "loader/Loader.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "Window.h"
 #include "MenuFolder.h"
 
@@ -33,7 +33,7 @@ MenuFolder::~MenuFolder() {
 }
 
 int MenuFolder::initialize() {
-    return init(getOpenRaider().getPakDir());
+    return init(getRunTime().getPakDir());
 }
 
 int MenuFolder::init(std::string s) {

src/OpenRaider.cpp

@@ -1,200 +0,0 @@
-/*!
- * \file src/OpenRaider.cpp
- * \brief Main Game Object
- *
- * \author xythobuz
- */
-
-#include <fstream>
-#include <sstream>
-
-#include "global.h"
-#include "commands/Command.h"
-#include "Console.h"
-#include "Font.h"
-#include "Game.h"
-#include "Menu.h"
-#include "Render.h"
-#include "Sound.h"
-#include "TextureManager.h"
-#include "TombRaider.h"
-#include "utils/strings.h"
-#include "utils/time.h"
-#include "Window.h"
-#include "OpenRaider.h"
-
-OpenRaider::OpenRaider() {
-    mRunning = false;
-    mFPS = false;
-
-    for (int i = 0; i < ActionEventCount; i++)
-        keyBindings[i] = unknownKey;
-}
-
-std::string OpenRaider::getBaseDir() {
-    return baseDir;
-}
-
-void OpenRaider::setBaseDir(std::string dir) {
-    baseDir = dir;
-}
-
-std::string OpenRaider::getPakDir() {
-    return pakDir;
-}
-
-void OpenRaider::setPakDir(std::string dir) {
-    pakDir = dir;
-}
-
-std::string OpenRaider::getAudioDir() {
-    return audioDir;
-}
-
-void OpenRaider::setAudioDir(std::string dir) {
-    audioDir = dir;
-}
-
-std::string OpenRaider::getDataDir() {
-    return dataDir;
-}
-
-void OpenRaider::setDataDir(std::string dir) {
-    dataDir = dir;
-}
-
-int OpenRaider::loadConfig(std::string config) {
-    std::string configFile = expandHomeDirectory(config);
-    getConsole() << "Loading config from \"" << configFile << "\"..." << Console::endl;
-
-    std::ifstream file(configFile);
-    if (!file) {
-        getConsole() << "Could not open file!" << Console::endl;
-        return -1;
-    }
-
-    for (std::string line; std::getline(file, line);) {
-        if (line.length() == 0)
-            continue;
-
-        int error = Command::command(line);
-        if (error != 0)
-            getConsole() << "Error Code: " << error << Console::endl;
-    }
-
-    file.close();
-
-    return 0;
-}
-
-int OpenRaider::initialize() {
-    // Initialize Windowing
-    int error = getWindow().initialize();
-    if (error != 0) {
-        printf("Could not initialize Window (%d)!\n", error);
-        return -1;
-    }
-
-    // Initialize OpenGL
-    error = getWindow().initializeGL();
-    if (error != 0) {
-        printf("Could not initialize OpenGL (%d)!\n", error);
-        return -2;
-    }
-
-    // Initialize Font
-    error = getFont().initialize();
-    if (error != 0) {
-        printf("Could not initialize Font (%d)!\n", error);
-        return -3;
-    }
-
-    // Initialize Sound
-    error = getSound().initialize();
-    if (error != 0) {
-        printf("Could not initialize Sound (%d)!\n", error);
-        return -4;
-    }
-
-    // Initialize Texture Manager
-    error = getTextureManager().initialize();
-    if (error != 0) {
-        printf("Could not initialize Textures (%d)!\n", error);
-        return -5;
-    }
-
-    // Initialize UIs
-    error = UI::passInitialize();
-    if (error != 0) {
-        printf("Could not initialize UIs (%d)!\n", error);
-        return -6;
-    }
-
-#ifdef DEBUG
-    mFPS = true;
-#endif
-
-    getMenu().moveToTop();
-    systemTimerReset();
-
-    return 0;
-}
-
-void OpenRaider::run() {
-    assert(mRunning == false);
-    mRunning = true;
-    while (mRunning)
-        frame();
-}
-
-void OpenRaider::frame() {
-    assert(mRunning == true);
-
-    static clock_t fpsSum = 0, fpsCount = 0;
-    static int fps = 0;
-    clock_t startTime = systemTimerGet();
-
-    // Get keyboard and mouse input
-    getWindow().eventHandling();
-
-    ImGui::SetNewWindowDefaultPos(ImVec2(50, 50));
-    bool show_test_window = true;
-    ImGui::ShowTestWindow(&show_test_window);
-
-    UI::passDisplay();
-
-    getWindow().glEnter2D();
-
-    // Draw FPS counter
-    if (mFPS) {
-        std::ostringstream fpsText;
-        fpsText << fps << "FPS";
-        getFont().drawText(10, getWindow().getHeight() - 20, 0.5f, BLUE, fpsText.str());
-    }
-
-#ifdef DEBUG
-    // Draw debug infos
-    if (getGame().isLoaded() && (!getMenu().isOnTop())) {
-        for (int i = 0; i < 3; i++) {
-            std::ostringstream axis;
-            axis << getGame().getLara().getPos(i) / 256.0f << " (" << getGame().getLara().getAngle(i) << ")";
-            getFont().drawText(10, getWindow().getHeight() - ((4 - i) * 20), 0.5f, BLUE, axis.str());
-        }
-    }
-#endif
-
-    getWindow().glExit2D();
-
-    // Put new frame on screen
-    getWindow().swapBuffersGL();
-
-    // Calculate FPS display value
-    fpsCount++;
-    fpsSum += (systemTimerGet() - startTime);
-    if (fpsSum >= 250) {
-        // Update every 250ms
-        fps = (int)((float)fpsCount * (1000.0f / (float)fpsSum));
-        fpsCount = fpsSum = 0;
-    }
-}
-

src/Render.cpp

@@ -16,7 +16,6 @@
 #include "global.h"
 #include "Camera.h"
 #include "Game.h"
-#include "OpenRaider.h"
 #include "Render.h"
 #include "TextureManager.h"
 #include "utils/strings.h"
@@ -32,7 +31,6 @@ Render::Render() {
     mFlags = (fRoomAlpha | fEntityModels | fRenderPonytail);
 }
 
-
 Render::~Render() {
     ClearWorld();
 }
@@ -41,7 +39,6 @@ void Render::ClearWorld() {
     mRoomRenderList.clear();
 }
 
-
 void Render::screenShot(const char *filenameBase)
 {
     int sz = getWindow().getWidth() * getWindow().getHeight();
@@ -73,7 +70,6 @@ unsigned int Render::getFlags() {
     return mFlags;
 }
 
-
 void Render::lightRoom(Room &room)
 {
     for (unsigned int i = 0; i < room.sizeLights(); ++i)
@@ -110,7 +106,6 @@ void Render::lightRoom(Room &room)
     }
 }
 
-
 void Render::clearFlags(unsigned int flags)
 {
     mFlags &= ~flags;
@@ -129,7 +124,6 @@ void Render::clearFlags(unsigned int flags)
     }
 }
 
-
 void Render::setFlags(unsigned int flags)
 {
     mFlags |= flags;
@@ -171,13 +165,11 @@ void Render::setFlags(unsigned int flags)
     }
 }
 
-
 int Render::getMode()
 {
     return mMode;
 }
 
-
 void Render::setMode(int n)
 {
     mMode = n;
@@ -208,7 +200,6 @@ void Render::setMode(int n)
     }
 }
 
-
 void Render::display()
 {
     switch (mMode)
@@ -427,7 +418,6 @@ void Render::newRoomRenderList(int index)
     currentRoomId = index;
 }
 
-
 void Render::buildRoomRenderList(Room &room)
 {
 
@@ -463,7 +453,6 @@ void Render::buildRoomRenderList(Room &room)
     }
 }
 
-
 void Render::drawSkyMesh(float scale)
 {
     //skeletal_model_t *model = getWorld().getModel(mSkyMesh);
@@ -484,14 +473,12 @@ void Render::drawSkyMesh(float scale)
     glEnable(GL_DEPTH_TEST);
 }
 
-
 void Render::setSkyMesh(int index, bool rot)
 {
     mSkyMesh = index;
     mSkyMeshRotation = rot;
 }
 
-
 void Render::updateViewVolume()
 {
     float proj[16], mdl[16];
@@ -512,7 +499,6 @@ bool Render::isVisible(BoundingBox &box) {
     return mViewVolume.isBboxInFrustum(bbox[0], bbox[1]);
 }
 
-
 bool Render::isVisible(float x, float y, float z)
 {
     // For debugging purposes
@@ -528,7 +514,6 @@ bool Render::isVisible(float x, float y, float z)
     return (mViewVolume.isPointInFrustum(x, y, z));
 }
 
-
 bool Render::isVisible(float x, float y, float z, float radius)
 {
     // For debugging purposes
@@ -543,3 +528,4 @@ bool Render::isVisible(float x, float y, float z, float radius)
 
     return (mViewVolume.isSphereInFrustum(x, y, z, radius));
 }
+

src/RunTime.cpp

@@ -0,0 +1,89 @@
+/*!
+ * \file src/RunTime.cpp
+ * \brief run time configuration storage
+ *
+ * \author xythobuz
+ */
+
+#include "global.h"
+#include "RunTime.h"
+
+RunTime::RunTime() {
+    gameIsRunning = false;
+
+#ifdef DEBUG
+    showFPS = true;
+#else
+    showFPS = false;
+#endif
+
+    for (int i = 0; i < ActionEventCount; i++)
+        keyBindings[i] = unknownKey;
+
+    // Default key bindings
+    keyBindings[menuAction] = escapeKey;
+    keyBindings[consoleAction] = backquoteKey;
+    keyBindings[forwardAction] = wKey;
+    keyBindings[backwardAction] = sKey;
+    keyBindings[leftAction] = aKey;
+    keyBindings[rightAction] = dKey;
+}
+
+std::string RunTime::getBaseDir() {
+    return baseDir;
+}
+
+void RunTime::setBaseDir(std::string dir) {
+    baseDir = dir;
+}
+
+std::string RunTime::getPakDir() {
+    return pakDir;
+}
+
+void RunTime::setPakDir(std::string dir) {
+    pakDir = dir;
+}
+
+std::string RunTime::getAudioDir() {
+    return audioDir;
+}
+
+void RunTime::setAudioDir(std::string dir) {
+    audioDir = dir;
+}
+
+std::string RunTime::getDataDir() {
+    return dataDir;
+}
+
+void RunTime::setDataDir(std::string dir) {
+    dataDir = dir;
+}
+
+KeyboardButton RunTime::getKeyBinding(ActionEvents event) {
+    assert(event < ActionEventCount);
+    return keyBindings[event];
+}
+
+void RunTime::setKeyBinding(ActionEvents event, KeyboardButton button) {
+    assert(event < ActionEventCount);
+    keyBindings[event] = button;
+}
+
+bool RunTime::isRunning() {
+    return gameIsRunning;
+}
+
+void RunTime::start() {
+    gameIsRunning = true;
+}
+
+bool RunTime::getFPS() {
+    return showFPS;
+}
+
+void RunTime::setFPS(bool fps) {
+    showFPS = fps;
+}
+

src/TextureManager.cpp

@@ -13,7 +13,7 @@
 
 #include "global.h"
 #include "Console.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "utils/pcx.h"
 #include "utils/pixel.h"
 #include "utils/strings.h"
@@ -46,11 +46,11 @@ int TextureManager::initialize() {
     delete [] image;
 
     //! \fixme Temporary
-    std::string filename(getOpenRaider().getPakDir());
+    std::string filename(getRunTime().getPakDir());
     filename += "/tr2/TITLE.PCX";
     if (loadPCX(filename.c_str()) < 0) {
         //! \fixme Error Checking. Return negative error code, check in calling place too
-        filename = getOpenRaider().getDataDir();
+        filename = getRunTime().getDataDir();
         filename += "/splash.tga";
         loadTGA(filename.c_str());
     }

src/UI.cpp

@@ -11,7 +11,7 @@
 #include "Console.h"
 #include "Debug.h"
 #include "Menu.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "TextureManager.h"
 #include "Window.h"
 
@@ -32,19 +32,19 @@ void UI::handleMouseScroll(int xrel, int yrel) { }
 
 void UI::passKeyboard(KeyboardButton key, bool pressed) {
     if (pressed) {
-        if (getOpenRaider().keyBindings[menuAction] == key) {
+        if (getRunTime().getKeyBinding(menuAction) == key) {
             if (getMenu().isOnTop()) {
                 getMenu().makeInvisible();
             } else {
                 getMenu().moveToTop();
             }
-        } else if (getOpenRaider().keyBindings[consoleAction] == key) {
+        } else if (getRunTime().getKeyBinding(consoleAction) == key) {
             if (getConsole().isOnTop()) {
                 getConsole().makeInvisible();
             } else {
                 getConsole().moveToTop();
             }
-        } else if (getOpenRaider().keyBindings[debugAction] == key) {
+        } else if (getRunTime().getKeyBinding(debugAction) == key) {
             if (getDebug().isOnTop()) {
                 getDebug().makeInvisible();
             } else {
@@ -57,7 +57,7 @@ void UI::passKeyboard(KeyboardButton key, bool pressed) {
     (*maxIterator)->handleKeyboard(key, pressed);
 
     for (int i = forwardAction; i < ActionEventCount; i++) {
-        if (getOpenRaider().keyBindings[i] == key) {
+        if (getRunTime().getKeyBinding((ActionEvents)i) == key) {
             (*maxIterator)->handleAction((ActionEvents)i, !pressed);
         }
     }
@@ -77,7 +77,7 @@ void UI::passMouseClick(unsigned int x, unsigned int y, KeyboardButton button, b
     (*maxIterator)->handleMouseClick(x, y, button, released);
 
     for (int i = forwardAction; i < ActionEventCount; i++) {
-        if (getOpenRaider().keyBindings[i] == button) {
+        if (getRunTime().getKeyBinding((ActionEvents)i) == button) {
             (*maxIterator)->handleAction((ActionEvents)i, released);
         }
     }
@@ -98,6 +98,11 @@ void UI::addWindow(UI* window) {
 }
 
 void UI::removeWindow(UI *window) {
+    if (windows.size() == 0) {
+        // It seems as if our list was destroyed before the UIs
+        return;
+    }
+
     findInList(window, [](unsigned long i){
         windows.erase(windows.begin() + i);
     });

src/commands/Command.cpp

@@ -5,10 +5,12 @@
  * \author xythobuz
  */
 
+#include <fstream>
 #include <iomanip>
 
 #include "global.h"
 #include "Console.h"
+#include "utils/strings.h"
 #include "commands/Command.h"
 #include "commands/CommandAnimate.h"
 #include "commands/CommandBind.h"
@@ -109,3 +111,26 @@ int Command::command(std::string c) {
     return -1;
 }
 
+int Command::executeFile(std::string file) {
+    std::string configFile = expandHomeDirectory(file);
+    getConsole() << "Loading config from \"" << configFile << "\"..." << Console::endl;
+
+    std::ifstream f(configFile);
+    if (!f) {
+        getConsole() << "Could not open file!" << Console::endl;
+        return -1;
+    }
+
+    for (std::string line; std::getline(f, line);) {
+        if (line.length() == 0)
+            continue;
+
+        int error = Command::command(line);
+        if (error != 0)
+            getConsole() << "Error Code: " << error << Console::endl;
+    }
+
+    f.close();
+    return 0;
+}
+

src/commands/CommandAnimate.cpp

@@ -8,7 +8,6 @@
 #include "global.h"
 #include "Console.h"
 #include "Game.h"
-#include "OpenRaider.h"
 #include "Render.h"
 #include "World.h"
 #include "commands/CommandAnimate.h"
@@ -31,7 +30,7 @@ void CommandAnimate::printHelp() {
 }
 
 int CommandAnimate::execute(std::istream& args) {
-    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+    if (!getGame().isLoaded()) {
         getConsole() << "Use animate command interactively!" << Console::endl;
         return -1;
     }

src/commands/CommandBind.cpp

@@ -7,7 +7,7 @@
 
 #include "global.h"
 #include "Console.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "commands/CommandBind.h"
 
 std::string CommandBind::name() {
@@ -57,7 +57,7 @@ int CommandBind::execute(std::istream& args) {
             return -3;
         }
 
-        getOpenRaider().keyBindings[e] = c;
+        getRunTime().setKeyBinding(e, c);
         return 0;
     }
 }

src/commands/CommandEngine.cpp

@@ -9,7 +9,7 @@
 #include "Console.h"
 #include "Game.h"
 #include "Menu.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "Render.h"
 #include "commands/CommandEngine.h"
 
@@ -27,7 +27,7 @@ void CommandLoad::printHelp() {
 }
 
 int CommandLoad::execute(std::istream& args) {
-    if (!getOpenRaider().mRunning) {
+    if (!getRunTime().isRunning()) {
         getConsole() << "Use load command interactively!" << Console::endl;
         return -1;
     }
@@ -55,12 +55,12 @@ void CommandScreenshot::printHelp() {
 }
 
 int CommandScreenshot::execute(std::istream& args) {
-    if (!getOpenRaider().mRunning) {
+    if (!getRunTime().isRunning()) {
         getConsole() << "Use sshot command interactively!" << Console::endl;
         return -1;
     }
 
-    std::string filename(getOpenRaider().getBaseDir());
+    std::string filename(getRunTime().getBaseDir());
     filename += "/sshots/";
     filename += VERSION_SHORT;
 
@@ -81,8 +81,8 @@ int CommandScreenshot::execute(std::istream& args) {
     else if (temp2 == "menu")
         getMenu().moveToTop();
 
-    getOpenRaider().frame();
-    getOpenRaider().frame(); // Double buffered
+    renderFrame();
+    renderFrame(); // Double buffered
     getRender().screenShot(filename.c_str());
 
     getMenu().makeInvisible();

src/commands/CommandGame.cpp

@@ -8,7 +8,7 @@
 #include "global.h"
 #include "Console.h"
 #include "Game.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "World.h"
 #include "commands/CommandGame.h"
 
@@ -21,7 +21,7 @@ std::string CommandPos::brief() {
 }
 
 int CommandPos::execute(std::istream& args) {
-    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+    if ((!getRunTime().isRunning()) || (!getGame().isLoaded())) {
         getConsole() << "Use pos command interactively!" << Console::endl;
         return -1;
     }
@@ -41,7 +41,7 @@ std::string CommandViewmodel::brief() {
 }
 
 int CommandViewmodel::execute(std::istream& args) {
-    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+    if ((!getRunTime().isRunning()) || (!getGame().isLoaded())) {
         getConsole() << "Use viewmodel command interactively!" << Console::endl;
         return -1;
     }
@@ -72,7 +72,7 @@ std::string CommandPigtail::brief() {
 }
 
 int CommandPigtail::execute(std::istream& args) {
-    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+    if ((!getRunTime().isRunning()) || (!getGame().isLoaded())) {
         getConsole() << "Use pigtail command interactively!" << Console::endl;
         return -1;
     }
@@ -100,7 +100,7 @@ std::string CommandPonypos::brief() {
 }
 
 int CommandPonypos::execute(std::istream& args) {
-    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+    if ((!getRunTime().isRunning()) || (!getGame().isLoaded())) {
         getConsole() << "Use ponypos command interactively!" << Console::endl;
         return -1;
     }

src/commands/CommandMove.cpp

@@ -8,7 +8,7 @@
 #include "global.h"
 #include "Console.h"
 #include "Game.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "commands/CommandMove.h"
 
 std::string CommandMove::name() {
@@ -29,7 +29,7 @@ void CommandMove::printHelp() {
 }
 
 int CommandMove::execute(std::istream& args) {
-    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+    if ((!getRunTime().isRunning()) || (!getGame().isLoaded())) {
         getConsole() << "Use move command interactively!" << Console::endl;
         return -1;
     }

src/commands/CommandRender.cpp

@@ -8,7 +8,7 @@
 #include "global.h"
 #include "Console.h"
 #include "Game.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "Render.h"
 #include "commands/CommandRender.h"
 
@@ -86,7 +86,7 @@ void CommandRenderflag::printHelp() {
 }
 
 int CommandRenderflag::execute(std::istream& args) {
-    if (!getOpenRaider().mRunning) {
+    if (!getRunTime().isRunning()) {
         getConsole() << "Use renderflag-Command interactively!" << Console::endl;
         return -1;
     }

src/commands/CommandSet.cpp

@@ -9,7 +9,7 @@
 #include "Camera.h"
 #include "Console.h"
 #include "Font.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "Sound.h"
 #include "Window.h"
 #include "utils/strings.h"
@@ -53,10 +53,10 @@ namespace {
         }
 
         // Expand Names
-        s = findAndReplace(s, "$(pakdir)", getOpenRaider().getPakDir());
-        s = findAndReplace(s, "$(audiodir)", getOpenRaider().getAudioDir());
-        s = findAndReplace(s, "$(datadir)", getOpenRaider().getDataDir());
-        s = findAndReplace(s, "$(basedir)", getOpenRaider().getBaseDir());
+        s = findAndReplace(s, "$(pakdir)", getRunTime().getPakDir());
+        s = findAndReplace(s, "$(audiodir)", getRunTime().getAudioDir());
+        s = findAndReplace(s, "$(datadir)", getRunTime().getDataDir());
+        s = findAndReplace(s, "$(basedir)", getRunTime().getBaseDir());
 
         // Full path
         s = expandHomeDirectory(s);
@@ -117,23 +117,23 @@ int CommandSet::execute(std::istream& args) {
             getConsole() << "set-fps-Error: Invalid value" << Console::endl;
             return -8;
         }
-        getOpenRaider().mFPS = fps;
+        getRunTime().setFPS(fps);
     } else if (var.compare("basedir") == 0) {
         std::string temp;
         args >> temp;
-        getOpenRaider().setBaseDir(expandNames(temp));
+        getRunTime().setBaseDir(expandNames(temp));
     } else if (var.compare("pakdir") == 0) {
         std::string temp;
         args >> temp;
-        getOpenRaider().setPakDir(expandNames(temp));
+        getRunTime().setPakDir(expandNames(temp));
     } else if (var.compare("audiodir") == 0) {
         std::string temp;
         args >> temp;
-        getOpenRaider().setAudioDir(expandNames(temp));
+        getRunTime().setAudioDir(expandNames(temp));
     } else if (var.compare("datadir") == 0) {
         std::string temp;
         args >> temp;
-        getOpenRaider().setDataDir(expandNames(temp));
+        getRunTime().setDataDir(expandNames(temp));
     } else if (var.compare("font") == 0) {
         std::string temp;
         args >> temp;

src/commands/CommandSound.cpp

@@ -8,7 +8,7 @@
 #include "global.h"
 #include "Console.h"
 #include "Game.h"
-#include "OpenRaider.h"
+#include "RunTime.h"
 #include "Sound.h"
 #include "commands/CommandSound.h"
 
@@ -28,7 +28,7 @@ void CommandSound::printHelp() {
 }
 
 int CommandSound::execute(std::istream& args) {
-    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+    if (!getGame().isLoaded()) {
         getConsole() << "Use sound command interactively!" << Console::endl;
         return -1;
     }

src/main.cpp

@@ -6,13 +6,16 @@
  */
 
 #include <iostream>
+#include <memory>
 
 #include "global.h"
 #include "Console.h"
 #include "Exception.h"
-#include "OpenRaider.h"
 #include "commander/commander.h"
 #include "commands/Command.h"
+#include "utils/time.h"
+
+#ifndef UNIT_TEST
 
 #include "Camera.h"
 #include "Debug.h"
@@ -20,7 +23,10 @@
 #include "Game.h"
 #include "MenuFolder.h"
 #include "Render.h"
+#include "RunTime.h"
 #include "TextureManager.h"
+#include "UI.h"
+#include "Window.h"
 #include "World.h"
 
 #ifdef USING_AL
@@ -35,78 +41,30 @@
 #error No Windowing Library selected!
 #endif
 
-#ifndef UNIT_TEST
-
-namespace {
-    Camera* gCamera;
-    Console* gConsole;
-    Debug* gDebug;
-    FontManager* gFont;
-    Game* gGame;
-    MenuFolder* gMenu;
-    OpenRaider* gOpenRaider;
-    Render* gRender;
-    Sound* gSound;
-    TextureManager* gTextureManager;
-    Window* gWindow;
-    World* gWorld;
-
-    void createGlobals() {
-        gOpenRaider = new OpenRaider();
-        gCamera = new Camera();
-        gConsole = new Console();
-        gDebug = new Debug();
-        gFont = new FontManager();
-        gGame = new Game();
-        gMenu = new MenuFolder();
-        gRender = new Render();
-        gTextureManager = new TextureManager();
-        gWorld = new World();
-
-#ifdef USING_AL
-        gSound = new SoundAL();
-#else
-        gSound = new SoundNull();
-#endif
-
-#ifdef USING_SDL
-        gWindow = new WindowSDL();
-#endif
-    }
-
-    void deleteGlobals() {
-        delete gCamera;
-        delete gConsole;
-        delete gFont;
-        delete gGame;
-        delete gMenu;
-        delete gOpenRaider;
-        delete gRender;
-        delete gSound;
-        delete gTextureManager;
-        delete gWindow;
-        delete gWorld;
-    }
-
-    bool configFileWasSpecified = false;
-
-    void configFileCallback(command_t *self) {
-        getOpenRaider().loadConfig(self->arg);
-        configFileWasSpecified = true;
-    }
-
-    void cleanupHandler(void) {
+static std::string configFileToUse;
+
+static std::shared_ptr<Camera> gCamera;
+static std::shared_ptr<Console> gConsole;
+static std::shared_ptr<Debug> gDebug;
+static std::shared_ptr<FontManager> gFont;
+static std::shared_ptr<Game> gGame;
+static std::shared_ptr<MenuFolder> gMenu;
+static std::shared_ptr<Render> gRender;
+static std::shared_ptr<RunTime> gRunTime;
+static std::shared_ptr<Sound> gSound;
+static std::shared_ptr<TextureManager> gTextureManager;
+static std::shared_ptr<Window> gWindow;
+static std::shared_ptr<World> gWorld;
+
+static void cleanupHandler(void) {
 #ifdef DEBUG
-        std::cout << std::endl;
-        std::cout << "Thanks for testing " << VERSION << std::endl;
-        std::cout << "Build date: " << __DATE__ << " @ " << __TIME__ << std::endl;
-        std::cout << "Build host: " << BUILD_HOST << std::endl;
-        std::cout << "Web site  : http://github.com/xythobuz/OpenRaider" << std::endl;
-        std::cout << "Contact   : xythobuz@xythobuz.de" << std::endl;
+    std::cout << std::endl;
+    std::cout << "Thanks for testing " << VERSION << std::endl;
+    std::cout << "Build date: " << __DATE__ << " @ " << __TIME__ << std::endl;
+    std::cout << "Build host: " << BUILD_HOST << std::endl;
+    std::cout << "Web site  : http://github.com/xythobuz/OpenRaider" << std::endl;
+    std::cout << "Contact   : xythobuz@xythobuz.de" << std::endl;
 #endif
-
-        deleteGlobals();
-    }
 }
 
 Camera &getCamera() {
@@ -133,14 +91,14 @@ Menu &getMenu() {
     return *gMenu;
 }
 
-OpenRaider &getOpenRaider() {
-    return *gOpenRaider;
-}
-
 Render &getRender() {
     return *gRender;
 }
 
+RunTime &getRunTime() {
+    return *gRunTime;
+}
+
 Sound &getSound() {
     return *gSound;
 }
@@ -158,40 +116,118 @@ World &getWorld() {
 }
 
 int main(int argc, char* argv[]) {
-    createGlobals();
-    atexit(cleanupHandler);
-    Command::fillCommandList();
-
     command_t cmd;
     command_init(&cmd, argv[0], VERSION);
-    //command_option(&cmd, "-v", "--verbose", "enable verbose output", functionPointer);
-    command_option(&cmd, "-c", "--config <file>", "select config file to use", configFileCallback);
+    command_option(&cmd, "-c", "--config <file>", "select config file to use",
+            [](command_t *self) {
+        configFileToUse = self->arg;
+    });
     command_parse(&cmd, argc, argv);
+    command_free(&cmd);
+
+    gCamera.reset(new Camera());
+    gConsole.reset(new Console());
+    gDebug.reset(new Debug());
+    gFont.reset(new FontManager());
+    gGame.reset(new Game());
+    gMenu.reset(new MenuFolder());
+    gRender.reset(new Render());
+    gRunTime.reset(new RunTime());
+    gTextureManager.reset(new TextureManager());
+    gWorld.reset(new World());
 
-    if (!configFileWasSpecified) {
-        if (getOpenRaider().loadConfig(DEFAULT_CONFIG_FILE) != 0) {
-            getOpenRaider().loadConfig(DEFAULT_CONFIG_PATH "/" DEFAULT_CONFIG_FILE);
+#ifdef USING_AL
+    gSound.reset(new SoundAL());
+#else
+    gSound.reset(new SoundNull());
+#endif
+
+#ifdef USING_SDL
+    gWindow.reset(new WindowSDL());
+#endif
+
+    atexit(cleanupHandler);
+    Command::fillCommandList();
+
+    if (configFileToUse == "") {
+        if (Command::executeFile(DEFAULT_CONFIG_FILE) != 0) {
+            Command::executeFile(DEFAULT_CONFIG_PATH "/" DEFAULT_CONFIG_FILE);
         }
+    } else {
+        Command::executeFile(configFileToUse);
     }
 
-#ifdef DEBUG
     getConsole() << "Initializing " << VERSION << Console::endl;
-#endif
 
-    int error = getOpenRaider().initialize();
+    // Initialize Windowing
+    int error = getWindow().initialize();
     if (error != 0) {
-        std::cout << "Could not initialize OpenRaider (" << error << ")!" << std::endl;
+        std::cout << "Could not initialize Window (" << error << ")!" << std::endl;
         return -1;
     }
 
-    command_free(&cmd);
+    // Initialize OpenGL
+    error = getWindow().initializeGL();
+    if (error != 0) {
+        std::cout << "Could not initialize OpenGL (" << error << ")!" << std::endl;
+        return -2;
+    }
+
+    // Initialize Font
+    error = getFont().initialize();
+    if (error != 0) {
+        std::cout << "Could not initialize Font (" << error << ")!" << std::endl;
+        return -3;
+    }
+
+    // Initialize Sound
+    error = getSound().initialize();
+    if (error != 0) {
+        std::cout << "Could not initialize Sound (" << error << ")!" << std::endl;
+        return -4;
+    }
+
+    // Initialize Texture Manager
+    error = getTextureManager().initialize();
+    if (error != 0) {
+        std::cout << "Could not initialize TextureManager (" << error << ")!" << std::endl;
+        return -5;
+    }
+
+    // Initialize UIs
+    error = UI::passInitialize();
+    if (error != 0) {
+        std::cout << "Could not initialize UIs (" << error << ")!" << std::endl;
+        return -6;
+    }
 
     getConsole() << "Starting " << VERSION << Console::endl;
-    getOpenRaider().run();
+    getMenu().moveToTop();
+    systemTimerReset();
+    getRunTime().start();
+
+    while (getRunTime().isRunning()) {
+        renderFrame();
+    }
 
     return 0;
 }
 
+void renderFrame() {
+    // Get keyboard and mouse input
+    getWindow().eventHandling();
+
+    ImGui::SetNewWindowDefaultPos(ImVec2(50, 50));
+    bool show_test_window = false;
+    ImGui::ShowTestWindow(&show_test_window);
+
+    // Render everything
+    UI::passDisplay();
+
+    // Put new frame on screen
+    getWindow().swapBuffersGL();
+}
+
 #endif // UNIT_TEST
 
 #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS)