Make VertexFormat capable of storing type information

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

diff --git a/source/builders/vertexarraybuilder.cpp b/source/builders/vertexarraybuilder.cpp
index 55b2a6a821b80c001a3ff282ee339a3c69a02eaf..3afe9a40e2bf22c48869207ef9b73235c9dd784b 100644 (file)
--- a/source/builders/vertexarraybuilder.cpp
+++ b/source/builders/vertexarraybuilder.cpp
@@ -1,6 +1,8 @@
 #include "vertexarray.h"
 #include "vertexarraybuilder.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GL {
 
@@ -8,51 +10,51 @@ VertexArrayBuilder::VertexArrayBuilder(VertexArray &a):
        array(a)
 { }
 
-void VertexArrayBuilder::vertex_(const Vector4 &ver)
+void VertexArrayBuilder::vertex_(const Vector4 &vtx)
 {
-       float *ptr = array.append();
-       for(const unsigned char *c=array.get_format().begin(); c!=array.get_format().end(); ++c)
+       char *ptr = array.append();
+       const VertexFormat &format = array.get_format();
+       for(const UInt16 *a=format.begin(); a!=format.end(); ++a)
        {
-               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)
-               {
-                       *ptr++ = nor.x;
-                       *ptr++ = nor.y;
-                       *ptr++ = nor.z;
-               }
-               else if(t==get_component_type(COLOR4_FLOAT))
+               unsigned sem = get_attribute_semantic(*a);
+               DataType type = get_attribute_source_type(*a);
+               unsigned cc = get_attribute_component_count(*a);
+
+               if(sem<attr.size())
                {
-                       *ptr++ = col.r;
-                       *ptr++ = col.g;
-                       *ptr++ = col.b;
-                       if(sz>=4) *ptr++ = col.a;
+                       const Vector4 &value = (sem==0 ? vtx : attr[sem]);
+                       if(type==UNSIGNED_BYTE)
+                               store_attribute<UInt8>(ptr, value, cc);
+                       else if(type==BYTE)
+                               store_attribute<Int8>(ptr, value, cc);
+                       else if(type==UNSIGNED_SHORT)
+                               store_attribute<UInt16>(ptr, value, cc);
+                       else if(type==SHORT)
+                               store_attribute<Int16>(ptr, value, cc);
+                       else if(type==UNSIGNED_INT)
+                               store_attribute<UInt32>(ptr, value, cc);
+                       else if(type==INT)
+                               store_attribute<Int32>(ptr, value, cc);
+                       else if(type==FLOAT)
+                               store_attribute<float>(ptr, value, cc);
                }
+
+               ptr += get_attribute_size(*a);
+       }
+}
+
+template<typename T>
+void VertexArrayBuilder::store_attribute(char *ptr, const Vector4 &value, unsigned count)
+{
+       T *tptr = reinterpret_cast<T *>(ptr);
+       for(unsigned i=0; i<count; ++i)
+       {
+               if(!numeric_limits<T>::is_integer)
+                       *tptr++ = value[i];
+               else if(numeric_limits<T>::is_signed)
+                       *tptr++ = round(min(max(value[i], -1.0f), 1.0f)*numeric_limits<T>::max());
                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
-                               v = &attr[t];
-                       *ptr++ = v->x;
-                       if(sz>=2) *ptr++ = v->y;
-                       if(sz>=3) *ptr++ = v->z;
-                       if(sz>=4) *ptr++ = v->w;
-               }
+                       *tptr++ = round(min(max(value[i], 0.0f), 1.0f)*numeric_limits<T>::max());
        }
 }