Remove the deprecated ProgramBuilder class

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 8e72d9554c7e39078b2ddebed2e94d5f8434fd59..95a6ec2f3aa526ac11165b4f24e77e5d30d67b10 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,27 +1,32 @@
-/* $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 "bufferable.h"
+#include "datatype.h"
 #include "primitivetype.h"
-#include "types.h"
 #include "vertexarraybuilder.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class VertexBuffer;
+class Buffer;
+
+/**
+Stores vertex data.
 
-class VertexArray
+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
@@ -33,33 +38,37 @@ public:
 private:
        VertexFormat format;
        std::vector<float> data;
-       uint         stride;
-       VertexBuffer *vbuf;
-       bool         own_vbuf;
+       unsigned stride;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
 public:
-       VertexArray(VertexFormat);
-       ~VertexArray();
+       VertexArray(const VertexFormat &);
 
-       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);
-       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; }
+       /// Resets the VertexArray to a different format.  All data is cleared.
+       void reset(const VertexFormat &);
+
+       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_array(unsigned, unsigned, unsigned) const;
+       virtual unsigned get_data_size() const;
+       virtual const void *get_data_pointer() const { return &data[0]; }
 
-       static unsigned enabled_arrays;
+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; }
 };
 
 } // namespace GL