-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include "vertexarray.h"
#include "vertexarraybuilder.h"
array(a)
{ }
-void VertexArrayBuilder::vertex_(const Vector4 &v)
+void VertexArrayBuilder::vertex_(const Vector4 &ver)
{
float *ptr = array.append();
for(const unsigned char *c=array.get_format().begin(); c!=array.get_format().end(); ++c)
{
- unsigned sz = (*c&3)+1;
- unsigned t = *c>>2;
- switch(t)
+ 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)
{
- case 0:
- *ptr++ = v.x;
- *ptr++ = v.y;
- if(sz>=3) *ptr++ = v.z;
- if(sz>=4) *ptr++ = v.w;
- break;
- case 1:
*ptr++ = nor.x;
*ptr++ = nor.y;
*ptr++ = nor.z;
- break;
- case 2:
- if(sz==1)
- {
- 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(t==get_component_type(COLOR4_FLOAT))
+ {
+ *ptr++ = col.r;
+ *ptr++ = col.g;
+ *ptr++ = col.b;
+ if(sz>=4) *ptr++ = col.a;
+ }
+ else
+ {
+ 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++ = col.r;
- *ptr++ = col.g;
- *ptr++ = col.b;
- if(sz>=4) *ptr++ = col.a;
- }
- break;
- default:
- const Vector4 &a = (t<11 ? texc[t-3] : attr[t-11]);
- *ptr++ = a.x;
- if(sz>=2) *ptr++ = a.y;
- if(sz>=3) *ptr++ = a.z;
- if(sz>=4) *ptr++ = a.w;
- 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;
}
}
}