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 b25c346a11ec7882511ee4cee68c0286c28be0ca..03e10e2dccac03e46b1fa0b904cef0b821c8db17 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -2,12 +2,14 @@
 #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"
@@ -28,17 +30,20 @@ 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<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<Technique>().suffix(".tech").keyword("technique");
@@ -70,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;
@@ -85,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);
@@ -101,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)
@@ -117,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);
@@ -134,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();