X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=d6dee7dd59ce3a9f3c81185aed2a405fa571277a;hb=d6ec375442b31d052b9fcb013508ad7523749147;hp=02fa64f70b0f0cfdfe5c9fa0c893433fa59818f1;hpb=dc1d1159a61f378bda11e5989ad694a86b9a3c77;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 02fa64f7..d6dee7dd 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,27 +1,23 @@
-/* $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 "bindable.h"
+#include "bufferable.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
+class VertexArray: public Bindable<VertexArray>, public Bufferable
 {
 public:
 	class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -31,53 +27,57 @@ public:
 	};
 
 private:
+	struct Array
+	{
+		unsigned char component;
+		unsigned char offset;
+
+		Array();
+	};
+
 	VertexFormat format;
 	std::vector<float> data;
-	uint         stride;
-	VertexBuffer *vbuf;
-	bool         own_vbuf;
+	unsigned stride;
+	std::vector<Array> arrays;
+	bool legacy;
+
+	static bool legacy_used;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
 public:
-	VertexArray(VertexFormat);
+	VertexArray(const VertexFormat &);
 	~VertexArray();
 
-	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);
-	void         apply() const;
-	void         update_data();
-	float        *append();
-	float        *operator[](unsigned i) { return &data[0]+i*stride; }
-	const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
+	void reset(const VertexFormat &);
+	const VertexFormat &get_format() const { return format; }
 private:
-	void set_array(unsigned, unsigned, unsigned) const;
-
-	static unsigned 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 *);
+	static unsigned get_array_slot(unsigned char);
 
-inline void draw_elements(PrimitiveType mode, sizei count, const unsigned *indices)
-{ draw_elements(mode, count, UNSIGNED_INT, indices); }
+public:
+	/// Deprecated alias for use_buffer
+	void use_vertex_buffer(Buffer *b) { use_buffer(b); }
 
-inline void draw_elements(PrimitiveType mode, sizei count, const unsigned short *indices)
-{ draw_elements(mode, count, UNSIGNED_SHORT, indices); }
+	void clear();
+	void reserve(unsigned);
+	float *append();
+	float *modify(unsigned);
+private:
+	virtual unsigned get_data_size() const;
+	virtual const void *get_data_pointer() const { return &data[0]; }
 
-inline void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei 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, uint low, uint high, sizei count, const unsigned *indices)
-{ draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); }
+	void bind() const { apply(); }
+	void apply(bool = true) const;
+private:
+	static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned, bool);
+public:
+	static void unbind();
+};
 
 } // namespace GL
 } // namespace Msp