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

diff --git a/source/resources.cpp b/source/resources.cpp
index b25c346a..d52dbe34 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -2,17 +2,20 @@
 #include <msp/fs/utils.h>
 #include "animation.h"
 #include "armature.h"
+#include "camera.h"
 #include "font.h"
 #include "keyframe.h"
 #include "lighting.h"
 #include "material.h"
 #include "mesh.h"
 #include "object.h"
+#include "pipelinetemplate.h"
 #include "pose.h"
 #include "program.h"
 #include "programcompiler.h"
 #include "resourcemanager.h"
 #include "resources.h"
+#include "sampler.h"
 #include "technique.h"
 #include "texture1d.h"
 #include "texture2d.h"
@@ -28,19 +31,23 @@ void init_shaderlib(DataFile::BuiltinSource &);
 
 Resources::Resources():
 	default_tex_filter(Texture::can_generate_mipmap() ? LINEAR_MIPMAP_LINEAR : LINEAR),
+	default_tex_anisotropy(1.0f),
 	srgb_conversion(false),
 	resource_manager(0)
 {
 	add_type<Animation>().suffix(".anim").keyword("animation");
 	add_type<Armature>().suffix(".arma").keyword("armature");
+	add_type<Camera>().keyword("camera");
 	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);
@@ -70,6 +77,11 @@ void Resources::set_default_texture_filter(TextureFilter tf)
 	default_tex_filter = tf;
 }
 
+void Resources::set_default_texture_anisotropy(float a)
+{
+	default_tex_anisotropy = a;
+}
+
 void Resources::set_srgb_conversion(bool c)
 {
 	srgb_conversion = c;
@@ -80,12 +92,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);
@@ -98,10 +123,10 @@ 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_from_sources(name))
+	if(RefPtr<IO::Seekable> io = open_raw(name))
 	{
 		Graphics::Image image;
 		if(!resource_manager)
@@ -109,19 +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);
+		{
+			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();
 	}
 
@@ -134,10 +170,10 @@ 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);
+		compiler.compile(*io, this, name);
 		RefPtr<Program> program = new Program;
 		compiler.add_shaders(*program);
 		program->link();