Inherit Loaders from the ObjectLoader classes

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 9610905d218994fcb2e539a6fe06d1a4e3934a41..281996d457da92894c6a4eb58111564c81c0ef43 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -11,6 +11,7 @@ Distributed under the LGPL
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
+#include "primitivetype.h"
 #include "types.h"
 #include "vertexarraybuilder.h"
 #include "vertexformat.h"
@@ -18,7 +19,7 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
-class VertexBuffer;
+class Buffer;
 
 class VertexArray
 {
@@ -29,32 +30,55 @@ public:
                Loader(VertexArray &);
        };
 
-       VertexArray(VertexFormat);
-       ~VertexArray();
-
-       VertexFormat get_format() const { return format; }
-       const std::vector<float> &get_data() const { return data; }
-       void         use_vertex_buffer();
-       void         use_vertex_buffer(VertexBuffer *);
-       void         clear();
-       void         reset(VertexFormat);
-       RefPtr<VertexArrayBuilder> modify();
-       void         apply() const;
-       void         update_data();
 private:
        VertexFormat format;
        std::vector<float> data;
        uint         stride;
-       VertexBuffer *vbuf;
+       Buffer       *vbuf;
        bool         own_vbuf;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
-       void set_array(unsigned, unsigned, unsigned) const;
+public:
+       VertexArray(const VertexFormat &);
+       ~VertexArray();
+
+       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, sizei);
+void draw_elements(PrimitiveType, sizei, DataType, const void *);
+void draw_range_elements(PrimitiveType, uint, uint, sizei, DataType, const void *);
+
+inline void draw_elements(PrimitiveType mode, sizei count, const unsigned *indices)
+{ draw_elements(mode, count, UNSIGNED_INT, indices); }
+
+inline void draw_elements(PrimitiveType mode, sizei count, const unsigned short *indices)
+{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
+
+inline void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, const unsigned short *indices)
+{ draw_range_elements(mode, low, high, count, UNSIGNED_SHORT, indices); }
+
+inline void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, const unsigned *indices)
+{ draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); }
+
 } // namespace GL
 } // namespace Msp