Store a Transform in keyframes instead of a Matrix

[libs/gl.git] / source / resources.cpp

diff --git a/source/resources.cpp b/source/resources.cpp
index c8e61ef8286d0b54c5364286d622985b0ed308f8..03e10e2dccac03e46b1fa0b904cef0b821c8db17 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -30,6 +30,7 @@ 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)
 {
@@ -74,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;
@@ -89,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);
@@ -105,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)
@@ -121,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);
@@ -138,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();