X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=079c2234cc5a598ac5abdb21925aa55c00ca8123;hb=85c82f93f4874bcf0b04332c9abb62cd2a5b181b;hp=b1b5fdee58baa672a6a45080e9909cc3ab0696b2;hpb=d1800d7ea80290f4913d0203241cef1409656522;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index b1b5fdee..079c2234 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,25 +1,26 @@
 /* $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>
+#include "datatype.h"
 #include "primitivetype.h"
-#include "types.h"
 #include "vertexarraybuilder.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class VertexBuffer;
+class Buffer;
 
 class VertexArray
 {
@@ -30,33 +31,72 @@ public:
 		Loader(VertexArray &);
 	};
 
-	VertexArray(VertexFormat);
+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;
+	RefPtr<Buffer> vbuf;
+	bool defer_vbuf;
+	mutable bool dirty;
+
+	static ArrayMask enabled_arrays;
+
+	VertexArray(const VertexArray &);
+	VertexArray &operator=(const VertexArray &);
+public:
+	VertexArray(const VertexFormat &);
 	~VertexArray();
 
-	VertexFormat get_format() const { return format; }
+	const VertexFormat &get_format() const { return format; }
 	const std::vector<float> &get_data() const { return data; }
 	void         use_vertex_buffer();
-	void         use_vertex_buffer(VertexBuffer *);
+	void         use_vertex_buffer(Buffer *);
 	void         reserve(unsigned);
 	unsigned     size() const { return data.size()/stride; }
 	void         clear();
-	void         reset(VertexFormat);
-	RefPtr<VertexArrayBuilder> modify();
+	void         reset(const VertexFormat &);
 	void         apply() const;
-	void         update_data();
+	float        *append();
+	float *modify(unsigned);
+	float *operator[](unsigned i) { return modify(i); }
+	const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
+
 private:
-	VertexFormat format;
-	std::vector<float> data;
-	uint         stride;
-	VertexBuffer *vbuf;
-	bool         own_vbuf;
+	void set_dirty();
+};
 
-	VertexArray(const VertexArray &);
-	VertexArray &operator=(const VertexArray &);
-	void set_array(unsigned, unsigned, unsigned) const;
+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 *);
 
-	static unsigned enabled_arrays;
-};
+inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
+{ draw_elements(mode, count, UNSIGNED_INT, indices); }
+
+inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
+{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
+
+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); }
+
+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); }
 
 } // namespace GL
 } // namespace Msp