Add a missing initializer

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

diff --git a/source/resources.cpp b/source/resources.cpp
index db01b30badee3eca568eb5e11d5062b03c79670e..b8eec774387ea94233c6aa0223095199042ea12e 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -2,11 +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"
@@ -32,11 +35,14 @@ Resources::Resources():
 {
        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");
@@ -85,7 +91,7 @@ Mesh *Resources::create_mesh(const string &name)
 
        if(RefPtr<IO::Seekable> io = open_from_sources(name))
        {
-               RefPtr<GL::Mesh> mesh = new GL::Mesh(resource_manager);
+               RefPtr<Mesh> mesh = new Mesh(resource_manager);
                resource_manager->set_resource_location(*mesh, *this, name);
                return mesh.release();
        }
@@ -105,7 +111,7 @@ Texture2D *Resources::create_texture2d(const string &name)
                if(!resource_manager)
                        image.load_io(*io);
 
-               RefPtr<GL::Texture2D> tex = new GL::Texture2D(resource_manager);
+               RefPtr<Texture2D> tex = new Texture2D(resource_manager);
 
                if(is_mipmapped(default_tex_filter))
                {
@@ -135,7 +141,7 @@ Program *Resources::create_program(const string &name)
        if(RefPtr<IO::Seekable> io = open_from_sources(name))
        {
                ProgramCompiler compiler;
-               compiler.compile(*io, this);
+               compiler.compile(*io, this, name);
                RefPtr<Program> program = new Program;
                compiler.add_shaders(*program);
                program->link();