-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include "vertexarray.h"
#include "vertexarraybuilder.h"
array(a)
{ }
-VertexArrayBuilder::~VertexArrayBuilder()
-{
- array.update_data();
-}
-
-void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
+void VertexArrayBuilder::vertex_(const Vector4 &ver)
{
- 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 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:
- *ptr++=x;
- *ptr++=y;
- if(size>=3) *ptr++=z;
- if(size>=4) *ptr++=w;
- break;
- case 4:
- *+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;
- break;
- case 12:
- 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;
- }
+ 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
- {
- *+ptr++=cr;
- *+ptr++=cg;
- *+ptr++=cb;
- if(size>=4) *+ptr++=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;
}
}
}