X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.h;h=95a6ec2f3aa526ac11165b4f24e77e5d30d67b10;hp=02fa64f70b0f0cfdfe5c9fa0c893433fa59818f1;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=dc1d1159a61f378bda11e5989ad694a86b9a3c77

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 02fa64f7..95a6ec2f 100644
--- 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,51 +38,38 @@ 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; }
-private:
-	void set_array(unsigned, unsigned, unsigned) const;
+	/// Resets the VertexArray to a different format.  All data is cleared.
+	void reset(const VertexFormat &);
 
-	static unsigned enabled_arrays;
-};
+	const VertexFormat &get_format() const { return format; }
 
-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 *);
+	/// Clears all vertices from the array.
+	void clear();
 
-inline void draw_elements(PrimitiveType mode, sizei count, const unsigned *indices)
-{ draw_elements(mode, count, UNSIGNED_INT, indices); }
+	/// Reserve space for vertices.
+	void reserve(unsigned);
 
-inline void draw_elements(PrimitiveType mode, sizei 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, uint low, uint high, sizei 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, uint low, uint high, sizei 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