Add support for array and multiple lights in generated shaders

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

diff --git a/source/resources.cpp b/source/resources.cpp
index 8e872d5defbc7a703aec6b9ee56d3218fd393289..9583994710f5acab1d6b8517e9277ae223b082be 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -19,7 +19,8 @@ namespace Msp {
 namespace GL {
 
 Resources::Resources():
-       default_tex_filter(LINEAR_MIPMAP_LINEAR)
+       default_tex_filter(LINEAR_MIPMAP_LINEAR),
+       srgb_conversion(false)
 {
        add_type<Animation>().suffix(".anim").keyword("animation");
        add_type<Armature>().suffix(".arma").keyword("armature");
@@ -40,6 +41,11 @@ void Resources::set_default_texture_filter(TextureFilter tf)
        default_tex_filter = tf;
 }
 
+void Resources::set_srgb_conversion(bool c)
+{
+       srgb_conversion = c;
+}
+
 Texture2D *Resources::create_texture2d(const string &name)
 {
        string ext = FS::extpart(name);
@@ -63,7 +69,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();
        }