X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;h=ef63518ae270834ebc8d7862ad20471543eacb68;hb=6513b55584093a86ce1e369e054263dd75c295c8;hp=941fa1ba51966f9b45617adf44dabe9437707a84;hpb=ba55bf4293f3abc742eef710545a4b207ba2c820;p=blank.git diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp index 941fa1b..ef63518 100644 --- a/src/app/Assets.hpp +++ b/src/app/Assets.hpp @@ -11,10 +11,11 @@ namespace blank { class ArrayTexture; class BlockTypeRegistry; class CubeMap; +class ModelRegistry; +class ResourceIndex; class ShapeRegistry; class Sound; class Texture; -class TextureIndex; class AssetLoader { @@ -24,15 +25,21 @@ public: void LoadBlockTypes( const std::string &set_name, BlockTypeRegistry &, - TextureIndex &, + ResourceIndex &snd, + ResourceIndex &tex, 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 &, + ResourceIndex &, + 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; - void LoadTextures(const TextureIndex &, ArrayTexture &) const; + void LoadTextures(const ResourceIndex &, ArrayTexture &) const; private: std::string fonts;