X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=3b67527864a014908b3b2349d3616a455ec39699;hb=5172d32d67595ea0b70184fadcfcb8e023cccbc8;hp=7fcbb8bdba7ba50e84cbb8d674e987adbdbc354f;hpb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 7fcbb8bd..3b675278 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,13 +1,14 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010  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>
@@ -31,11 +32,30 @@ public:
 	};
 
 private:
+	struct ArrayMask
+	{
+		enum
+		{
+			B = (sizeof(unsigned)*CHAR_BIT),
+			N = (63+B)/B
+		};
+
+		unsigned mask[N];
+
+		ArrayMask();
+
+		void set(unsigned);
+		bool is_set(unsigned) const;
+	};
+
 	VertexFormat format;
 	std::vector<float> data;
 	unsigned stride;
-	Buffer *vbuf;
-	bool own_vbuf;
+	RefPtr<Buffer> vbuf;
+	bool defer_vbuf;
+	mutable bool dirty;
+
+	static ArrayMask enabled_arrays;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
@@ -52,14 +72,12 @@ public:
 	void         clear();
 	void         reset(const VertexFormat &);
 	void         apply() const;
-	void         update_data();
 	float        *append();
-	float        *operator[](unsigned i) { return &data[0]+i*stride; }
+	float *modify(unsigned);
 	const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
-private:
-	void set_array(unsigned, bool, unsigned) const;
 
-	static unsigned enabled_arrays;
+private:
+	void set_dirty();
 };
 
 void array_element(int);