X-Git-Url: http://git.localhorst.tv/?p=blobs.git;a=blobdiff_plain;f=src%2Fworld%2FSimulation.hpp;h=ee497a8f97a47b1ded9176b85f973ea7f5a645a9;hp=2f2239efe1d9c77b03b1bd10e7151a7c0c659a0c;hb=42db7d9d2286e50896ad172e2e4a8fbe65c8a4a9;hpb=8f6530c75730f901efd6708e4fde7e68a178adf1 diff --git a/src/world/Simulation.hpp b/src/world/Simulation.hpp index 2f2239e..ee497a8 100644 --- a/src/world/Simulation.hpp +++ b/src/world/Simulation.hpp @@ -2,6 +2,7 @@ #define BLOBS_WORLD_SIMULATION_HPP_ #include "Set.hpp" +#include "../app/Assets.hpp" #include @@ -18,7 +19,7 @@ class TileType; class Simulation { public: - explicit Simulation(Body &root, const Set &, const Set &); + explicit Simulation(Body &root, app::Assets &); ~Simulation(); Simulation(const Simulation &) = delete; @@ -37,8 +38,10 @@ public: Body &Root() noexcept { return root; } const Body &Root() const noexcept { return root; } - const Set &Resources() const noexcept { return resources; } - const Set &TileTypes() const noexcept { return tile_types; } + app::Assets &Assets() noexcept { return assets; } + const app::Assets &Assets() const noexcept { return assets; } + const Set &Resources() const noexcept { return assets.data.resources; } + const Set &TileTypes() const noexcept { return assets.data.tile_types; } const std::set &Bodies() const noexcept { return bodies; } const std::set &Planets() const noexcept { return planets; } @@ -48,8 +51,7 @@ public: private: Body &root; - const Set &resources; - const Set &tile_types; + app::Assets &assets; std::set bodies; std::set planets; std::set suns;