Rewrite VertexFormat to support an arbitary amount of components

[libs/gl.git] / source / vertexarraybuilder.cpp

diff --git a/source/vertexarraybuilder.cpp b/source/vertexarraybuilder.cpp
index f251632e9dfcaffce572aef546d056ee33d2b661..8e7e2cb5dd4433625747545cea073fee6715e89c 100644 (file)
--- a/source/vertexarraybuilder.cpp
+++ b/source/vertexarraybuilder.cpp
@@ -23,10 +23,10 @@ VertexArrayBuilder::~VertexArrayBuilder()
 void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
 {
        float *ptr=array.append();
-       for(uint fmt=array.get_format(); fmt; fmt>>=4)
+       for(const unsigned char *c=array.get_format().begin(); c!=array.get_format().end(); ++c)
        {
-               uint size=(fmt&3)+1;
-               switch(fmt&12)
+               uint size=(*c&3)+1;
+               switch(*c>>2)
                {
                case 0:
                        *ptr++=x;
@@ -34,18 +34,18 @@ void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
                        if(size>=3) *ptr++=z;
                        if(size>=4) *ptr++=w;
                        break;
-               case 4:
-                       *+ptr++=nx;
-                       *+ptr++=ny;
-                       *+ptr++=nz;
+               case 1:
+                       *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;
+               case 2:
+                       *ptr++=ts;
+                       if(size>=2) *ptr++=tt;
+                       if(size>=3) *ptr++=tr;
+                       if(size>=4) *ptr++=tq;
                        break;
-               case 12:
+               case 3:
                        if(size==1)
                        {
                                union { ubyte c[4]; float f; } u;
@@ -53,16 +53,23 @@ void VertexArrayBuilder::vertex_(float x, float y, float z, float w)
                                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;
+                               *ptr++=u.f;
                        }
                        else
                        {
-                               *+ptr++=cr;
-                               *+ptr++=cg;
-                               *+ptr++=cb;
+                               *ptr++=cr;
+                               *ptr++=cg;
+                               *ptr++=cb;
                                if(size>=4) *+ptr++=ca;
                        }
                        break;
+               default:
+                       const Attrib &a=av[(*c>>2)-4];
+                       *ptr++=a.x;
+                       if(size>=2) *ptr++=a.y;
+                       if(size>=3) *ptr++=a.z;
+                       if(size>=4) *ptr++=a.w;
+                       break;
                }
        }
 }