X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;h=3cfc1334371f7e2e491d3053113c6c0dd672a396;hb=5e82e61db8b9ed5b9a30c9706620b62b844ac734;hp=4ea7f57458f1f8c2435114eb561f40688c364bbc;hpb=196f02bdbbd372b77141201f045fcfea318093b1;p=blobs.git

diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp
index 4ea7f57..3cfc133 100644
--- a/src/app/Assets.hpp
+++ b/src/app/Assets.hpp
@@ -5,18 +5,30 @@
 #include "../graphics/CreatureSkin.hpp"
 #include "../graphics/PlanetSurface.hpp"
 #include "../graphics/SunSurface.hpp"
+#include "../world/Resource.hpp"
+#include "../world/Set.hpp"
+#include "../world/TileType.hpp"
 
 #include <string>
 
 
 namespace blobs {
+namespace io {
+	class TokenStreamReader;
+}
 namespace app {
 
 struct Assets {
 
 	std::string path;
-	std::string tile_path;
+	std::string data_path;
 	std::string skin_path;
+	std::string tile_path;
+
+	struct {
+		world::Set<world::Resource> resources;
+		world::Set<world::TileType> tiles;
+	} data;
 
 	struct {
 		graphics::ArrayTexture tiles;
@@ -38,6 +50,9 @@ struct Assets {
 	Assets(Assets &&) = delete;
 	Assets &operator =(Assets &&) = delete;
 
+	void ReadResources(io::TokenStreamReader &);
+	void ReadTileTypes(io::TokenStreamReader &);
+
 	void LoadTileTexture(const std::string &name, graphics::ArrayTexture &, int layer) const;
 	void LoadSkinTexture(const std::string &name, graphics::ArrayTexture &, int layer) const;