Moved getX() methods [skip ci]

ChangeLog.md

@@ -6,6 +6,7 @@
     * Created abstract UI class handling “windows” like menu and console. Windows
       can be stacked arbitrarily. The top most gets keyboard/mouse/action events.
     * Removed old C-String handling utility methods, now using std::string
+    * Moved getX() methods from main into their respective cpp file
 
     [ 20140831 ]
     * Moved command specific code from OpenRaider to static Command methods

src/Camera.cpp

@@ -11,6 +11,11 @@
 #include "math/Matrix.h"
 #include "Camera.h"
 
+Camera &getCamera() {
+    static Camera gCamera;
+    return gCamera;
+}
+
 Camera::Camera() {
     mViewDistance = 14.0f;
     mRotationDeltaX = 1.0f;

src/Console.cpp

@@ -16,6 +16,11 @@
 #include "Window.h"
 #include "Console.h"
 
+Console &getConsole() {
+    static Console gConsole;
+    return gConsole;
+}
+
 Console::Console() {
     zPos = -1;
     mHistoryPointer = 0;

src/Font.cpp

@@ -9,6 +9,12 @@
 #include "utils/strings.h"
 #include "Window.h"
 #include "Font.h"
+#include "FontManager.h"
+
+Font &getFont() {
+    static FontManager gFont;
+    return gFont;
+}
 
 Font::~Font() {
 }

src/Game.cpp

@@ -29,6 +29,11 @@
 std::map<int, int> gMapTex2Bump;
 #endif
 
+Game &getGame() {
+    static Game gGame;
+    return gGame;
+}
+
 Game::Game() {
     zPos = 0;
     mLoaded = false;

src/Menu.cpp

@@ -10,6 +10,12 @@
 #include "Font.h"
 #include "Window.h"
 #include "Menu.h"
+#include "MenuFolder.h"
+
+Menu &getMenu() {
+    static MenuFolder gMenu;
+    return gMenu;
+}
 
 void Menu::showDialog(std::string msg, std::string btn1, std::string btn2,
         std::function<int (bool state)> callback) {

src/OpenRaider.cpp

@@ -23,6 +23,11 @@
 #include "Window.h"
 #include "OpenRaider.h"
 
+OpenRaider &getOpenRaider() {
+    static OpenRaider gOpenRaider;
+    return gOpenRaider;
+}
+
 OpenRaider::OpenRaider() {
     mRunning = false;
     mFPS = false;

src/Render.cpp

@@ -24,6 +24,11 @@
 #include "Window.h"
 #include "World.h"
 
+Render &getRender() {
+    static Render gRender;
+    return gRender;
+}
+
 Render::Render() {
     mSkyMesh = -1;
     mSkyMeshRotation = false;

src/Sound.cpp

@@ -8,6 +8,21 @@
 #include "global.h"
 #include "Sound.h"
 
+#ifdef USING_AL
+#include "SoundAL.h"
+#else
+#include "SoundNull.h"
+#endif
+
+Sound &getSound() {
+#ifdef USING_AL
+    static SoundAL gSound;
+#else
+    static SoundNull gSound;
+#endif
+    return gSound;
+}
+
 Sound::~Sound() {
 }
 

src/TextureManager.cpp

@@ -24,6 +24,11 @@
 #include "utils/png.h"
 #endif
 
+TextureManager &getTextureManager() {
+    static TextureManager gTextureManager;
+    return gTextureManager;
+}
+
 TextureManager::TextureManager() {
     mFlags = 0;
 }

src/Window.cpp

@@ -15,6 +15,19 @@
 #include "utils/strings.h"
 #include "Window.h"
 
+#ifdef USING_SDL
+#include "WindowSDL.h"
+#else
+#error No Windowing Library selected!
+#endif
+
+Window &getWindow() {
+#ifdef USING_SDL
+    static WindowSDL gWindow;
+#endif
+    return gWindow;
+}
+
 unsigned int Window::getWidth() {
     return mWidth;
 }

src/World.cpp

@@ -11,6 +11,11 @@
 #include "global.h"
 #include "World.h"
 
+World &getWorld() {
+    static World gWorld;
+    return gWorld;
+}
+
 World::~World() {
     destroy();
 }

src/main.cpp

@@ -6,99 +6,15 @@
  */
 
 #include <iostream>
-#include <cstdlib>
-#include <cstring>
 
 #include "global.h"
-#include "Camera.h"
 #include "Console.h"
 #include "Exception.h"
-#include "FontManager.h"
-#include "Game.h"
-#include "MenuFolder.h"
 #include "OpenRaider.h"
-#include "Render.h"
-#include "TextureManager.h"
-#include "World.h"
 #include "commander/commander.h"
-#include "utils/strings.h"
-#include "utils/time.h"
 
 #ifndef UNIT_TEST
 
-#ifdef USING_AL
-#include "SoundAL.h"
-#else
-#include "SoundNull.h"
-#endif
-
-#ifdef USING_SDL
-#include "WindowSDL.h"
-#else
-#error No Windowing Library selected!
-#endif
-
-Camera &getCamera() {
-    static Camera gCamera;
-    return gCamera;
-}
-
-Console &getConsole() {
-    static Console gConsole;
-    return gConsole;
-}
-
-Font &getFont() {
-    static FontManager gFont;
-    return gFont;
-}
-
-Game &getGame() {
-    static Game gGame;
-    return gGame;
-}
-
-Menu &getMenu() {
-    static MenuFolder gMenu;
-    return gMenu;
-}
-
-OpenRaider &getOpenRaider() {
-    static OpenRaider gOpenRaider;
-    return gOpenRaider;
-}
-
-Render &getRender() {
-    static Render gRender;
-    return gRender;
-}
-
-Sound &getSound() {
-#ifdef USING_AL
-    static SoundAL gSound;
-#else
-    static SoundNull gSound;
-#endif
-    return gSound;
-}
-
-TextureManager &getTextureManager() {
-    static TextureManager gTextureManager;
-    return gTextureManager;
-}
-
-Window &getWindow() {
-#ifdef USING_SDL
-    static WindowSDL gWindow;
-#endif
-    return gWindow;
-}
-
-World &getWorld() {
-    static World gWorld;
-    return gWorld;
-}
-
 namespace {
     bool configFileWasSpecified = false;
 
@@ -119,7 +35,7 @@ namespace {
     }
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
     command_t cmd;
     command_init(&cmd, argv[0], VERSION);
     //command_option(&cmd, "-v", "--verbose", "enable verbose output", functionPointer);
@@ -141,7 +57,7 @@ int main(int argc, char *argv[]) {
     int error = getOpenRaider().initialize();
     if (error != 0) {
         std::cout << "Could not initialize OpenRaider (" << error << ")!" << std::endl;
-        return 2;
+        return -1;
     }
 
     command_free(&cmd);

test/CMakeLists.txt

@@ -27,9 +27,8 @@ add_dependencies (check tester_folder)
 #################################################################
 
 add_executable (tester_script EXCLUDE_FROM_ALL
-    "Script.cpp" "../src/Script.cpp" "../src/utils/strings.cpp"
-    "../src/utils/binary.cpp" "../src/utils/filesystem.cpp"
-    "../src/Exception.cpp" "../src/main.cpp"
+    "Script.cpp" "../src/Script.cpp" "../src/main.cpp"
+    "../src/utils/binary.cpp" "../src/Exception.cpp"
 )
 
 find_package (ZLIB REQUIRED)

test/Script.cpp

@@ -6,12 +6,10 @@
  */
 
 #include <iostream>
-#include <cstring>
 #include <cstdlib>
 #include <zlib.h>
 
 #include "global.h"
-#include "utils/strings.h"
 #include "Script.h"
 #include "ScriptTest.h"