Rewrite VertexFormat to support an arbitary amount of components

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index f0baf2d4a84fa8896b21c351149d9cd28612ee04..ef7f6a24c23482292d38db863c56353159afed9e 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -23,8 +23,6 @@ class VertexBuffer;
 
 class VertexArray
 {
-       friend class VertexArrayBuilder;
-
 public:
        class Loader: public DataFile::Loader, public VertexArrayBuilder
        {
@@ -42,26 +40,45 @@ private:
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
 public:
-       VertexArray(VertexFormat);
+       VertexArray(const VertexFormat &);
        ~VertexArray();
 
-       VertexFormat get_format() const { return format; }
+       const 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         reserve(unsigned);
        unsigned     size() const { return data.size()/stride; }
        void         clear();
-       void         reset(VertexFormat);
-       RefPtr<VertexArrayBuilder> modify();
+       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, unsigned, unsigned) const;
+       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