summary refs log tree commit diff stats
path: root/src/game.h
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2018-04-28 09:22:44 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2018-04-28 09:22:44 -0400
commit8016a7146fec3f6f43ca05723441750e5aae3d4d (patch)
tree0d527c1af80cf9ac34a027f9ee6f1acbb95db9f4 /src/game.h
parentf782b81ba10c9b7a1e221b16de0aaa7b6c521729 (diff)
downloadtherapy-8016a7146fec3f6f43ca05723441750e5aae3d4d.tar.gz
therapy-8016a7146fec3f6f43ca05723441750e5aae3d4d.tar.bz2
therapy-8016a7146fec3f6f43ca05723441750e5aae3d4d.zip
Restructured the way the world is loaded
The World class was removed and replaced by the RealizingSystem and RealizableComponent. The realizable entity is intended to be a singleton and to represent the world. The Map class was also removed and integrated into the MappableComponent.

These changes are to facilitate implementation of map objects without needing special intermediary objects (including the Map class). Now, map entities are created as soon as the world is created, and map object entities will be as well. They will simply be deactivated while the map is not active. Multiple players are now slightly better supported, which will be important in the future.

This will likely become inefficient as the world becomes bigger, and some sort of sector-loading process will have to be designed. This also reduces the usefulness of EntityManager's entity-searching capabilities (which are not the most efficiently implemented currently anyway), and will likely in the future require some added functionality to better search subsets of entities.

A lot of the components were also rewritten to use bare member variables instead of accessor methods, as they never had special functionality and just took up space. These components were also documented.
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/game.h b/src/game.h index 43e08da..92a67d9 100644 --- a/src/game.h +++ b/src/game.h
@@ -3,7 +3,6 @@
3 3
4#include "entity_manager.h" 4#include "entity_manager.h"
5#include "system_manager.h" 5#include "system_manager.h"
6#include "world.h"
7#include "renderer/renderer.h" 6#include "renderer/renderer.h"
8 7
9class Game { 8class Game {
@@ -28,11 +27,6 @@ public:
28 return systemManager_; 27 return systemManager_;
29 } 28 }
30 29
31 inline const World& getWorld()
32 {
33 return world_;
34 }
35
36 friend void key_callback( 30 friend void key_callback(
37 GLFWwindow* window, 31 GLFWwindow* window,
38 int key, 32 int key,
@@ -45,7 +39,6 @@ private:
45 Renderer renderer_; 39 Renderer renderer_;
46 EntityManager entityManager_; 40 EntityManager entityManager_;
47 SystemManager systemManager_; 41 SystemManager systemManager_;
48 World world_;
49 bool shouldQuit_ = false; 42 bool shouldQuit_ = false;
50}; 43};
51 44