X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;h=9766577c565dd0d11b9ce4f0c98db3bbae1094d4;hb=3185bad87c06739e4ec19b456c7158437ba9621f;hp=db0933f961c1520156d52caecb060cc3c753d22e;hpb=be3a81656b8493010d2329fa00da617e24293438;p=blank.git

diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp
index db0933f..9766577 100644
--- a/src/app/Assets.hpp
+++ b/src/app/Assets.hpp
@@ -11,22 +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;
@@ -41,7 +54,7 @@ struct Assets {
 	Font large_ui_font;
 	Font small_ui_font;
 
-	Assets(const AssetLoader &);
+	explicit Assets(const AssetLoader &);
 
 };