From e087bfd5a9a850db30c399e95ef3fd8ab48005d1 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 6 Oct 2021 00:05:53 +0300
Subject: [PATCH] Adjust creator and notify functions in Resources

---
 source/resources/resources.cpp | 32 ++++++++++++++++++--------------
 source/resources/resources.h   |  2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index 80a19e7c..63a72404 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -43,39 +43,43 @@ Resources::Resources(bool set_as_global):
 	add_type<Animation>().suffix(".anim").keyword("animation");
 	add_type<Armature>().suffix(".arma").keyword("armature");
 	add_type<Camera>().keyword("camera")
-		.notify(&Resources::set_debug_name<Camera>);
+		.notify(&set_debug_name<Camera>);
 	add_type<Font>().keyword("font");
 	add_type<KeyFrame>().suffix(".kframe").keyword("keyframe");
 	add_type<Light>().keyword("light");
 	add_type<Lighting>().suffix(".lightn").keyword("lighting")
-		.notify(&Resources::set_debug_name<Lighting>);
+		.notify(&set_debug_name<Lighting>);
 	add_type<Material>().suffix(".mat")
-		.creator(&Resources::create_generic<Material>).notify(&Resources::set_debug_name<Material>);
+		.creator([this](const string &n){ return create_generic<Material>(n); })
+		.notify(&set_debug_name<Material>);
 	add_type<Mesh>().keyword("mesh")
-		.creator(&Resources::create_mesh).notify(&Resources::set_debug_name<Mesh>);
+		.creator([this](const string &n){ return create_mesh(n); })
+		.notify(&set_debug_name<Mesh>);
 	add_type<Module>().suffix(".glsl").suffix(".spv")
-		.creator(&Resources::create_module);
+		.creator([this](const string &n){ return create_module(n); });
 	add_type<Object>().keyword("object");
 	add_type<SequenceTemplate>().suffix(".seq").keyword("sequence");
 	add_type<Pose>().keyword("pose");
 	add_type<Program>().keyword("shader")
-		.creator(&Resources::create_program).notify(&Resources::set_debug_name<Program>);
+		.creator([this](const string &n){ return create_program(n); })
+		.notify(&set_debug_name<Program>);
 	add_type<Sampler>().suffix(".samp").keyword("sampler")
-		.notify(&Resources::set_debug_name<Sampler>);
+		.notify(&set_debug_name<Sampler>);
 	add_type<Scene>().suffix(".scene")
-		.creator(&Resources::create_generic<Scene>);
+		.creator([this](const string &n){ return create_generic<Scene>(n); });
 	add_type<Technique>().suffix(".tech").keyword("technique")
-		.notify(&Resources::set_debug_name<Technique>);
+		.notify(&set_debug_name<Technique>);
 	add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d")
-		.notify(&Resources::set_debug_name<Texture1D>);
+		.notify(&set_debug_name<Texture1D>);
 	add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d")
-		.creator(&Resources::create_texture2d).notify(&Resources::set_debug_name<Texture2D>);
+		.creator([this](const string &n){ return create_texture2d(n); })
+		.notify(&set_debug_name<Texture2D>);
 	add_type<Texture3D>().base<Texture>().suffix(".tex3d").keyword("texture3d")
-		.notify(&Resources::set_debug_name<Texture3D>);
+		.notify(&set_debug_name<Texture3D>);
 	add_type<TextureCube>().base<Texture>().suffix(".texcb").keyword("texture_cube")
-		.notify(&Resources::set_debug_name<TextureCube>);
+		.notify(&set_debug_name<TextureCube>);
 	add_type<Texture2DArray>().base<Texture>().suffix(".tex2da").keyword("texture2d_array")
-		.notify(&Resources::set_debug_name<Texture2DArray>);
+		.notify(&set_debug_name<Texture2DArray>);
 
 	add_source(get_builtins());
 
diff --git a/source/resources/resources.h b/source/resources/resources.h
index 293670f9..0633f3c7 100644
--- a/source/resources/resources.h
+++ b/source/resources/resources.h
@@ -62,7 +62,7 @@ protected:
 	Program *create_program(const std::string &);
 
 	template<typename T>
-	void set_debug_name(const std::string &, T &);
+	static void set_debug_name(const std::string &, T &);
 };
 
 } // namespace GL
-- 
2.45.2