X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=8aecb933cadc3ce2585799b31c9ce14bca5ae70a;hb=9e3e811d54906e73d97e2a14ee785f2fe6c0fae7;hp=fe59860d8cbbcd6ec9017bbdc70d162e8eff669e;hpb=207da74ff155973509f13d714bda28f9d8fc3f42;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index fe59860d..8aecb933 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -40,7 +40,7 @@ Resources::Resources():
 	add_type<Font>().keyword("font");
 	add_type<KeyFrame>().suffix(".kframe").keyword("keyframe");
 	add_type<Lighting>().suffix(".lightn").keyword("lighting");
-	add_type<Material>().suffix(".mat").keyword("material");
+	add_type<Material>().suffix(".mat").creator(&Resources::create_material);
 	add_type<Mesh>().keyword("mesh").creator(&Resources::create_mesh);
 	add_type<Object>().keyword("object");
 	add_type<PipelineTemplate>().suffix(".pipe").keyword("pipeline");
@@ -90,12 +90,25 @@ void Resources::set_resource_manager(ResourceManager *m)
 	resource_manager = m;
 }
 
+Material *Resources::create_material(const string &name)
+{
+	if(RefPtr<IO::Seekable> io = open_raw(name))
+	{
+		DataFile::Parser parser(*io, name);
+		Material::GenericLoader ldr(this);
+		ldr.load(parser);
+		return ldr.get_material();
+	}
+
+	return 0;
+}
+
 Mesh *Resources::create_mesh(const string &name)
 {
 	if(!resource_manager)
 		return 0;
 
-	if(RefPtr<IO::Seekable> io = open_from_sources(name))
+	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
 		RefPtr<Mesh> mesh = new Mesh(resource_manager);
 		resource_manager->set_resource_location(*mesh, *this, name);
@@ -111,7 +124,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 	if(ext==".tex2d")
 		return 0;
 
-	if(RefPtr<IO::Seekable> io = open_from_sources(name))
+	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
 		Graphics::Image image;
 		if(!resource_manager)
@@ -121,7 +134,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 
 		if(is_mipmapped(default_tex_filter))
 		{
-			tex->set_generate_mipmap(true);
+			tex->set_auto_generate_mipmap(true);
 			tex->set_mag_filter(LINEAR);
 		}
 		else
@@ -145,7 +158,7 @@ Program *Resources::create_program(const string &name)
 	if(ext==".shader")
 		return 0;
 
-	if(RefPtr<IO::Seekable> io = open_from_sources(name))
+	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
 		ProgramCompiler compiler;
 		compiler.compile(*io, this, name);