Remove the deprecated ProgramBuilder class

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 079c2234cc5a598ac5abdb21925aa55c00ca8123..95a6ec2f3aa526ac11165b4f24e77e5d30d67b10 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_VERTEXARRAY_H_
 #define MSP_GL_VERTEXARRAY_H_
 
@@ -12,6 +5,7 @@ Distributed under the LGPL
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
+#include "bufferable.h"
 #include "datatype.h"
 #include "primitivetype.h"
 #include "vertexarraybuilder.h"
@@ -22,7 +16,17 @@ namespace GL {
 
 class Buffer;
 
-class 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
@@ -32,71 +36,40 @@ public:
        };
 
 private:
-       struct ArrayMask
-       {
-               enum
-               {
-                       B = (sizeof(unsigned)*CHAR_BIT),
-                       N = (63+B)/B
-               };
-
-               unsigned mask[N];
-
-               ArrayMask();
-
-               void set(unsigned);
-               bool is_set(unsigned) const;
-       };
-
        VertexFormat format;
        std::vector<float> data;
        unsigned stride;
-       RefPtr<Buffer> vbuf;
-       bool defer_vbuf;
-       mutable bool dirty;
-
-       static ArrayMask enabled_arrays;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
 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;
-       float        *append();
-       float *modify(unsigned);
-       float *operator[](unsigned i) { return modify(i); }
-       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 &);
 
-private:
-       void set_dirty();
-};
+       const VertexFormat &get_format() const { return format; }
 
-void array_element(int);
-void draw_arrays(PrimitiveType, int, unsigned);
-void draw_elements(PrimitiveType, unsigned, DataType, const void *);
-void draw_range_elements(PrimitiveType, unsigned, unsigned, unsigned, DataType, const void *);
+       /// Clears all vertices from the array.
+       void clear();
 
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
-{ draw_elements(mode, count, UNSIGNED_INT, indices); }
+       /// Reserve space for vertices.
+       void reserve(unsigned);
 
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
-{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
+       /// Append a new vertex at the end of the array and return its location.
+       float *append();
 
-inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned short *indices)
-{ draw_range_elements(mode, low, high, count, UNSIGNED_SHORT, indices); }
+       /// Returns the location of a vertex for modification.
+       float *modify(unsigned);
+private:
+       virtual unsigned get_data_size() const;
+       virtual const void *get_data_pointer() const { return &data[0]; }
 
-inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned *indices)
-{ draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); }
+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
 } // namespace Msp