X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fvertexarraybuilder.cpp;h=70d1ee58a1145252e97cec8307e32eb970b9d12c;hb=7e9e15a12fb398798f2719545cc8553354c1e389;hp=c64c8ebfc882fca127b9771b2d1818af9ddeabaa;hpb=16f6f15328b3a6eec87b1b5e5822368966d44a38;p=libs%2Fgl.git

diff --git a/source/vertexarraybuilder.cpp b/source/vertexarraybuilder.cpp
index c64c8ebf..70d1ee58 100644
--- a/source/vertexarraybuilder.cpp
+++ b/source/vertexarraybuilder.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -22,47 +22,55 @@ VertexArrayBuilder::~VertexArrayBuilder()
 
 void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
 {
-	float *ptr=array.append();
-	for(uint fmt=array.get_format(); fmt; fmt>>=4)
+	float *ptr = array.append();
+	for(const unsigned char *c=array.get_format().begin(); c!=array.get_format().end(); ++c)
 	{
-		uint size=(fmt&3)+1;
-		switch(fmt&12)
+		unsigned size = (*c&3)+1;
+		unsigned type = *c>>2;
+		switch(type)
 		{
 		case 0:
-			*ptr++=x;
-			*ptr++=y;
-			if(size>=3) *ptr++=z;
-			if(size>=4) *ptr++=w;
+			*ptr++ = x;
+			*ptr++ = y;
+			if(size>=3) *ptr++ = z;
+			if(size>=4) *ptr++ = w;
 			break;
-		case 4:
-			*+ptr++=nx;
-			*+ptr++=ny;
-			*+ptr++=nz;
+		case 1:
+			*ptr++ = nx;
+			*ptr++ = ny;
+			*ptr++ = nz;
 			break;
-		case 8:
-			*+ptr++=ts;
-			if(size>=2) *+ptr++=tt;
-			if(size>=3) *+ptr++=tr;
-			if(size>=4) *+ptr++=tq;
+		case 2:
+			*ptr++ = ts;
+			if(size>=2) *ptr++ = tt;
+			if(size>=3) *ptr++ = tr;
+			if(size>=4) *ptr++ = tq;
 			break;
-		case 12:
+		case 3:
 			if(size==1)
 			{
-				union { ubyte c[4]; float f; } u;
-				u.c[0]=(ubyte)(cr*255);
-				u.c[1]=(ubyte)(cg*255);
-				u.c[2]=(ubyte)(cb*255);
-				u.c[3]=(ubyte)(ca*255);
-				*+ptr++=u.f;
+				union { unsigned char c[4]; float f; } u;
+				u.c[0] = static_cast<unsigned char>(cr*255);
+				u.c[1] = static_cast<unsigned char>(cg*255);
+				u.c[2] = static_cast<unsigned char>(cb*255);
+				u.c[3] = static_cast<unsigned char>(ca*255);
+				*ptr++ = u.f;
 			}
 			else
 			{
-				*+ptr++=cr;
-				*+ptr++=cg;
-				*+ptr++=cb;
-				if(size>=4) *+ptr++=ca;
+				*ptr++ = cr;
+				*ptr++ = cg;
+				*ptr++ = cb;
+				if(size>=4) *ptr++ = ca;
 			}
 			break;
+		default:
+			const Attrib &a = av[type-4];
+			*ptr++ = a.x;
+			if(size>=2) *ptr++ = a.y;
+			if(size>=3) *ptr++ = a.z;
+			if(size>=4) *ptr++ = a.w;
+			break;
 		}
 	}
 }