Lots of comment updates

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 7fcbb8bdba7ba50e84cbb8d674e987adbdbc354f..039dfa8b13ea3ed467dcdf3825b0ddaa64b825cf 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,13 +1,7 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  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,11 +25,30 @@ 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;
-       Buffer *vbuf;
-       bool own_vbuf;
+       RefPtr<Buffer> vbuf;
+       bool defer_vbuf;
+       mutable bool dirty;
+
+       static ArrayMask enabled_arrays;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
@@ -52,14 +65,12 @@ public:
        void         clear();
        void         reset(const VertexFormat &);
        void         apply() const;
-       void         update_data();
        float        *append();
-       float        *operator[](unsigned i) { return &data[0]+i*stride; }
+       float *modify(unsigned);
        const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
-private:
-       void set_array(unsigned, bool, unsigned) const;
 
-       static unsigned enabled_arrays;
+private:
+       void set_dirty();
 };
 
 void array_element(int);