Add a datafile statement to use an external image for a texture

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

diff --git a/source/texture.cpp b/source/texture.cpp
index 6484440e08708075081bab3d9b54c20e2c4e55ec..97a73d9e6f59c81b3f8ca5f85f55219a02476da7 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"
@@ -75,6 +76,11 @@ Texture::~Texture()
                glDeleteTextures(1, &id);
 }
 
+DataType Texture::get_alloc_type(PixelFormat fmt)
+{
+       return (fmt==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
+}
+
 void Texture::update_parameter(int mask) const
 {
        if(TexUnit::current().get_texture()!=this)
@@ -198,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)
@@ -274,9 +288,11 @@ void Texture::Loader::init()
        else
                srgb = false;
 
+       add("external_image", &Loader::external_image);
        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);
@@ -285,6 +301,15 @@ void Texture::Loader::init()
        add("wrap_t",     &Loader::wrap_t);
 }
 
+void Texture::Loader::external_image(const string &fn)
+{
+       Graphics::Image img;
+       RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
+       img.load_io(*io);
+
+       obj.image(img, srgb);
+}
+
 void Texture::Loader::filter(TextureFilter f)
 {
        obj.set_filter(f);
@@ -295,6 +320,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);