X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.cpp;h=80a19e7c9bdd6aa3ed30f037930613defc39182b;hb=23d4100160bfa33359ce297b6b36244abcaa5f82;hp=8a7780cd4016521c2b0cb39428270ad0f50c1609;hpb=dbc91b65728ab9c0e574bb1127cfe4d2da55de7f;p=libs%2Fgl.git

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index 8a7780cd..80a19e7c 100644
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -50,7 +50,7 @@ Resources::Resources(bool set_as_global):
 	add_type<Lighting>().suffix(".lightn").keyword("lighting")
 		.notify(&Resources::set_debug_name<Lighting>);
 	add_type<Material>().suffix(".mat")
-		.creator(&Resources::create_material).notify(&Resources::set_debug_name<Material>);
+		.creator(&Resources::create_generic<Material>).notify(&Resources::set_debug_name<Material>);
 	add_type<Mesh>().keyword("mesh")
 		.creator(&Resources::create_mesh).notify(&Resources::set_debug_name<Mesh>);
 	add_type<Module>().suffix(".glsl").suffix(".spv")
@@ -63,7 +63,7 @@ Resources::Resources(bool set_as_global):
 	add_type<Sampler>().suffix(".samp").keyword("sampler")
 		.notify(&Resources::set_debug_name<Sampler>);
 	add_type<Scene>().suffix(".scene")
-		.creator(&Resources::create_scene);
+		.creator(&Resources::create_generic<Scene>);
 	add_type<Technique>().suffix(".tech").keyword("technique")
 		.notify(&Resources::set_debug_name<Technique>);
 	add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d")
@@ -121,14 +121,15 @@ void Resources::set_resource_manager(ResourceManager *m)
 	resource_manager = m;
 }
 
-Material *Resources::create_material(const string &name)
+template<typename T>
+T *Resources::create_generic(const string &name)
 {
 	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
 		DataFile::Parser parser(*io, name);
-		Material::GenericLoader ldr(this);
+		typename T::GenericLoader ldr(*this);
 		ldr.load(parser);
-		return ldr.get_material();
+		return ldr.get_object();
 	}
 
 	return 0;
@@ -149,19 +150,6 @@ Mesh *Resources::create_mesh(const string &name)
 	return 0;
 }
 
-Scene *Resources::create_scene(const string &name)
-{
-	if(RefPtr<IO::Seekable> io = open_raw(name))
-	{
-		DataFile::Parser parser(*io, name);
-		Scene::GenericLoader ldr(*this);
-		ldr.load(parser);
-		return ldr.get_scene();
-	}
-
-	return 0;
-}
-
 Texture2D *Resources::create_texture2d(const string &name)
 {
 	string ext = FS::extpart(name);
@@ -244,7 +232,6 @@ Program *Resources::create_program(const string &name)
 		Module &module = get<Module>(base);
 		RefPtr<Program> shprog = new Program;
 		shprog->add_stages(module);
-		shprog->link();
 		return shprog.release();
 	}
 
@@ -270,7 +257,7 @@ void Resources::Loader::scene(const string &name)
 {
 	Scene::GenericLoader ldr(obj);
 	load_sub_with(ldr);
-	obj.add(name, ldr.get_scene());
+	obj.add(name, ldr.get_object());
 }
 
 } // namespace GL