X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.h;h=6e54f681717f4269fb135f66bd18420b5d87943e;hp=d8484d83ca882ebb1c5e0d215aee57a930270dbf;hb=639238c53510fb9483e92fb1b808d33fce992bff;hpb=b392a49f4079cd3db859f9eaa51f651115a09c1d

diff --git a/source/vertexarray.h b/source/vertexarray.h
index d8484d83..6e54f681 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -5,6 +5,8 @@
 #include <vector>
 #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"
@@ -15,7 +17,18 @@ namespace GL {
 
 class Buffer;
 
-class 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
@@ -25,30 +38,21 @@ public:
 	};
 
 private:
-	struct ArrayMask
+	struct Array
 	{
-		enum
-		{
-			B = (sizeof(unsigned)*CHAR_BIT),
-			N = (63+B)/B
-		};
-
-		unsigned mask[N];
-
-		ArrayMask();
+		unsigned char component;
+		unsigned char offset;
 
-		void set(unsigned);
-		bool is_set(unsigned) const;
+		Array();
 	};
 
 	VertexFormat format;
 	std::vector<float> data;
 	unsigned stride;
-	RefPtr<Buffer> vbuf;
-	bool defer_vbuf;
-	mutable bool dirty;
+	std::vector<Array> arrays;
+	bool legacy;
 
-	static ArrayMask enabled_arrays;
+	static bool legacy_used;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
@@ -56,25 +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; }
 
-	void use_vertex_buffer();
-	void use_vertex_buffer(Buffer *);
+	const VertexFormat &get_format() const { return format; }
+private:
+	static unsigned get_array_slot(unsigned char);
 
+public:
+	/// 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