X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=c28cdd07cf2d5f6a86814c44aa053ca674005e9f;hb=635e5dc;hp=8aecb933cadc3ce2585799b31c9ce14bca5ae70a;hpb=3500f13f51dabadd2e7f06b81820936520cc8115;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 8aecb933..c28cdd07 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -121,7 +121,7 @@ Mesh *Resources::create_mesh(const string &name)
 Texture2D *Resources::create_texture2d(const string &name)
 {
 	string ext = FS::extpart(name);
-	if(ext==".tex2d")
+	if(ext==".tex2d" && !resource_manager)
 		return 0;
 
 	if(RefPtr<IO::Seekable> io = open_raw(name))
@@ -132,20 +132,30 @@ Texture2D *Resources::create_texture2d(const string &name)
 
 		RefPtr<Texture2D> tex = new Texture2D(resource_manager);
 
-		if(is_mipmapped(default_tex_filter))
+		if(ext==".tex2d")
 		{
-			tex->set_auto_generate_mipmap(true);
-			tex->set_mag_filter(LINEAR);
+			DataFile::Parser parser(*io, name);
+			Texture2D::Loader ldr(*tex, *this);
+			ldr.load(parser);
 		}
 		else
-			tex->set_mag_filter(default_tex_filter);
-		tex->set_min_filter(default_tex_filter);
-		tex->set_max_anisotropy(default_tex_anisotropy);
+		{
+			Sampler &samp = tex->get_default_sampler();
+			if(is_mipmapped(default_tex_filter))
+			{
+				tex->set_auto_generate_mipmap(true);
+				samp.set_mag_filter(LINEAR);
+			}
+			else
+				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);
 		else
-			tex->image(image, srgb_conversion);
+			tex->image(image);
 		return tex.release();
 	}