X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresources.cpp;h=d52dbe34fb61c745e74c4cad108cdd0a604990e7;hp=03e10e2dccac03e46b1fa0b904cef0b821c8db17;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=abb4e50bdbb6d62d7e6ee249d52353ccf22762a4

diff --git a/source/resources.cpp b/source/resources.cpp
index 03e10e2d..d52dbe34 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -15,6 +15,7 @@
 #include "programcompiler.h"
 #include "resourcemanager.h"
 #include "resources.h"
+#include "sampler.h"
 #include "technique.h"
 #include "texture1d.h"
 #include "texture2d.h"
@@ -40,12 +41,13 @@ 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");
 	add_type<Pose>().keyword("pose");
 	add_type<Program>().keyword("shader").suffix(".glsl").creator(&Resources::create_program);
+	add_type<Sampler>().suffix(".samp").keyword("sampler");
 	add_type<Technique>().suffix(".tech").keyword("technique");
 	add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d");
 	add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d").creator(&Resources::create_texture2d);
@@ -90,6 +92,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)
@@ -108,7 +123,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))
@@ -119,20 +134,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_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();
 	}