Drop Id tags and copyright notices from files

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

diff --git a/source/vertexarraybuilder.cpp b/source/vertexarraybuilder.cpp
index c64c8ebfc882fca127b9771b2d1818af9ddeabaa..9b8d3b4284ce383df67c6131bb2f164d7efe53ee 100644 (file)
--- a/source/vertexarraybuilder.cpp
+++ b/source/vertexarraybuilder.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "vertexarray.h"
 #include "vertexarraybuilder.h"
 
@@ -15,54 +8,51 @@ 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)
-{
-       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 = (*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;
-                       break;
-               case 4:
-                       *+ptr++=nx;
-                       *+ptr++=ny;
-                       *+ptr++=nz;
+                       *ptr++ = v.x;
+                       *ptr++ = v.y;
+                       if(sz>=3) *ptr++ = v.z;
+                       if(sz>=4) *ptr++ = v.w;
                        break;
-               case 8:
-                       *+ptr++=ts;
-                       if(size>=2) *+ptr++=tt;
-                       if(size>=3) *+ptr++=tr;
-                       if(size>=4) *+ptr++=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);
-                               *+ptr++=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
                        {
-                               *+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 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;
                }
        }
 }