X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;h=64bc72ce81f1239ab884b739989f701e9604ffe8;hb=4e3afb4c7631591b80cb7740a9b6f46da69b7ae4;hp=d1a4ae710d0cc832fbcb155b2756eebcc9718cba;hpb=9ebe2c320fd9f94266ab93fa2f9d9908a0a284d3;p=blank.git diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp index d1a4ae7..64bc72c 100644 --- a/src/app/Assets.hpp +++ b/src/app/Assets.hpp @@ -10,6 +10,9 @@ namespace blank { class ArrayTexture; class BlockTypeRegistry; +class CubeMap; +class ModelRegistry; +class ShapeRegistry; class Sound; class Texture; class TextureIndex; @@ -19,8 +22,19 @@ class AssetLoader { public: explicit AssetLoader(const std::string &base); - void LoadBlockTypes(const std::string &set_name, BlockTypeRegistry &, TextureIndex &) const; + void LoadBlockTypes( + const std::string &set_name, + BlockTypeRegistry &, + TextureIndex &, + const ShapeRegistry &) const; + CubeMap LoadCubeMap(const std::string &name) const; Font LoadFont(const std::string &name, int size) const; + void LoadModels( + const std::string &set_name, + ModelRegistry &, + TextureIndex &, + const ShapeRegistry &) const; + void LoadShapes(const std::string &set_name, ShapeRegistry &) const; Sound LoadSound(const std::string &name) const; Texture LoadTexture(const std::string &name) const; void LoadTexture(const std::string &name, ArrayTexture &, int layer) const;