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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index ef7f6a24..c7609afe 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
 {
@@ -31,11 +32,27 @@ 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;
+	Buffer *vbuf;
+	bool own_vbuf;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
@@ -46,7 +63,7 @@ public:
 	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();
@@ -56,27 +73,26 @@ public:
 	float        *append();
 	float        *operator[](unsigned i) { return &data[0]+i*stride; }
 	const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
-private:
-	void set_array(unsigned, bool, unsigned) const;
 
-	static unsigned enabled_arrays;
+private:
+	static ArrayMask enabled_arrays;
 };
 
 void array_element(int);
-void draw_arrays(PrimitiveType, int, sizei);
-void draw_elements(PrimitiveType, sizei, DataType, const void *);
-void draw_range_elements(PrimitiveType, uint, uint, sizei, DataType, const void *);
+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, sizei count, const unsigned *indices)
+inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
 { draw_elements(mode, count, UNSIGNED_INT, indices); }
 
-inline void draw_elements(PrimitiveType mode, sizei count, const unsigned short *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, uint low, uint high, sizei count, const 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, uint low, uint high, sizei count, const unsigned *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