X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=82a6b6ac5260cb3bd074404480187022f2b03b37;hb=2e9f905d2a2b0abdb7902aa3d3416a97666c489a;hp=c7609afe6ae419445e777e032975fdcb61f8a3ad;hpb=4443707c752ab8ee288f1c22be08cf82f27439d7;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index c7609afe..82a6b6ac 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,7 @@ Distributed under the LGPL
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
+#include "bindable.h"
 #include "datatype.h"
 #include "primitivetype.h"
 #include "vertexarraybuilder.h"
@@ -22,7 +16,7 @@ namespace GL {
 
 class Buffer;
 
-class VertexArray
+class VertexArray: public Bindable<VertexArray>
 {
 public:
 	class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -32,27 +26,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;
-	Buffer *vbuf;
-	bool own_vbuf;
+	std::vector<Array> arrays;
+	RefPtr<Buffer> vbuf;
+	bool defer_vbuf;
+	mutable bool dirty;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
@@ -60,40 +48,31 @@ public:
 	VertexArray(const VertexFormat &);
 	~VertexArray();
 
+	void reset(const VertexFormat &);
 	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;
-	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:
-	static ArrayMask enabled_arrays;
-};
+	static unsigned get_array_slot(unsigned char);
 
-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 *);
-
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
-{ draw_elements(mode, count, UNSIGNED_INT, indices); }
+public:
+	void use_vertex_buffer();
+	void use_vertex_buffer(Buffer *);
 
-inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
-{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
+	void clear();
+	void reserve(unsigned);
+	float *append();
+	float *modify(unsigned);
+private:
+	void set_dirty();
 
-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); }
+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_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned *indices)
-{ draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); }
+	void apply() const;
+private:
+	static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
+};
 
 } // namespace GL
 } // namespace Msp