diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-01-30 14:14:01 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-02-04 19:26:55 +0000 |
| commit | 2eeaeafb40a6b04b811714c793fb97ce4de41254 (patch) | |
| tree | 55cea15af898afe6f0b81a3e6e2e7debe618a8b6 /application/main.cpp | |
| parent | Basic support for loading a heightmap from an image (diff) | |
| download | ilt-2eeaeafb40a6b04b811714c793fb97ce4de41254.tar.bz2 ilt-2eeaeafb40a6b04b811714c793fb97ce4de41254.tar.xz ilt-2eeaeafb40a6b04b811714c793fb97ce4de41254.zip | |
Split into main app and library the rest for testing
Diffstat (limited to 'application/main.cpp')
| -rw-r--r-- | application/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/application/main.cpp b/application/main.cpp index b2c2a5e..94a3b0f 100644 --- a/application/main.cpp +++ b/application/main.cpp @@ -1,16 +1,16 @@ -#include "game/terrain.h" -#include "gfx/window.h" -#include "inputHandler.h" -#include "manualCameraController.h" #include <SDL2/SDL.h> #include <chrono> #include <collection.hpp> +#include <game/terrain.h> #include <game/world.h> #include <game/worldobject.h> #include <gfx/camera_controller.h> #include <gfx/gl/camera.h> #include <gfx/gl/shader.h> +#include <gfx/inputHandler.h> +#include <gfx/manualCameraController.h> #include <gfx/renderable.h> +#include <gfx/window.h> #include <memory> #include <special_members.hpp> #include <vector> @@ -53,7 +53,7 @@ public: return false; } - void + int run() { Collection<Window> windows; @@ -92,6 +92,8 @@ public: } t_start = t_end; } + + return 0; } private: @@ -111,7 +113,5 @@ private: int main(int, char **) { - std::make_shared<SDL_Application>()->run(); - - return 0; + return std::make_shared<SDL_Application>()->run(); } |