X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarraybuilder.cpp;h=87b290152b6eae6d047512c088c85cfe765b7d5b;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=8e7e2cb5dd4433625747545cea073fee6715e89c;hpb=b8fef9be469eb16e54068bac7e275ea225efc71c;p=libs%2Fgl.git

diff --git a/source/vertexarraybuilder.cpp b/source/vertexarraybuilder.cpp
index 8e7e2cb5..87b29015 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,53 +22,54 @@ VertexArrayBuilder::~VertexArrayBuilder()
 
 void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
 {
-	float *ptr=array.append();
+	float *ptr = array.append();
 	for(const unsigned char *c=array.get_format().begin(); c!=array.get_format().end(); ++c)
 	{
-		uint size=(*c&3)+1;
-		switch(*c>>2)
+		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 1:
-			*ptr++=nx;
-			*ptr++=ny;
-			*ptr++=nz;
+			*ptr+ += nx;
+			*ptr+ += ny;
+			*ptr+ += nz;
 			break;
 		case 2:
-			*ptr++=ts;
-			if(size>=2) *ptr++=tt;
-			if(size>=3) *ptr++=tr;
-			if(size>=4) *ptr++=tq;
+			*ptr+ += ts;
+			if(size>=2) *ptr+ += tt;
+			if(size>=3) *ptr+ += tr;
+			if(size>=4) *ptr+ += tq;
 			break;
 		case 3:
 			if(size==1)
 			{
-				union { ubyte c[4]; float f; } u;
-				u.c[0]=static_cast<ubyte>(cr*255);
-				u.c[1]=static_cast<ubyte>(cg*255);
-				u.c[2]=static_cast<ubyte>(cb*255);
-				u.c[3]=static_cast<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[(*c>>2)-4];
-			*ptr++=a.x;
-			if(size>=2) *ptr++=a.y;
-			if(size>=3) *ptr++=a.z;
-			if(size>=4) *ptr++=a.w;
+			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;
 		}
 	}