X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=97a73d9e6f59c81b3f8ca5f85f55219a02476da7;hb=3a9ee749fbde41695d1b1a0804bbf63d76427b27;hp=8d43143c9d734c218211d070890bf4cd080b42ed;hpb=f35535633aab06e80f0666d8551431364654c6dc;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index 8d43143c..97a73d9e 100644
--- 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)
@@ -279,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);
@@ -290,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);
@@ -300,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);