Multiple changes

World uses smart pointers, UI got calculate and shutdown,
Removed atexit handler

ChangeLog.md

@@ -4,6 +4,9 @@
 
     [ 20140904 ]
     * Fixed imgui colors
+    * World now using smart pointers
+    * Removed atexit handler, now breaking out of main loop on quit
+    * Added calculate and shutdown calls to UI interface, properly shutting down imgui
 
     [ 20140903 ]
     * Finishing imgui integration, but now as UI layer and not on top of everything

TODO.md

@@ -17,7 +17,6 @@
 * 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/Debug.h

@@ -18,6 +18,8 @@ public:
     virtual int initialize();
     virtual void eventsFinished();
     virtual void display();
+    virtual void calculate();
+    virtual void shutdown();
 
     virtual void handleKeyboard(KeyboardButton key, bool pressed);
     virtual void handleText(char *text, bool notFinished);

include/RunTime.h

@@ -31,7 +31,7 @@ public:
     void setKeyBinding(ActionEvents event, KeyboardButton button);
 
     bool isRunning();
-    void start();
+    void setRunning(bool run);
 
     bool getFPS();
     void setFPS(bool fps);

include/UI.h

@@ -21,6 +21,8 @@ public:
     virtual int initialize();
     virtual void eventsFinished();
     virtual void display();
+    virtual void calculate();
+    virtual void shutdown();
 
     virtual void handleKeyboard(KeyboardButton key, bool pressed);
     virtual void handleText(char *text, bool notFinished);
@@ -38,6 +40,8 @@ public:
     static int passInitialize();
     static void passEvents();
     static void passDisplay();
+    static void passCalculate();
+    static void passShutdown();
     static void passKeyboard(KeyboardButton key, bool pressed);
     static void passText(char *text, bool notFinished);
     static void passMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released);

include/World.h

@@ -9,6 +9,7 @@
 #ifndef _WORLD_H_
 #define _WORLD_H_
 
+#include <memory>
 #include <vector>
 
 #include "Entity.h"
@@ -77,11 +78,11 @@ public:
     long getRoomByLocation(float x, float y, float z);
 
 private:
-    std::vector<Room *> mRooms;
-    std::vector<SpriteSequence *> mSprites;
-    std::vector<Entity *> mEntities;
-    std::vector<SkeletalModel *> mModels;
-    std::vector<StaticMesh *> mMeshes;
+    std::vector<std::unique_ptr<Room>> mRooms;
+    std::vector<std::unique_ptr<SpriteSequence>> mSprites;
+    std::vector<std::unique_ptr<Entity>> mEntities;
+    std::vector<std::unique_ptr<SkeletalModel>> mModels;
+    std::vector<std::unique_ptr<StaticMesh>> mMeshes;
 };
 
 World &getWorld();

src/Debug.cpp

@@ -9,6 +9,7 @@
 #include "Debug.h"
 #include "RunTime.h"
 #include "TextureManager.h"
+#include "utils/time.h"
 #include "Window.h"
 
 #define STB_IMAGE_IMPLEMENTATION
@@ -23,9 +24,6 @@ Debug::Debug() {
 }
 
 Debug::~Debug() {
-    // TODO Segfaults...?
-    //ImGui::Shutdown();
-
     UI::removeWindow(this);
 }
 
@@ -35,7 +33,7 @@ int Debug::initialize() {
 
     ImGuiIO& io = ImGui::GetIO();
     io.DisplaySize = ImVec2((float)getWindow().getWidth(), (float)getWindow().getHeight());
-    io.DeltaTime = 1.0f/60.0f;
+    io.DeltaTime = 1.0f / 60.0f;
 
     io.IniFilename = iniFilename.c_str();
     io.LogFilename = logFilename.c_str();
@@ -61,31 +59,48 @@ int Debug::initialize() {
     io.RenderDrawListsFn = Debug::renderImGui;
 
     // Load font texture
+    //! \todo Use our own font subsystem instead of this?
     const void* png_data;
     unsigned int png_size;
     ImGui::GetDefaultFontData(NULL, NULL, &png_data, &png_size);
     int tex_x, tex_y, tex_comp;
     void* tex_data = stbi_load_from_memory((const unsigned char*)png_data,
             (int)png_size, &tex_x, &tex_y, &tex_comp, 0);
+
+     //! \fixme TODO use proper slot
     fontTex = getTextureManager().loadBufferSlot((unsigned char *)tex_data,
-            tex_x, tex_y, RGBA, 32, 0, false); // TODO use proper slot!
+            tex_x, tex_y, RGBA, 32, 0, false);
+
     stbi_image_free(tex_data);
 
     return 0;
 }
 
