Implement loading functionality for texture classes that were missing it

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

diff --git a/source/texture.cpp b/source/texture.cpp
index 8d43143c9d734c218211d070890bf4cd080b42ed..bda29f05cdd5a2c63f93f8cc334503c1c8e1ef97 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -3,6 +3,7 @@
 #include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/gl/extensions/ext_texture_filter_anisotropic.h>
 #include <msp/gl/extensions/sgis_generate_mipmap.h>
+#include <msp/io/memory.h>
 #include <msp/strings/format.h>
 #include "error.h"
 #include "resourcemanager.h"
@@ -203,6 +204,14 @@ void Texture::set_compare_func(Predicate f)
        update_parameter(COMPARE_FUNC);
 }
 
+void Texture::load_image(const string &fn, bool srgb)
+{
+       Graphics::Image img;
+       img.load_file(fn);
+
+       image(img, srgb);
+}
+
 void Texture::bind_to(unsigned i) const
 {
        if(!id)
@@ -282,6 +291,7 @@ void Texture::Loader::init()
        add("filter", &Loader::filter);
        add("max_anisotropy", &Loader::max_anisotropy);
        add("generate_mipmap", &Loader::generate_mipmap);
+       add("image_data", &Loader::image_data);
        add("mag_filter", &Loader::mag_filter);
        add("min_filter", &Loader::min_filter);
        add("wrap",       &Loader::wrap);
@@ -300,6 +310,15 @@ void Texture::Loader::generate_mipmap(bool gm)
        obj.set_generate_mipmap(gm);
 }
 
+void Texture::Loader::image_data(const string &data)
+{
+       Graphics::Image img;
+       IO::Memory mem(data.data(), data.size());
+       img.load_io(mem);
+
+       obj.image(img, srgb);
+}
+
 void Texture::Loader::mag_filter(TextureFilter f)
 {
        obj.set_mag_filter(f);