Remove the deprecated ProgramBuilder class

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index af1817b18461893591bc72c001db80c1dd72c0ce..95a6ec2f3aa526ac11165b4f24e77e5d30d67b10 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -5,7 +5,7 @@
 #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"
@@ -16,7 +16,17 @@ namespace GL {
 
 class Buffer;
 
-class VertexArray: public Bindable<VertexArray>
+/**
+Stores vertex data.
+
+The array's contents can be modified with the append and modify methods.  To
+obtain the location of an individual component within the vertex, use
+VertexFormat::offset.
+
+A higher-level interface for filling in vertex data is available in the
+VertexArrayBuilder class.
+*/
+class VertexArray: public Bufferable
 {
 public:
        class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -26,50 +36,39 @@ public:
        };
 
 private:
-       struct Array
-       {
-               unsigned char component;
-               unsigned char offset;
-
-               Array();
-       };
-
        VertexFormat format;
        std::vector<float> data;
        unsigned stride;
-       std::vector<Array> arrays;
-       Buffer *vbuf;
-       mutable bool dirty;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
 public:
        VertexArray(const VertexFormat &);
-       ~VertexArray();
 
+       /// Resets the VertexArray to a different format.  All data is cleared.
        void reset(const VertexFormat &);
-       const VertexFormat &get_format() const { return format; }
-private:
-       static unsigned get_array_slot(unsigned char);
 
-public:
-       void use_vertex_buffer(Buffer *);
+       const VertexFormat &get_format() const { return format; }
 
+       /// Clears all vertices from the array.
        void clear();
+
+       /// Reserve space for vertices.
        void reserve(unsigned);
+
+       /// Append a new vertex at the end of the array and return its location.
        float *append();
+
+       /// Returns the location of a vertex for modification.
        float *modify(unsigned);
 private:
-       void set_dirty();
+       virtual unsigned get_data_size() const;
+       virtual const void *get_data_pointer() const { return &data[0]; }
 
 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; }
-
-       void apply() const;
-private:
-       static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
 };
 
 } // namespace GL