X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=ab5700482ce02484efb7b960df00a9b3a95a0908;hb=635e5dc39adf09051bdacadbc402ddf22f7807a3;hp=b747a2a6b0d7001b3d06e7a2811f91e93f075e78;hpb=2ba5af95fb7341b0e6b212e28d03208c6747aae5;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index b747a2a6..ab570048 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -193,22 +193,22 @@ void Texture::set_compare_func(Predicate f)
 	default_sampler.set_compare(f);
 }
 
-void Texture::load_image(const string &fn, bool srgb)
+void Texture::load_image(const string &fn, bool)
 {
-	load_image(fn, 0, srgb);
+	load_image(fn, 0U);
 }
 
-void Texture::load_image(const string &fn, unsigned lv, bool srgb)
+void Texture::load_image(const string &fn, unsigned lv)
 {
 	Graphics::Image img;
 	img.load_file(fn);
 
-	image(img, lv, srgb);
+	image(img, lv);
 }
 
-void Texture::image(const Graphics::Image &img, bool srgb)
+void Texture::image(const Graphics::Image &img, bool)
 {
-	image(img, 0, srgb);
+	image(img, 0U);
 }
 
 void Texture::bind_to(unsigned i) const
@@ -279,12 +279,9 @@ Texture::Loader::Loader(Texture &t, Collection &c):
 void Texture::Loader::init()
 {
 	levels = 0;
-	if(Resources *res = dynamic_cast<Resources *>(coll))
-		srgb = res->get_srgb_conversion();
-	else
-		srgb = false;
 
 	add("external_image", &Loader::external_image);
+	add("external_image_srgb", &Loader::external_image);
 	add("filter", &Loader::filter);
 	add("generate_mipmap", &Loader::generate_mipmap);
 	add("image_data", &Loader::image_data);
@@ -306,15 +303,36 @@ unsigned Texture::Loader::get_levels() const
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-void Texture::Loader::external_image(const string &fn)
+void Texture::Loader::load_external_image(Graphics::Image &img, const std::string &fn)
 {
-	Graphics::Image img;
 	RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
 	if(!io)
 		throw IO::file_not_found(fn);
 	img.load_io(*io);
+}
+
+void Texture::Loader::external_image(const string &fn)
+{
+	obj.use_srgb_format = false;
+	external_image_common(fn);
+}
 
-	obj.image(img, get_levels(), srgb);
+void Texture::Loader::external_image_srgb(const string &fn)
+{
+	obj.use_srgb_format = true;
+	external_image_common(fn);
+}
+
+void Texture::Loader::external_image_common(const string &fn)
+{
+	if(obj.manager)
+		obj.manager->set_resource_location(obj, get_collection(), fn);
+	else
+	{
+		Graphics::Image img;
+		load_external_image(img, fn);
+		obj.image(img, get_levels());
+	}
 }
 
 void Texture::Loader::filter(TextureFilter f)
@@ -333,7 +351,7 @@ void Texture::Loader::image_data(const string &data)
 	IO::Memory mem(data.data(), data.size());
 	img.load_io(mem);
 
-	obj.image(img, get_levels(), srgb);
+	obj.image(img, get_levels());
 }
 
 void Texture::Loader::mag_filter(TextureFilter f)