X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=82a6b6ac5260cb3bd074404480187022f2b03b37;hb=2e9f905d2a2b0abdb7902aa3d3416a97666c489a;hp=9610905d218994fcb2e539a6fe06d1a4e3934a41;hpb=85facfb688035b5bbc9a3a87d080582fbf34930b;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 9610905d..82a6b6ac 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,26 +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 "types.h"
+#include "bindable.h"
+#include "datatype.h"
+#include "primitivetype.h"
 #include "vertexarraybuilder.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class VertexBuffer;
+class Buffer;
 
-class VertexArray
+class VertexArray: public Bindable<VertexArray>
 {
 public:
 	class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -29,30 +25,53 @@ public:
 		Loader(VertexArray &);
 	};
 
-	VertexArray(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         clear();
-	void         reset(VertexFormat);
-	RefPtr<VertexArrayBuilder> modify();
-	void         apply() const;
-	void         update_data();
 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;
+	RefPtr<Buffer> vbuf;
+	bool defer_vbuf;
+	mutable bool dirty;
 
 	VertexArray(const VertexArray &);
 	VertexArray &operator=(const VertexArray &);
-	void set_array(unsigned, unsigned, unsigned) const;
+public:
+	VertexArray(const VertexFormat &);
+	~VertexArray();
 
-	static unsigned enabled_arrays;
+	void reset(const VertexFormat &);
+	const VertexFormat &get_format() const { return format; }
+private:
+	static unsigned get_array_slot(unsigned char);
+
+public:
+	void use_vertex_buffer();
+	void use_vertex_buffer(Buffer *);
+
+	void clear();
+	void reserve(unsigned);
+	float *append();
+	float *modify(unsigned);
+private:
+	void set_dirty();
+
+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:
+	static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
 };
 
 } // namespace GL