X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.h;h=6e54f681717f4269fb135f66bd18420b5d87943e;hp=3b67527864a014908b3b2349d3616a455ec39699;hb=553f3ec4fbe28a37978ee53b9b6e22fedb691e1d;hpb=249ce48a66074d0f0b6e23caeb77fad7c3d238ae

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 3b675278..6e54f681 100644
--- 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,8 @@ Distributed under the LGPL
 #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"
@@ -22,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
@@ -32,30 +38,21 @@ public:
 	};
 
 private:
-	struct ArrayMask
+	struct Array
 	{
-		enum
-		{
-			B = (sizeof(unsigned)*CHAR_BIT),
-			N = (63+B)/B
-		};
+		unsigned char component;
+		unsigned char offset;
 
-		unsigned mask[N];
-
-		ArrayMask();
-
-		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 &);
@@ -63,39 +60,48 @@ 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);
-	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; }
 private:
-	void set_dirty();
-};
+	static unsigned get_array_slot(unsigned char);
+
+public:
+	/// Clears all vertices from the array.
+	void clear();
 
-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 *);
+	/// 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;
+	virtual const void *get_data_pointer() const { return &data[0]; }
 
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
-{ draw_elements(mode, 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; }
 
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
-{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
+	/** Equivalent to apply(true).  For compatibility with the Bindable
+	interface. */
+	void bind() const { apply(); }
 
-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); }
+	/** 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;
 
-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); }
+private:
+	static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned, bool);
+public:
+	static void unbind();
+};
 
 } // namespace GL
 } // namespace Msp