diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-22 19:06:42 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-22 19:06:42 +0100 |
| commit | d1f79b4c438ebf0822741e103b2cb06bdee4514e (patch) | |
| tree | a4d574d12cd81d5e33886ce7ca961f7dbe872fcf /game/gamestate.h | |
| parent | Rename lots of shader files (diff) | |
| parent | Keep the instance unused vector sorted and binary search it (diff) | |
| download | ilt-d1f79b4c438ebf0822741e103b2cb06bdee4514e.tar.bz2 ilt-d1f79b4c438ebf0822741e103b2cb06bdee4514e.tar.xz ilt-d1f79b4c438ebf0822741e103b2cb06bdee4514e.zip | |
Merge branch 'instancing'
Diffstat (limited to 'game/gamestate.h')
| -rw-r--r-- | game/gamestate.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/game/gamestate.h b/game/gamestate.h index 605aac4..db223c0 100644 --- a/game/gamestate.h +++ b/game/gamestate.h @@ -1,5 +1,6 @@ #pragma once +#include "assetFactory/assetFactory.h" #include <collection.hpp> #include <memory> #include <special_members.hpp> @@ -16,5 +17,6 @@ public: Collection<WorldObject> world; std::shared_ptr<GeoData> geoData; + AssetFactory::Assets assets; }; extern GameState * gameState; |