X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=82a6b6ac5260cb3bd074404480187022f2b03b37;hb=ae9abd6be3e556d0a202cc5ab05668da715382c9;hp=039dfa8b13ea3ed467dcdf3825b0ddaa64b825cf;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 039dfa8b..82a6b6ac 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
+#include "bindable.h"
 #include "datatype.h"
 #include "primitivetype.h"
 #include "vertexarraybuilder.h"
@@ -15,7 +16,7 @@ namespace GL {
 
 class Buffer;
 
-class VertexArray
+class VertexArray: public Bindable<VertexArray>
 {
 public:
 	class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -25,70 +26,53 @@ public:
 	};
 
 private:
-	struct ArrayMask
+	struct Array
 	{
-		enum
-		{
-			B = (sizeof(unsigned)*CHAR_BIT),
-			N = (63+B)/B
-		};
+		unsigned char component;
+		unsigned char offset;
 
-		unsigned mask[N];
-
-		ArrayMask();
-
-		void set(unsigned);
-		bool is_set(unsigned) const;
+		Array();
 	};
 
 	VertexFormat format;
 	std::vector<float> data;
 	unsigned stride;
+	std::vector<Array> arrays;
 	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();
 
+	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;
-	float        *append();
-	float *modify(unsigned);
-	const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
-
 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 *);
+	static unsigned get_array_slot(unsigned char);
 
-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