Refactor the internal interface of Bufferable a bit

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 7fcbb8bdba7ba50e84cbb8d674e987adbdbc354f..0223a1f4434df584cc16dd59a0a659f23d2f1409 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,16 +1,12 @@
-/* $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>
+#include "bindable.h"
+#include "bufferable.h"
 #include "datatype.h"
 #include "primitivetype.h"
 #include "vertexarraybuilder.h"
@@ -21,7 +17,7 @@ namespace GL {
 
 class Buffer;
 
-class VertexArray
+class VertexArray: public Bindable<VertexArray>, public Bufferable
 {
 public:
        class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -31,11 +27,18 @@ public:
        };
 
 private:
+       struct Array
+       {
+               unsigned char component;
+               unsigned char offset;
+
+               Array();
+       };
+
        VertexFormat format;
        std::vector<float> data;
        unsigned stride;
-       Buffer *vbuf;
-       bool own_vbuf;
+       std::vector<Array> arrays;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
@@ -43,41 +46,32 @@ 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; }
-       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         update_data();
-       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;
-};
-
-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 *);
+       static unsigned get_array_slot(unsigned char);
 
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
-{ draw_elements(mode, count, UNSIGNED_INT, indices); }
+public:
+       /// Deprecated alias for use_buffer
+       void use_vertex_buffer(Buffer *b) { use_buffer(b); }
 
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
-{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
+       void clear();
+       void reserve(unsigned);
+       float *append();
+       float *modify(unsigned);
+private:
+       virtual unsigned get_data_size() const;
+       virtual const void *get_data_pointer() const { return &data[0]; }
 
-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;
+private:
+       static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
+};
 
 } // namespace GL
 } // namespace Msp