read (basic) tile information from file

[blobs.git] / src / app / Assets.hpp

diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp
index b95ee48ea4f75a615cbee85d93a83e5ace754f3a..68606cb62e070b4956c7e440b8a5c13d9166a6e5 100644 (file)
--- a/src/app/Assets.hpp
+++ b/src/app/Assets.hpp
@@ -2,27 +2,43 @@
 #define BLOBS_APP_ASSETS_HPP_
 
 #include "../graphics/ArrayTexture.hpp"
+#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 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;
+               graphics::ArrayTexture skins;
        } textures;
 
        struct {
                graphics::PlanetSurface planet_surface;
                graphics::SunSurface sun_surface;
+               graphics::CreatureSkin creature_skin;
        } shaders;
 
        Assets();
@@ -34,7 +50,10 @@ struct Assets {
        Assets(Assets &&) = delete;
        Assets &operator =(Assets &&) = delete;
 
+       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;
 
 };