X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=dd9a3c68c3543b549f425a863a842ad2d35bcc04;hb=9087cc0a372b9c739f15398c7a22c0a6eb5041bb;hp=22814cb820525809836226b2a455afd844d668cd;hpb=85c6c43eb0f937f31f4a91ef3731d8bb2e98c8b4;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 22814cb8..dd9a3c68 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,6 +90,19 @@ 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)
@@ -119,15 +132,16 @@ Texture2D *Resources::create_texture2d(const string &name)
 
 		RefPtr<Texture2D> tex = new Texture2D(resource_manager);
 
+		Sampler &samp = tex->get_default_sampler();
 		if(is_mipmapped(default_tex_filter))
 		{
 			tex->set_auto_generate_mipmap(true);
-			tex->set_mag_filter(LINEAR);
+			samp.set_mag_filter(LINEAR);
 		}
 		else
-			tex->set_mag_filter(default_tex_filter);
-		tex->set_min_filter(default_tex_filter);
-		tex->set_max_anisotropy(default_tex_anisotropy);
+			samp.set_mag_filter(default_tex_filter);
+		samp.set_min_filter(default_tex_filter);
+		samp.set_max_anisotropy(default_tex_anisotropy);
 
 		if(resource_manager)
 			resource_manager->set_resource_location(*tex, *this, name);