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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 9fa55b71..95a6ec2f 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -5,7 +5,6 @@
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
-#include "bindable.h"
 #include "bufferable.h"
 #include "datatype.h"
 #include "primitivetype.h"
@@ -17,7 +16,17 @@ namespace GL {
 
 class Buffer;
 
-class VertexArray: public Bindable<VertexArray>, public Bufferable
+/**
+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
@@ -27,37 +36,30 @@ public:
 	};
 
 private:
-	struct Array
-	{
-		unsigned char component;
-		unsigned char offset;
-
-		Array();
-	};
-
 	VertexFormat format;
 	std::vector<float> data;
 	unsigned stride;
-	std::vector<Array> arrays;
 
 	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:
-	/// Deprecated alias for use_buffer
-	void use_vertex_buffer(Buffer *b) { use_buffer(b); }
+	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:
 	virtual unsigned get_data_size() const;
@@ -67,13 +69,6 @@ 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 bind() const;
-	void apply() const { bind(); }
-private:
-	static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
-public:
-	static void unbind();
 };
 
 } // namespace GL