Rewrite VertexFormat to support an arbitary amount of components

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

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 3c17141cfb59a592264505c7c67956cc5a9fd355..de343bf7065a07aa573377a6e49be8114dd60356 100644 (file)
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -5,6 +5,7 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include "arb_vertex_program.h"
 #include "extension.h"
 #include "gl.h"
 #include "version_1_2.h"
@@ -16,15 +17,11 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexArray::VertexArray(VertexFormat f):
-       format(NODATA),
-       stride(get_stride(f)),
+VertexArray::VertexArray(const VertexFormat &f):
        vbuf(0),
        own_vbuf(false)
 {
-       // Reverse the format so the first item is in lowest bits.  This makes handling in bind() easier.
-       for(uint fmt=f; fmt; fmt>>=4)
-               format=(format, static_cast<VertexFormat>(fmt&15));
+       reset(f);
 }
 
 VertexArray::~VertexArray()
@@ -64,19 +61,23 @@ void VertexArray::clear()
        data.clear();
 }
 
-void VertexArray::reset(VertexFormat f)
+void VertexArray::reset(const VertexFormat &f)
 {
        clear();
-       format=NODATA;
-       for(uint fmt=f; fmt; fmt>>=4)
-               format=(format, static_cast<VertexFormat>(fmt&15));
+       format=f;
        stride=get_stride(format);
+
+       bool has_gen_attrs=false;
+       for(const unsigned char *c=format.begin(); (!has_gen_attrs && c!=format.end()); ++c)
+               has_gen_attrs=(*c>=ATTRIB1);
+       if(has_gen_attrs)
+               static RequireExtension _ext("GL_ARB_vertex_program");
 }
 
 void VertexArray::apply() const
 {
-       if(format==NODATA)
-               throw InvalidState("Trying to apply a vertex apply of format NODATA");
+       if(format.empty())
+               throw InvalidState("Trying to apply a vertex array with no data");
 
        if(vbuf)
                vbuf->bind();
@@ -85,28 +86,32 @@ void VertexArray::apply() const
        uint offset=0;
        uint found=0;
        uint bpv=stride*sizeof(float);
-       for(uint fmt=format; fmt; fmt>>=4)
+       for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
        {
-               uint sz=(fmt&3)+1;
-               switch(fmt&12)
+               uint sz=(*c&3)+1;
+               uint t=*c>>2;
+               switch(t)
                {
                case 0:
                        glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
                        break;
-               case 4:
+               case 1:
                        glNormalPointer(GL_FLOAT, bpv, base+offset);
                        break;
-               case 8:
+               case 2:
                        glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
                        break;
-               case 12:
+               case 3:
                        if(sz==1)
                                glColorPointer(4, GL_UNSIGNED_BYTE, bpv, base+offset);
                        else
                                glColorPointer(sz, GL_FLOAT, bpv, base+offset);
                        break;
+               default:
+                       glVertexAttribPointerARB(t-3, sz, GL_FLOAT, false, bpv, base+offset);
+                       break;
                }
-               found|=1<<((fmt&12)>>2);
+               found|=1<<t;
                offset+=sz;
        }
 
@@ -114,6 +119,8 @@ void VertexArray::apply() const
        set_array(GL_NORMAL_ARRAY, found&2, 2);
        set_array(GL_TEXTURE_COORD_ARRAY, found&4, 4);
        set_array(GL_COLOR_ARRAY, found&8, 8);
+       for(unsigned i=4; i<32; ++i)
+               set_array(i-3, (found>>i)&1, 1<<i);
 
        if(vbuf)
                VertexBuffer::unbind();
@@ -137,16 +144,22 @@ float *VertexArray::append()
        return &*data.end()-stride;
 }
 
-void VertexArray::set_array(unsigned array, unsigned bit, unsigned mask) const
+void VertexArray::set_array(unsigned array, bool en, unsigned mask) const
 {
-       if((enabled_arrays&mask) && !bit)
+       if((enabled_arrays&mask) && !en)
        {
-               glDisableClientState(array);
+               if(mask<16)
+                       glDisableClientState(array);
+               else
+                       glDisableVertexAttribArrayARB(array);
                enabled_arrays&=~mask;
        }
-       else if(!(enabled_arrays&mask) && bit)
+       else if(!(enabled_arrays&mask) && en)
        {
-               glEnableClientState(array);
+               if(mask<16)
+                       glEnableClientState(array);
+               else
+                       glEnableVertexAttribArrayARB(array);
                enabled_arrays|=mask;
        }
 }
@@ -167,6 +180,10 @@ VertexArray::Loader::Loader(VertexArray &a):
        add("texcoord4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
        add("color3",    static_cast<void (Loader::*)(float, float, float)>(&Loader::color));
        add("color4",    static_cast<void (Loader::*)(float, float, float, float)>(&Loader::color));
+       add("attrib1",   static_cast<void (Loader::*)(unsigned, float)>(&Loader::attrib));
+       add("attrib2",   static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::attrib));
+       add("attrib3",   static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::attrib));
+       add("attrib4",   static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
 }