-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include "vertexarray.h"
#include "vertexarraybuilder.h"
namespace Msp {
namespace GL {
-VertexArrayBuilder::VertexArrayBuilder(VertexArray &a, std::vector<float> &d):
- data(d),
+VertexArrayBuilder::VertexArrayBuilder(VertexArray &a):
array(a)
{ }
-VertexArrayBuilder::~VertexArrayBuilder()
+void VertexArrayBuilder::vertex_(const Vector4 &v)
{
- array.update_data();
-}
-
-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)
+ unsigned sz = (*c&3)+1;
+ unsigned t = *c>>2;
+ switch(t)
{
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);
+ *ptr++ = v.x;
+ *ptr++ = v.y;
+ if(sz>=3) *ptr++ = v.z;
+ if(sz>=4) *ptr++ = v.w;
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 1:
+ *ptr++ = nor.x;
+ *ptr++ = nor.y;
+ *ptr++ = nor.z;
break;
- case 12:
- if(size==1)
+ case 2:
+ if(sz==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);
+ 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
{
- data.push_back(cr);
- data.push_back(cg);
- data.push_back(cb);
- if(size>=4) data.push_back(ca);
+ *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;
}
}
}