X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;h=ef63518ae270834ebc8d7862ad20471543eacb68;hb=d2f4c8720ae2326fac4203fa4984d835e875b355;hp=b9d62e2e04ae7ba284dd9fe69aa058208ad7627a;hpb=3a487f44c26f9bb9d1a1c831406b6497b2b3b425;p=blank.git diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp index b9d62e2..ef63518 100644 --- a/src/app/Assets.hpp +++ b/src/app/Assets.hpp @@ -11,24 +11,35 @@ namespace blank { class ArrayTexture; class BlockTypeRegistry; class CubeMap; +class ModelRegistry; +class ResourceIndex; class ShapeRegistry; class Sound; class Texture; -class TextureIndex; 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 &, + 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;