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 7bc31b22f9d50e3b11c2a4dbce22c9b4dfb0cfee..3afe9a40e2bf22c48869207ef9b73235c9dd784b 100644 (file)
--- a/source/builders/vertexarraybuilder.cpp
+++ b/source/builders/vertexarraybuilder.cpp
@@ -1,6 +1,8 @@
 #include "vertexarray.h"
 #include "vertexarraybuilder.h"
 
 #include "vertexarray.h"
 #include "vertexarraybuilder.h"
 

+using namespace std;
+

 namespace Msp {
 namespace GL {
 
 namespace Msp {
 namespace GL {
 


@@ -10,31 +12,49 @@ VertexArrayBuilder::VertexArrayBuilder(VertexArray &a):
 
 void VertexArrayBuilder::vertex_(const Vector4 &vtx)
 {
 
 void VertexArrayBuilder::vertex_(const Vector4 &vtx)
 {

-       float *ptr = array.append();
+       char *ptr = array.append();

        const VertexFormat &format = array.get_format();
        const VertexFormat &format = array.get_format();

-       for(const unsigned char *a=format.begin(); a!=format.end(); ++a)
+       for(const UInt16 *a=format.begin(); a!=format.end(); ++a)

        {
                unsigned sem = get_attribute_semantic(*a);
        {
                unsigned sem = get_attribute_semantic(*a);

-               unsigned sz = get_attribute_size(*a);
-               if(sem>=attr.size())
-                       ptr += sz;
-               else if(*a==COLOR4_UBYTE)
+               DataType type = get_attribute_source_type(*a);
+               unsigned cc = get_attribute_component_count(*a);
+
+               if(sem<attr.size())

                {
                {

-                       union { unsigned char c[4]; float f; } u;
-                       u.c[0] = static_cast<unsigned char>(attr[sem].x*255);
-                       u.c[1] = static_cast<unsigned char>(attr[sem].y*255);
-                       u.c[2] = static_cast<unsigned char>(attr[sem].z*255);
-                       u.c[3] = static_cast<unsigned char>(attr[sem].w*255);
-                       *ptr++ = u.f;
+                       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
                else

-               {
-                       const Vector4 &v = (sem==0 ? vtx : attr[sem]);
-                       *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());

        }
 }
 
        }
 }