basic sky box

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

diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp
index 05a45ac82abe211a9425b4fa7aa0bf5e194c29f6..0d725ccef34a527e1c5c540a1df91f96256db9c8 100644 (file)
--- a/src/app/Assets.hpp
+++ b/src/app/Assets.hpp
@@ -1,10 +1,17 @@
 #ifndef BLOBS_APP_ASSETS_HPP_
 #define BLOBS_APP_ASSETS_HPP_
 
+#include "../creature/NameGenerator.hpp"
+#include "../graphics/AlphaSprite.hpp"
 #include "../graphics/ArrayTexture.hpp"
+#include "../graphics/Canvas.hpp"
 #include "../graphics/CreatureSkin.hpp"
+#include "../graphics/CubeMap.hpp"
+#include "../graphics/Font.hpp"
 #include "../graphics/PlanetSurface.hpp"
+#include "../graphics/SkyBox.hpp"
 #include "../graphics/SunSurface.hpp"
+#include "../math/GaloisLFSR.hpp"
 #include "../world/Resource.hpp"
 #include "../world/Set.hpp"
 #include "../world/TileType.hpp"
@@ -13,28 +20,48 @@
 
 
 namespace blobs {
+namespace io {
+       class TokenStreamReader;
+}
 namespace app {
 
 struct Assets {
 
        std::string path;
-       std::string tile_path;
+       std::string data_path;
+       std::string font_path;
        std::string skin_path;
+       std::string sky_path;
+       std::string tile_path;
+
+       math::GaloisLFSR random;
+
+       creature::NameGenerator name;
 
        struct {
                world::Set<world::Resource> resources;
-               world::Set<world::TileType> tiles;
+               world::Set<world::TileType> tile_types;
        } data;
 
+       struct {
+               graphics::Font large;
+               graphics::Font medium;
+               graphics::Font small;
+       } fonts;
+
        struct {
                graphics::ArrayTexture tiles;
                graphics::ArrayTexture skins;
+               graphics::CubeMap sky;
        } textures;
 
        struct {
+               graphics::AlphaSprite alpha_sprite;
+               graphics::Canvas canvas;
                graphics::PlanetSurface planet_surface;
                graphics::SunSurface sun_surface;
                graphics::CreatureSkin creature_skin;
+               graphics::SkyBox sky_box;
        } shaders;
 
        Assets();
@@ -46,8 +73,12 @@ 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;
+       void LoadSkyTexture(const std::string &name, graphics::CubeMap &) const;
 
 };