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

diff --git a/source/vertexarraybuilder.cpp b/source/vertexarraybuilder.cpp
index 32fa8392..55b2a6a8 100644
--- a/source/vertexarraybuilder.cpp
+++ b/source/vertexarraybuilder.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "vertexarray.h"
 #include "vertexarraybuilder.h"
 
@@ -12,57 +5,53 @@ namespace Msp {
 namespace GL {
 
 VertexArrayBuilder::VertexArrayBuilder(VertexArray &a):
-	data(a.data),
 	array(a)
 { }
 
-VertexArrayBuilder::~VertexArrayBuilder()
-{
-	array.update_data();
-}
-
-void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
+void VertexArrayBuilder::vertex_(const Vector4 &ver)
 {
-	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 sz = get_component_size(*c);
+		unsigned t = get_component_type(*c);
+		if(*c==COLOR4_UBYTE)
+		{
+			union { unsigned char c[4]; float f; } u;
+			u.c[0] = static_cast<unsigned char>(col.r*255);
+			u.c[1] = static_cast<unsigned char>(col.g*255);
+			u.c[2] = static_cast<unsigned char>(col.b*255);
+			u.c[3] = static_cast<unsigned char>(col.a*255);
+			*ptr++ = u.f;
+		}
+		else if(*c==NORMAL3)
+		{
+			*ptr++ = nor.x;
+			*ptr++ = nor.y;
+			*ptr++ = nor.z;
+		}
+		else if(t==get_component_type(COLOR4_FLOAT))
+		{
+			*ptr++ = col.r;
+			*ptr++ = col.g;
+			*ptr++ = col.b;
+			if(sz>=4) *ptr++ = col.a;
+		}
+		else
 		{
-		case 0:
-			data.push_back(x);
-			data.push_back(y);
-			if(size>=3) data.push_back(z);
-			if(size>=4) data.push_back(w);
-			break;
-		case 4:
-			data.push_back(nx);
-			data.push_back(ny);
-			data.push_back(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);
-			break;
-		case 12:
-			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);
-			}
+			const Vector4 *v = 0;
+			if(t==get_component_type(VERTEX3))
+				v = &ver;
+			else if(*c>=TEXCOORD1 && *c<=TEXCOORD4+12)
+				v = &texc[t-get_component_type(TEXCOORD1)];
+			else if(*c>=ATTRIB1)
+				v = &attr[t-get_component_type(ATTRIB1)];
 			else
-			{
-				data.push_back(cr);
-				data.push_back(cg);
-				data.push_back(cb);
-				if(size>=4) data.push_back(ca);
-			}
-			break;
+				v = &attr[t];
+			*ptr++ = v->x;
+			if(sz>=2) *ptr++ = v->y;
+			if(sz>=3) *ptr++ = v->z;
+			if(sz>=4) *ptr++ = v->w;
 		}
 	}
 }