X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresources.cpp;h=03e10e2dccac03e46b1fa0b904cef0b821c8db17;hp=c34139b25e139e1b53e588c732715afc30a7ce62;hb=0cacf19c2e6aaa182ae0fcc7dfaae345aedd0e74;hpb=18240e2bb031551e9c72a55c7d974904d209760a

diff --git a/source/resources.cpp b/source/resources.cpp
index c34139b2..03e10e2d 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -2,6 +2,7 @@
 #include <msp/fs/utils.h>
 #include "animation.h"
 #include "armature.h"
+#include "camera.h"
 #include "font.h"
 #include "keyframe.h"
 #include "lighting.h"
@@ -29,11 +30,13 @@ 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");
@@ -72,6 +75,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;
@@ -87,7 +95,7 @@ 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);
@@ -103,7 +111,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)
@@ -119,6 +127,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 		else
 			tex->set_mag_filter(default_tex_filter);
 		tex->set_min_filter(default_tex_filter);
+		tex->set_max_anisotropy(default_tex_anisotropy);
 
 		if(resource_manager)
 			resource_manager->set_resource_location(*tex, *this, name);
@@ -136,10 +145,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();