X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=833ef28f0ebd78add08ccfae4c8555df87dff288;hb=b2c8b2238877f76cdea184cca70336b15ddb78d9;hp=a9961af90a3900660f2e2c71a5a46be8820f6441;hpb=6f8c0c6c088be92804cb413c0234bfb817ef2d8d;p=libs%2Fgl.git

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index a9961af9..833ef28f 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -13,6 +13,16 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+TextureCubeFace TextureCube::face_order[6] =
+{
+	POSITIVE_X,
+	NEGATIVE_X,
+	POSITIVE_Y,
+	NEGATIVE_Y,
+	POSITIVE_Z,
+	NEGATIVE_Z
+};
+
 Vector3 TextureCube::directions[6] =
 {
 	Vector3(1, 0, 0),
@@ -23,6 +33,16 @@ Vector3 TextureCube::directions[6] =
 	Vector3(0, 0, -1)
 };
 
+unsigned TextureCube::orientations[12] =
+{
+	5, 3,
+	4, 3,
+	0, 4,
+	0, 5,
+	0, 3,
+	1, 3
+};
+
 TextureCube::TextureCube():
 	Texture(GL_TEXTURE_CUBE_MAP),
 	ifmt(RGB),
@@ -77,10 +97,10 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	if(s==0)
 		throw out_of_range("TextureCube::image");
 
-	BindRestore _bind(this);
 	if(ARB_texture_storage)
 		return sub_image(face, level, 0, 0, s, s, fmt, type, data);
 
+	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
@@ -98,9 +118,9 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 	if(size==0)
 		throw invalid_operation("TextureCube::sub_image");
 
+	BindRestore _bind(this);
 	allocate(level);
 
-	BindRestore _bind(this);
 	glTexSubImage2D(face, level, x, y, wd, ht, fmt, type, data);
 
 	if(gen_mipmap && level==0)
@@ -166,58 +186,38 @@ unsigned TextureCube::get_level_size(unsigned level) const
 
 TextureCubeFace TextureCube::enumerate_faces(unsigned i)
 {
-	switch(i)
-	{
-	case 0: return POSITIVE_X;
-	case 1: return NEGATIVE_X;
-	case 2: return POSITIVE_Y;
-	case 3: return NEGATIVE_Y;
-	case 4: return POSITIVE_Z;
-	case 5: return NEGATIVE_Z;
-	default: throw out_of_range("TextureCube::enumerate_faces");
-	}
+	if(i>=6)
+		throw out_of_range("TextureCube::enumerate_faces");
+	return face_order[i];
 }
 
-const Vector3 &TextureCube::get_face_direction(TextureCubeFace face)
+unsigned TextureCube::get_face_index(TextureCubeFace face)
 {
 	switch(face)
 	{
-	case POSITIVE_X: return directions[0];
-	case NEGATIVE_X: return directions[1];
-	case POSITIVE_Y: return directions[2];
-	case NEGATIVE_Y: return directions[3];
-	case POSITIVE_Z: return directions[4];
-	case NEGATIVE_Z: return directions[5];
-	default: throw invalid_argument("TextureCube::get_face_direction");
+	case POSITIVE_X: return 0;
+	case NEGATIVE_X: return 1;
+	case POSITIVE_Y: return 2;
+	case NEGATIVE_Y: return 3;
+	case POSITIVE_Z: return 4;
+	case NEGATIVE_Z: return 5;
+	default: throw invalid_argument("TextureCube::get_face_index");
 	}
 }
 
+const Vector3 &TextureCube::get_face_direction(TextureCubeFace face)
+{
+	return directions[get_face_index(face)];
+}
+
 const Vector3 &TextureCube::get_s_direction(TextureCubeFace face)
 {
-	switch(face)
-	{
-	case POSITIVE_X: return directions[5];
-	case NEGATIVE_X: return directions[4];
-	case POSITIVE_Y: return directions[0];
-	case NEGATIVE_Y: return directions[0];
-	case POSITIVE_Z: return directions[0];
-	case NEGATIVE_Z: return directions[1];
-	default: throw invalid_argument("TextureCube::get_s_direction");
-	}
+	return directions[orientations[get_face_index(face)*2]];
 }
 
 const Vector3 &TextureCube::get_t_direction(TextureCubeFace face)
 {
-	switch(face)
-	{
-	case POSITIVE_X: return directions[3];
-	case NEGATIVE_X: return directions[3];
-	case POSITIVE_Y: return directions[4];
-	case NEGATIVE_Y: return directions[5];
-	case POSITIVE_Z: return directions[3];
-	case NEGATIVE_Z: return directions[3];
-	default: throw invalid_argument("TextureCube::get_t_direction");
-	}
+	return directions[orientations[get_face_index(face)*2+1]];
 }
 
 Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsigned v)