X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;h=ef63518ae270834ebc8d7862ad20471543eacb68;hb=fda38181732e58537331c919dd699eaa830ead50;hp=64bc72ce81f1239ab884b739989f701e9604ffe8;hpb=7e782291e0ce39eb2d4e8c1df28f682c313e6f8d;p=blank.git diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp index 64bc72c..ef63518 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,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 &, - 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;