X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=7e6d04f5a05aab16c15d6dfb980748f93235cef0;hb=afd625b06702e7a25e0730601f03955832b64e65;hp=f0baf2d4a84fa8896b21c351149d9cd28612ee04;hpb=e92458a4a0e6191bff549a8b316dbbbd7c56e90f;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index f0baf2d4..7e6d04f5 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,30 +1,22 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  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
 {
-	friend class VertexArrayBuilder;
-
 public:
 	class Loader: public DataFile::Loader, public VertexArrayBuilder
 	{
@@ -33,35 +25,71 @@ 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;
-	uint         stride;
-	VertexBuffer *vbuf;
-	bool         own_vbuf;
+	unsigned stride;
+	RefPtr<Buffer> vbuf;
+	bool defer_vbuf;
+	mutable bool dirty;
+
+	static ArrayMask enabled_arrays;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
 public:
-	VertexArray(VertexFormat);
+	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         reserve(unsigned);
-	unsigned     size() const { return data.size()/stride; }
-	void         clear();
-	void         reset(VertexFormat);
-	RefPtr<VertexArrayBuilder> modify();
-	void         apply() const;
-	void         update_data();
-private:
-	void set_array(unsigned, unsigned, unsigned) const;
+	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; }
 
-	static unsigned enabled_arrays;
+private:
+	void set_dirty();
 };
 
+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); }
+
+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