-void Debug::display() {
-    ImGui::Render();
-}
-
 void Debug::eventsFinished() {
     ImGuiIO& io = ImGui::GetIO();
     io.DisplaySize = ImVec2((float)getWindow().getWidth(), (float)getWindow().getHeight());
-    io.DeltaTime = 1.0f / 60.0f; // TODO proper timing
+
+    static long lastTime = 0;
+    io.DeltaTime = ((float)(systemTimerGet() - lastTime)) / 1000.0f;
+    lastTime = systemTimerGet();
 
     ImGui::NewFrame();
 }
 
+void Debug::display() {
+    ImGui::Render();
+}
+
+void Debug::calculate() {
+    //ImGui::ShowTestWindow();
+    //ImGui::ShowStyleEditor();
+    ImGui::ShowUserGuide();
+}
+
+void Debug::shutdown() {
+    ImGui::Shutdown();
+}
+
 void Debug::handleKeyboard(KeyboardButton key, bool pressed) {
     ImGuiIO& io = ImGui::GetIO();
     io.KeysDown[key] = pressed;

src/RunTime.cpp

@@ -75,8 +75,8 @@ bool RunTime::isRunning() {
     return gameIsRunning;
 }
 
-void RunTime::start() {
-    gameIsRunning = true;
+void RunTime::setRunning(bool run) {
+    gameIsRunning = run;
 }
 
 bool RunTime::getFPS() {

src/UI.cpp

@@ -23,6 +23,8 @@ UI::~UI() {
 int UI::initialize() { return 0; }
 void UI::eventsFinished() { }
 void UI::display() { }
+void UI::calculate() { }
+void UI::shutdown() { }
 void UI::handleKeyboard(KeyboardButton key, bool pressed) { }
 void UI::handleText(char *text, bool notFinished) { }
 void UI::handleAction(ActionEvents action, bool isFinished) { }
@@ -30,6 +32,43 @@ void UI::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button,
 void UI::handleMouseMotion(int xrel, int yrel, int xabs, int yabs) { }
 void UI::handleMouseScroll(int xrel, int yrel) { }
 
+int UI::passInitialize() {
+    for (auto &x : windows) {
+        int error = x->initialize();
+        if (error != 0)
+            return error;
+    }
+
+    return 0;
+}
+
+void UI::passEvents() {
+    for (auto &x : windows) {
+        x->eventsFinished();
+    }
+}
+
+void UI::passDisplay() {
+    std::sort(windows.begin(), windows.end(), compareUIs);
+    for (auto &x : windows) {
+        if (x->zPos >= 0) {
+            x->display();
+        }
+    }
+}
+
+void UI::passCalculate() {
+    for (auto &x : windows) {
+        x->calculate();
+    }
+}
+
+void UI::passShutdown() {
+    for (auto &x : windows) {
+        x->shutdown();
+    }
+}
+
 void UI::passKeyboard(KeyboardButton key, bool pressed) {
     if (pressed) {
         if (getRunTime().getKeyBinding(menuAction) == key) {
@@ -168,28 +207,3 @@ void UI::makeInvisible() {
     });
 }
 
-int UI::passInitialize() {
-    for (auto &x : windows) {
-        int error = x->initialize();
-        if (error != 0)
-            return error;
-    }
-
-    return 0;
-}
-
-void UI::passEvents() {
-    for (auto &x : windows) {
-        x->eventsFinished();
-    }
-}
-
-void UI::passDisplay() {
-    std::sort(windows.begin(), windows.end(), compareUIs);
-    for (auto &x : windows) {
-        if (x->zPos >= 0) {
-            x->display();
-        }
-    }
-}
-

src/WindowSDL.cpp

@@ -9,6 +9,7 @@
 #include <ctime>
 
 #include "global.h"
+#include "RunTime.h"
 #include "UI.h"
 #include "utils/strings.h"
 #include "WindowSDL.h"
@@ -436,7 +437,8 @@ void WindowSDL::eventHandling() {
                 break;
 
             case SDL_QUIT:
-                exit(0);
+                getRunTime().setRunning(false);
+                break;
         }
     }
 

src/World.cpp

@@ -16,7 +16,7 @@ World::~World() {
 }
 
 void World::addRoom(Room &room) {
-    mRooms.push_back(&room);
+    mRooms.push_back(std::unique_ptr<Room>(&room));
 }
 
 unsigned long World::sizeRoom() {
@@ -29,7 +29,7 @@ Room &World::getRoom(unsigned long index) {
 }
 
 void World::addSprite(SpriteSequence &sprite) {
-    mSprites.push_back(&sprite);
+    mSprites.push_back(std::unique_ptr<SpriteSequence>(&sprite));
 }
 
 unsigned long World::sizeSprite() {
@@ -42,7 +42,7 @@ SpriteSequence &World::getSprite(unsigned long index) {
 }
 
 void World::addEntity(Entity &entity) {
-    mEntities.push_back(&entity);
+    mEntities.push_back(std::unique_ptr<Entity>(&entity));
 }
 
 unsigned long World::sizeEntity() {
@@ -55,7 +55,7 @@ Entity &World::getEntity(unsigned long index) {
 }
 
 void World::addSkeletalModel(SkeletalModel &model) {
-    mModels.push_back(&model);
+    mModels.push_back(std::unique_ptr<SkeletalModel>(&model));
 }
 
 unsigned long World::sizeSkeletalModel() {
@@ -68,7 +68,7 @@ SkeletalModel &World::getSkeletalModel(unsigned long index) {
 }
 
 void World::addStaticMesh(StaticMesh &model) {
-    mMeshes.push_back(&model);
+    mMeshes.push_back(std::unique_ptr<StaticMesh>(&model));
 }
 
 unsigned long World::sizeStaticMesh() {
@@ -111,24 +111,10 @@ long World::getRoomByLocation(float x, float y, float z) {
 
 
 void World::destroy() {
-    for (unsigned long i = 0; i < mRooms.size(); i++)
-        delete mRooms[i];
     mRooms.clear();
-
-    for (unsigned long i = 0; i < mSprites.size(); i++)
-        delete mSprites[i];
     mSprites.clear();
-
-    for (unsigned long i = 0; i < mEntities.size(); i++)
-        delete mEntities[i];
     mEntities.clear();
-
-    for (unsigned long i = 0; i < mModels.size(); i++)
-        delete mModels[i];
     mModels.clear();
-
-    for (unsigned long i = 0; i < mMeshes.size(); i++)
-        delete mMeshes[i];
     mMeshes.clear();
 }
 

src/main.cpp

@@ -56,17 +56,6 @@ 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;
-#endif
-}
-
 Camera &getCamera() {
     return *gCamera;
 }
@@ -146,7 +135,6 @@ int main(int argc, char* argv[]) {
     gWindow.reset(new WindowSDL());
 #endif
 
-    atexit(cleanupHandler);
     Command::fillCommandList();
 
     if (configFileToUse == "") {
@@ -204,27 +192,30 @@ int main(int argc, char* argv[]) {
     getConsole() << "Starting " << VERSION << Console::endl;
     getMenu().moveToTop();
     systemTimerReset();
-    getRunTime().start();
+    getRunTime().setRunning(true);
 
     while (getRunTime().isRunning()) {
+        getWindow().eventHandling();
+        UI::passCalculate();
         renderFrame();
     }
 
+    UI::passShutdown();
+
+#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;
+#endif
+
     return 0;
 }
 
 void renderFrame() {
-    // Get keyboard and mouse input
-    getWindow().eventHandling();
-
-    ImGui::ShowTestWindow();
-    ImGui::ShowStyleEditor();
-    //ImGui::ShowUserGuide();
-
-    // Render everything
     UI::passDisplay();
-
-    // Put new frame on screen
     getWindow().swapBuffersGL();
 }