Fix vertex array offsets

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 7e6d04f5a05aab16c15d6dfb980748f93235cef0..1887ad912d52547d89257e48f74af7d10e58db47 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
+#include "bindable.h"
 #include "datatype.h"
 #include "primitivetype.h"
 #include "vertexarraybuilder.h"
@@ -15,7 +16,7 @@ namespace GL {
 
 class Buffer;
 
-class VertexArray
+class VertexArray: public Bindable<VertexArray>
 {
 public:
        class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -25,70 +26,51 @@ public:
        };
 
 private:
-       struct ArrayMask
+       struct Array
        {
-               enum
-               {
-                       B = (sizeof(unsigned)*CHAR_BIT),
-                       N = (63+B)/B
-               };
+               unsigned char component;
+               unsigned char offset;
 
-               unsigned mask[N];
-
-               ArrayMask();
-
-               void set(unsigned);
-               bool is_set(unsigned) const;
+               Array();
        };
 
        VertexFormat format;
        std::vector<float> data;
        unsigned stride;
+       std::vector<Array> arrays;
        RefPtr<Buffer> vbuf;
        bool defer_vbuf;
        mutable bool dirty;
 
-       static ArrayMask enabled_arrays;
-
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
 public:
        VertexArray(const VertexFormat &);
        ~VertexArray();
 
+       void reset(const VertexFormat &);
        const VertexFormat &get_format() const { return format; }
-       const std::vector<float> &get_data() const { return data; }
+private:
+       static unsigned get_array_slot(unsigned char);
+
+public:
        void use_vertex_buffer();
        void use_vertex_buffer(Buffer *);
-       void reserve(unsigned);
-       unsigned size() const { return data.size()/stride; }
+
        void clear();
-       void reset(const VertexFormat &);
-       void apply() const;
+       void reserve(unsigned);
        float *append();
        float *modify(unsigned);
-       const float *operator[](unsigned i) const { return &data[0]+i*stride; }
-
 private:
        void set_dirty();
-};
-
-void array_element(int);
-void draw_arrays(PrimitiveType, int, unsigned);
-void draw_elements(PrimitiveType, unsigned, DataType, const void *);
-void draw_range_elements(PrimitiveType, unsigned, unsigned, unsigned, DataType, const void *);
-
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
-{ draw_elements(mode, count, UNSIGNED_INT, indices); }
-
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
-{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
 
-inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned short *indices)
-{ draw_range_elements(mode, low, high, count, UNSIGNED_SHORT, indices); }
+public:
+       unsigned size() const { return data.size()/stride; }
+       const std::vector<float> &get_data() const { return data; }
+       const float *operator[](unsigned i) const { return &data[0]+i*stride; }
 
-inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned *indices)
-{ draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); }
+       void apply() const;
+};
 
 } // namespace GL
 } // namespace Msp