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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 7e6d04f5..fb8f51b0 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -5,6 +5,8 @@
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
+#include "bindable.h"
+#include "bufferable.h"
 #include "datatype.h"
 #include "primitivetype.h"
 #include "vertexarraybuilder.h"
@@ -15,7 +17,7 @@ namespace GL {
 
 class Buffer;
 
-class VertexArray
+class VertexArray: public Bindable<VertexArray>, public Bufferable
 {
 public:
 	class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -25,71 +27,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;
-	RefPtr<Buffer> vbuf;
-	bool defer_vbuf;
+	std::vector<Array> arrays;
 	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; }
+private:
+	static unsigned get_array_slot(unsigned char);
+
+public:
+	/// Deprecated alias for use_buffer
+	void use_vertex_buffer(Buffer *b) { use_buffer(b); }
+
 	void clear();
-	void reset(const VertexFormat &);
-	void apply() const;
+	void reserve(unsigned);
 	float *append();
 	float *modify(unsigned);
+private:
+	virtual unsigned get_data_size() const;
+	virtual void upload_data() const;
+
+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; }
 
+	void apply() const;
 private:
-	void set_dirty();
+	static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
 };
 
-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