Add OffscreenView class

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 1887ad912d52547d89257e48f74af7d10e58db47..6e54f681717f4269fb135f66bd18420b5d87943e 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -6,6 +6,7 @@
 #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 +17,18 @@ namespace GL {
 
 class Buffer;
 
-class VertexArray: public Bindable<VertexArray>
+/**
+Stores vertex data.  Both legacy and generic attributes are supported.  Mixing
+the two is possible but discouraged, as driver-specific issues may arise.
+
+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 Bindable<VertexArray>, public Bufferable
 {
 public:
        class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -38,9 +50,9 @@ private:
        std::vector<float> data;
        unsigned stride;
        std::vector<Array> arrays;
-       RefPtr<Buffer> vbuf;
-       bool defer_vbuf;
-       mutable bool dirty;
+       bool legacy;
+
+       static bool legacy_used;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
@@ -48,28 +60,47 @@ 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();
-       void use_vertex_buffer(Buffer *);
-
+       /// 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;
+       /** Equivalent to apply(true).  For compatibility with the Bindable
+       interface. */
+       void bind() const { apply(); }
+
+       /** Applies component arrays to the GL.  If legacy is true, they are applied
+       as is.  If legacy is false, any legacy attributes are converted to generic
+       attributes. */
+       void apply(bool legacy = true) const;
+
+private:
+       static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned, bool);
+public:
+       static void unbind();
 };
 
 } // namespace GL