From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 21 Sep 2013 17:06:54 +0000 (+0300)
Subject: Make cube map textures loadable from datafiles
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=804ad5d99c575b92e9d47421947e963a44f7a905

Make cube map textures loadable from datafiles
---

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 1b2193b3..eb7448c3 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,4 +1,6 @@
 #include <msp/gl/extensions/arb_texture_cube_map.h>
+#include <msp/io/memory.h>
+#include <msp/strings/format.h>
 #include "bindable.h"
 #include "error.h"
 #include "texturecube.h"
@@ -68,6 +70,24 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	}
 }
 
+void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
+{
+	unsigned w = img.get_width();
+	unsigned h = img.get_height();
+	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	if(size==0)
+	{
+		if(w==h)
+			storage(fmt, w);
+		else
+			throw incompatible_data("TextureCube::image");
+	}
+	else if(w!=size || h!=size)
+		throw incompatible_data("TextureCube::image");
+
+	image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
+}
+
 unsigned TextureCube::get_level_size(unsigned level)
 {
 	return size>>level;
@@ -139,5 +159,53 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
 	return fv+s*sv+t*tv;
 }
 
+
+TextureCube::Loader::Loader(TextureCube &t):
+	DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t)
+{
+	add("image_data", &Loader::image_data);
+	add("raw_data", &Loader::raw_data);
+	add("storage", &Loader::storage);
+}
+
+void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
+{
+	Graphics::Image img;
+	IO::Memory mem(data.data(), data.size());
+	img.load_io(mem);
+
+	obj.image(face, img);
+}
+
+void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
+{
+	obj.image(face, 0, obj.ifmt, UNSIGNED_BYTE, data.data());
+}
+
+void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)
+{
+	obj.storage(fmt, s);
+}
+
+
+void operator>>(const LexicalConverter &conv, TextureCubeFace &face)
+{
+	const string &str = conv.get();
+	if(str=="POSITIVE_X")
+		face = POSITIVE_X;
+	else if(str=="NEGATIVE_X")
+		face = NEGATIVE_X;
+	else if(str=="POSITIVE_Y")
+		face = POSITIVE_Y;
+	else if(str=="NEGATIVE_Y")
+		face = NEGATIVE_Y;
+	else if(str=="POSITIVE_Z")
+		face = POSITIVE_Z;
+	else if(str=="NEGATIVE_Z")
+		face = NEGATIVE_Z;
+	else
+		throw lexical_error(format("conversion of '%s' to TextureCubeFace", str));
+}
+
 } // namespace GL
 } // namespace Msp
diff --git a/source/texturecube.h b/source/texturecube.h
index 0d23884f..8d87c410 100644
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_TEXTURECUBE_H_
 #define MSP_GL_TEXTURECUBE_H_
 
+#include <msp/graphics/image.h>
 #include "datatype.h"
 #include "pixelformat.h"
 #include "texture.h"
@@ -33,6 +34,17 @@ Requires OpenGL version 1.3.
 */
 class TextureCube: public Texture
 {
+public:
+	class Loader: public Msp::DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>
+	{
+	public:
+		Loader(TextureCube &);
+	private:
+		void image_data(TextureCubeFace, const std::string &);
+		void raw_data(TextureCubeFace, const std::string &);
+		void storage(PixelFormat, unsigned);
+	};
+
 private:
 	PixelFormat ifmt;
 	unsigned size;
@@ -64,6 +76,8 @@ public:
 		int x, int y, unsigned w, unsigned h,
 		PixelFormat fmt, DataType type, const void *data);
 
+	void image(TextureCubeFace, const Graphics::Image &);
+
 	unsigned get_size() const { return size; }
 private:
 	unsigned get_level_size(unsigned);
@@ -86,6 +100,8 @@ public:
 	Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
 };
 
+void operator>>(const LexicalConverter &, TextureCubeFace &);
+
 } // namespace GL
 } // namespace Msp