Support multiple sets of texture coordinates in VertexArrays

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 7fcbb8bdba7ba50e84cbb8d674e987adbdbc354f..c7609afe6ae419445e777e032975fdcb61f8a3ad 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,13 +1,14 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef MSP_GL_VERTEXARRAY_H_
 #define MSP_GL_VERTEXARRAY_H_
 
+#include <climits>
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
@@ -31,6 +32,22 @@ public:
        };
 
 private:
+       struct ArrayMask
+       {
+               enum
+               {
+                       B = (sizeof(unsigned)*CHAR_BIT),
+                       N = (63+B)/B
+               };
+
+               unsigned mask[N];
+
+               ArrayMask();
+
+               void set(unsigned);
+               bool is_set(unsigned) const;
+       };
+
        VertexFormat format;
        std::vector<float> data;
        unsigned stride;
@@ -56,10 +73,9 @@ public:
        float        *append();
        float        *operator[](unsigned i) { return &data[0]+i*stride; }
        const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
-private:
-       void set_array(unsigned, bool, unsigned) const;
 
-       static unsigned enabled_arrays;
+private:
+       static ArrayMask enabled_arrays;
 };
 
 void array_element(int);