X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=b528ca30f5b6ccaee0ac81c0e78e86226f345a1a;hb=cb836adcf11f690188df9b7bc59f3fe87b67aaa7;hp=bda29f05cdd5a2c63f93f8cc334503c1c8e1ef97;hpb=d2efbd8a32efa2a3ee8542efc846277af19d63e0;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index bda29f05..b528ca30 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -78,7 +78,7 @@ Texture::~Texture()
 
 DataType Texture::get_alloc_type(PixelFormat fmt)
 {
-	return (fmt==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
+	return (get_base_pixelformat(fmt)==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
 }
 
 void Texture::update_parameter(int mask) const
@@ -288,11 +288,12 @@ 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("max_anisotropy", &Loader::max_anisotropy);
 	add("min_filter", &Loader::min_filter);
 	add("wrap",       &Loader::wrap);
 	add("wrap_r",     &Loader::wrap_r);
@@ -300,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);
@@ -354,5 +364,12 @@ void Texture::Loader::wrap_t(TextureWrap w)
 	obj.set_wrap_t(w);
 }
 
+
+bool is_mipmapped(TextureFilter filter)
+{
+	return (filter==NEAREST_MIPMAP_NEAREST || filter==NEAREST_MIPMAP_LINEAR ||
+		filter==LINEAR_MIPMAP_NEAREST || filter==LINEAR_MIPMAP_LINEAR);
+}
+
 } // namespace GL
 } // namespace Msp