Foundation for a resource management system

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

diff --git a/source/resources.cpp b/source/resources.cpp
index 10d76148860c0e43d3464429e534502b08a966f3..d1fd371c483e71290f71b33139c2b3507af2566f 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -8,6 +8,7 @@
 #include "object.h"
 #include "pose.h"
 #include "program.h"
+#include "resourcemanager.h"
 #include "resources.h"
 #include "technique.h"
 #include "texture2d.h"
@@ -20,7 +21,8 @@ namespace GL {
 
 Resources::Resources():
        default_tex_filter(LINEAR_MIPMAP_LINEAR),
-       srgb_conversion(false)
+       srgb_conversion(false),
+       resource_manager(0)
 {
        add_type<Animation>().suffix(".anim").keyword("animation");
        add_type<Armature>().suffix(".arma").keyword("armature");
@@ -46,6 +48,11 @@ void Resources::set_srgb_conversion(bool c)
        srgb_conversion = c;
 }
 
+void Resources::set_resource_manager(ResourceManager *m)
+{
+       resource_manager = m;
+}
+
 Texture2D *Resources::create_texture2d(const string &name)
 {
        string ext = FS::extpart(name);
@@ -69,7 +76,7 @@ Texture2D *Resources::create_texture2d(const string &name)
                        tex->set_mag_filter(default_tex_filter);
                tex->set_min_filter(default_tex_filter);
 
-               tex->image(image);
+               tex->image(image, srgb_conversion);
                return tex.release();
        }