diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-17 12:26:22 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-17 12:26:22 +0100 |
| commit | f898bdeae6a9f8d6525f73c51996062f8c5e8f57 (patch) | |
| tree | 07db9eeda9dba7574b1271b3e2ec5990911ee360 | |
| parent | Create a large test forest (diff) | |
| download | ilt-f898bdeae6a9f8d6525f73c51996062f8c5e8f57.tar.bz2 ilt-f898bdeae6a9f8d6525f73c51996062f8c5e8f57.tar.xz ilt-f898bdeae6a9f8d6525f73c51996062f8c5e8f57.zip | |
Assets moved to global game state
| -rw-r--r-- | application/main.cpp | 2 | ||||
| -rw-r--r-- | game/gamestate.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/application/main.cpp b/application/main.cpp index a0b2dfd..9feb80b 100644 --- a/application/main.cpp +++ b/application/main.cpp @@ -44,9 +44,9 @@ public: windows.create<GameMainWindow>(DISPLAY_WIDTH, DISPLAY_HEIGHT); world.create<Terrain>(geoData); + assets = AssetFactory::loadAll("res"); { - const auto assets = AssetFactory::loadAll("res"); auto rl = world.create<RailLinks>(); const glm::vec3 j {-1120, -1100, 3}, k {-1100, -1000, 15}, l {-1000, -800, 20}, m {-900, -600, 30}, n {-600, -500, 32}, o {-500, -800, 30}, p {-600, -900, 25}, q {-1025, -1175, 10}, 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; |