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

diff --git a/source/vertexarraybuilder.cpp b/source/vertexarraybuilder.cpp
index 32fa8392..8e7e2cb5 100644
--- a/source/vertexarraybuilder.cpp
+++ b/source/vertexarraybuilder.cpp
@@ -12,7 +12,6 @@ namespace Msp {
 namespace GL {
 
 VertexArrayBuilder::VertexArrayBuilder(VertexArray &a):
-	data(a.data),
 	array(a)
 { }
 
@@ -23,46 +22,54 @@ VertexArrayBuilder::~VertexArrayBuilder()
 
 void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
 {
-	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)
+		uint size=(*c&3)+1;
+		switch(*c>>2)
 		{
 		case 0:
-			data.push_back(x);
-			data.push_back(y);
-			if(size>=3) data.push_back(z);
-			if(size>=4) data.push_back(w);
+			*ptr++=x;
+			*ptr++=y;
+			if(size>=3) *ptr++=z;
+			if(size>=4) *ptr++=w;
 			break;
-		case 4:
-			data.push_back(nx);
-			data.push_back(ny);
-			data.push_back(nz);
+		case 1:
+			*ptr++=nx;
+			*ptr++=ny;
+			*ptr++=nz;
 			break;
-		case 8:
-			data.push_back(ts);
-			if(size>=2) data.push_back(tt);
-			if(size>=3) data.push_back(tr);
-			if(size>=4) data.push_back(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);
-				data.push_back(u.f);
+				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;
 			}
 			else
 			{
-				data.push_back(cr);
-				data.push_back(cg);
-				data.push_back(cb);
-				if(size>=4) data.push_back(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;
+			break;
 		}
 	}
 }