X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=24d02f4022b2aeac380410ea481a2e392181f8af;hb=6a7510a74193ad442bfe82d8377606c3cb66e6b2;hp=ddb0c1e05189113257d55d94656e1c4391fa3fa9;hpb=2157e9320c60d561208dfdf6034e9a06781c9f30;p=libs%2Fgl.git

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index ddb0c1e0..24d02f40 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,6 +1,9 @@
+#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 "extension.h"
+#include "pixelstore.h"
 #include "texturecube.h"
 
 using namespace std;
@@ -20,10 +23,11 @@ Vector3 TextureCube::directions[6] =
 
 TextureCube::TextureCube():
 	Texture(GL_TEXTURE_CUBE_MAP),
+	ifmt(RGB),
 	size(0),
 	allocated(0)
 {
-	static RequireVersion _ver(1, 3);
+	static Require _req(ARB_texture_cube_map);
 }
 
 void TextureCube::storage(PixelFormat fmt, unsigned sz)
@@ -32,6 +36,7 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz)
 		throw invalid_operation("TextureCube::storage");
 	if(sz==0)
 		throw invalid_argument("TextureCube::storage");
+	require_pixelformat(fmt);
 
 	ifmt = fmt;
 	size = sz;
@@ -42,8 +47,10 @@ void TextureCube::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	DataType type = get_alloc_type(base_fmt);
 	for(unsigned i=0; i<6; ++i)
-		image(enumerate_faces(i), level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+		image(enumerate_faces(i), level, base_fmt, type, 0);
 }
 
 void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -53,20 +60,46 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 
 	unsigned s = get_level_size(level);
 	if(s==0)
-		throw invalid_argument("TextureCube::image");
+		throw out_of_range("TextureCube::image");
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
 
 	// XXX Allocation should be tracked per-face, but we'll run out of bits
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
+		// TODO Only do this once all faces are created
+		auto_generate_mipmap();
 		for(; s; s>>=1, ++level) ;
 		allocated |= (1<<level)-1;
 	}
 }
 
+void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
+{
+	unsigned w = img.get_width();
+	unsigned h = img.get_height();
+	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	if(size==0)
+	{
+		if(w!=h)
+			throw incompatible_data("TextureCube::image");
+
+		PixelFormat f = storage_pixelformat_from_graphics(img.get_format());
+		if(srgb)
+			f = get_srgb_pixelformat(f);
+		storage(f, w);
+	}
+	else if(w!=size || h!=size)
+		throw incompatible_data("TextureCube::image");
+
+	PixelStore pstore = PixelStore::from_image(img);
+	BindRestore _bind_ps(pstore);
+
+	image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
+}
+
 unsigned TextureCube::get_level_size(unsigned level)
 {
 	return size>>level;
@@ -135,7 +168,73 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
 	const Vector3 &fv = get_face_direction(face);
 	const Vector3 &sv = get_s_direction(face);
 	const Vector3 &tv = get_t_direction(face);
-	return Vector3(fv.x+s*sv.x, fv.y+t*tv.y, fv.z+s*sv.z+t*tv.z);
+	return fv+s*sv+t*tv;
+}
+
+UInt64 TextureCube::get_data_size() const
+{
+	return id ? size*size*6*get_pixel_size(ifmt) : 0;
+}
+
+
+TextureCube::Loader::Loader(TextureCube &t):
+	DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t)
+{
+	init();
+}
+
+TextureCube::Loader::Loader(TextureCube &t, Collection &c):
+	DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t, c)
+{
+	init();
+}
+
+void TextureCube::Loader::init()
+{
+	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, srgb);
+}
+
+void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
+{
+	obj.image(face, 0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+}
+
+void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)
+{
+	if(srgb)
+		fmt = get_srgb_pixelformat(fmt);
+	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