Enable resource management on Texture2D

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

diff --git a/source/resources.cpp b/source/resources.cpp
index d1fd371c483e71290f71b33139c2b3507af2566f..79c5e85fbe47764e0cca300f15c8acb3ff350450 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -62,9 +62,10 @@ Texture2D *Resources::create_texture2d(const string &name)
        if(RefPtr<IO::Seekable> io = open_from_sources(name))
        {
                Graphics::Image image;
-               image.load_io(*io);
+               if(!resource_manager)
+                       image.load_io(*io);
 
-               RefPtr<GL::Texture2D> tex = new GL::Texture2D;
+               RefPtr<GL::Texture2D> tex = new GL::Texture2D(resource_manager);
 
                if(default_tex_filter==NEAREST_MIPMAP_NEAREST || default_tex_filter==NEAREST_MIPMAP_LINEAR ||
                        default_tex_filter==LINEAR_MIPMAP_NEAREST || default_tex_filter==LINEAR_MIPMAP_LINEAR)
@@ -76,7 +77,11 @@ Texture2D *Resources::create_texture2d(const string &name)
                        tex->set_mag_filter(default_tex_filter);
                tex->set_min_filter(default_tex_filter);
 
-               tex->image(image, srgb_conversion);
+               // TODO Somehow pass the srgb flag if a resource manager is in use
+               if(resource_manager)
+                       resource_manager->set_resource_location(*tex, *this, name);
+               else
+                       tex->image(image, srgb_conversion);
                return tex.release();
        }