diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-11 12:34:52 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2018-02-11 12:34:52 -0500 |
commit | 77be863f4f15d2481a64e4e8dadb4060a6e4e590 (patch) | |
tree | ca571702d2148a75b5b847e77d26270257f54ebc /src/game.h | |
parent | 1400ade977e13e3b535d3c2fddb6e15de3c9b5a5 (diff) | |
download | therapy-77be863f4f15d2481a64e4e8dadb4060a6e4e590.tar.gz therapy-77be863f4f15d2481a64e4e8dadb4060a6e4e590.tar.bz2 therapy-77be863f4f15d2481a64e4e8dadb4060a6e4e590.zip |
Implemented map rendering and basic collision
Only wall and platform collision currently works, and map edges are not currently implemented.
Diffstat (limited to 'src/game.h')
-rw-r--r-- | src/game.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/game.h b/src/game.h index 7bd038e..346d67e 100644 --- a/src/game.h +++ b/src/game.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #include "renderer.h" | 4 | #include "renderer.h" |
5 | #include "entity_manager.h" | 5 | #include "entity_manager.h" |
6 | #include "system_manager.h" | 6 | #include "system_manager.h" |
7 | #include "world.h" | ||
7 | 8 | ||
8 | class Game { | 9 | class Game { |
9 | public: | 10 | public: |
@@ -22,6 +23,11 @@ public: | |||
22 | return systemManager_; | 23 | return systemManager_; |
23 | } | 24 | } |
24 | 25 | ||
26 | inline const World& getWorld() | ||
27 | { | ||
28 | return world_; | ||
29 | } | ||
30 | |||
25 | friend void key_callback( | 31 | friend void key_callback( |
26 | GLFWwindow* window, | 32 | GLFWwindow* window, |
27 | int key, | 33 | int key, |
@@ -31,9 +37,10 @@ public: | |||
31 | 37 | ||
32 | private: | 38 | private: |
33 | 39 | ||
40 | GLFWwindow* const window_; | ||
34 | EntityManager entityManager_; | 41 | EntityManager entityManager_; |
35 | SystemManager systemManager_; | 42 | SystemManager systemManager_; |
36 | GLFWwindow* const window_; | 43 | World world_; |
37 | bool shouldQuit_ = false; | 44 | bool shouldQuit_ = false; |
38 | }; | 45 | }; |
39 | 46 | ||