X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=b8a2614a1da9b697410067a7daaad807476ace7c;hp=54577aacd55e06f389361f0eda96305b42a63057;hb=7ef75a4c4dbfc437e466381dd67c23357e607b82;hpb=be92396630a2065e43c21d9d1904e97014844cff

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index 54577aac..b8a2614a 100644
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -1,3 +1,4 @@
+#include <msp/datafile/rawdata.h>
 #include <msp/io/memory.h>
 #include "error.h"
 #include "resourcemanager.h"
@@ -25,28 +26,8 @@ Texture::Texture(unsigned t):
 void Texture::set_format(PixelFormat fmt)
 {
 	PixelComponents comp = get_components(fmt);
-	PixelComponents st_comp = comp;
-	FormatSwizzle swiz = NO_SWIZZLE;
-	switch(comp)
-	{
-	case LUMINANCE:
-		st_comp = RED;
-		swiz = R_TO_LUMINANCE;
-		break;
-	case LUMINANCE_ALPHA:
-		st_comp = RG;
-		swiz = RG_TO_LUMINANCE_ALPHA;
-		break;
-	case BGR:
-		st_comp = RGB;
-		swiz = RGB_TO_BGR;
-		break;
-	case BGRA:
-		st_comp = RGBA;
-		swiz = RGB_TO_BGR;
-		break;
-	default:;
-	}
+	ComponentSwizzle swiz = get_required_swizzle(comp);
+	PixelComponents st_comp = unswizzle_components(comp, swiz);
 
 	PixelFormat st_fmt = make_pixelformat(st_comp, get_component_type(fmt), is_srgb(fmt));
 	require_pixelformat(st_fmt);
@@ -87,11 +68,13 @@ Texture::Loader::Loader(Texture &t, Collection *c):
 	CollectionObjectLoader<Texture>(t, c),
 	levels(0)
 {
-	add("external_image", &Loader::external_image);
-	add("external_image_srgb", &Loader::external_image_srgb);
+	add("external_data", &Loader::external_data);
+	add("external_image", &Loader::external_image, false);
+	add("external_image_srgb", &Loader::external_image, true);
 	add("generate_mipmap", &Loader::generate_mipmap);
 	add("image_data", &Loader::image_data);
 	add("mipmap_levels", &Loader::mipmap_levels);
+	add("raw_data", &Loader::raw_data);
 }
 
 void Texture::Loader::finish()
@@ -108,20 +91,22 @@ void Texture::Loader::load_external_image(Graphics::Image &img, const string &fn
 	img.load_io(*io);
 }
 
-void Texture::Loader::external_image(const string &fn)
-{
-	obj.use_srgb_format = false;
-	external_image_common(fn);
-}
-
-void Texture::Loader::external_image_srgb(const string &fn)
+void Texture::Loader::external_data(const string &fn)
 {
-	obj.use_srgb_format = true;
-	external_image_common(fn);
+	if(obj.manager)
+		obj.manager->set_resource_location(obj, get_collection(), fn);
+	else
+	{
+		DataFile::RawData rd;
+		rd.open_file(get_collection(), fn);
+		rd.load();
+		obj.image(0, rd.get_data());
+	}
 }
 
-void Texture::Loader::external_image_common(const string &fn)
+void Texture::Loader::external_image(bool srgb, const string &fn)
 {
+	obj.use_srgb_format = srgb;
 	if(obj.manager)
 		obj.manager->set_resource_location(obj, get_collection(), fn);
 	else
@@ -154,5 +139,13 @@ void Texture::Loader::mipmap_levels(unsigned l)
 	levels = l;
 }
 
+void Texture::Loader::raw_data(const string &data)
+{
+	if(obj.manager)
+		obj.set_manager(0);
+
+	obj.image(0, data.data());
+}
+
 } // namespace GL
 } // namespace Msp