/* $Id$
This file is part of libmspgl
-Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
array(a)
{ }
-VertexArrayBuilder::~VertexArrayBuilder()
-{
- array.update_data();
-}
-
-void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
+void VertexArrayBuilder::vertex_(const Vector4 &v)
{
float *ptr = array.append();
for(const unsigned char *c=array.get_format().begin(); c!=array.get_format().end(); ++c)
{
- unsigned size = (*c&3)+1;
- unsigned type = *c>>2;
- switch(type)
+ unsigned sz = (*c&3)+1;
+ unsigned t = *c>>2;
+ switch(t)
{
case 0:
- *ptr++ = x;
- *ptr++ = y;
- if(size>=3) *ptr++ = z;
- if(size>=4) *ptr++ = w;
+ *ptr++ = v.x;
+ *ptr++ = v.y;
+ if(sz>=3) *ptr++ = v.z;
+ if(sz>=4) *ptr++ = v.w;
break;
case 1:
- *ptr++ = nx;
- *ptr++ = ny;
- *ptr++ = nz;
+ *ptr++ = nor.x;
+ *ptr++ = nor.y;
+ *ptr++ = nor.z;
break;
case 2:
- *ptr++ = ts;
- if(size>=2) *ptr++ = tt;
- if(size>=3) *ptr++ = tr;
- if(size>=4) *ptr++ = tq;
- break;
- case 3:
- if(size==1)
+ if(sz==1)
{
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);
+ 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
{
- *ptr++ = cr;
- *ptr++ = cg;
- *ptr++ = cb;
- if(size>=4) *ptr++ = ca;
+ *ptr++ = col.r;
+ *ptr++ = col.g;
+ *ptr++ = col.b;
+ if(sz>=4) *ptr++ = col.a;
}
break;
default:
- const Attrib &a = av[type-4];
+ const Vector4 &a = (t<11 ? texc[t-3] : attr[t-11]);
*ptr++ = a.x;
- if(size>=2) *ptr++ = a.y;
- if(size>=3) *ptr++ = a.z;
- if(size>=4) *ptr++ = a.w;
+ if(sz>=2) *ptr++ = a.y;
+ if(sz>=3) *ptr++ = a.z;
+ if(sz>=4) *ptr++ = a.w;
break;
}
}