X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;fp=src%2Fapp%2FAssets.hpp;h=c069c3ec32f7681e0c7573202567adde83327d00;hb=9c5308ba4108bd842af6d9d2e893ea575a7e6ca8;hp=64bc72ce81f1239ab884b739989f701e9604ffe8;hpb=4e3afb4c7631591b80cb7740a9b6f46da69b7ae4;p=blank.git diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp index 64bc72c..c069c3e 100644 --- a/src/app/Assets.hpp +++ b/src/app/Assets.hpp @@ -12,10 +12,10 @@ class ArrayTexture; class BlockTypeRegistry; class CubeMap; class ModelRegistry; +class ResourceIndex; class ShapeRegistry; class Sound; class Texture; -class TextureIndex; class AssetLoader { @@ -25,20 +25,20 @@ public: void LoadBlockTypes( const std::string &set_name, BlockTypeRegistry &, - TextureIndex &, + ResourceIndex &, 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 &, + 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;