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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 23d53be0..fb8f51b0 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,88 +1,77 @@
 #ifndef MSP_GL_VERTEXARRAY_H_
 #define MSP_GL_VERTEXARRAY_H_
 
+#include <climits>
 #include <vector>
 #include <msp/core/refptr.h>
-#include "types.h"
+#include <msp/datafile/loader.h>
+#include "bindable.h"
+#include "bufferable.h"
+#include "datatype.h"
+#include "primitivetype.h"
+#include "vertexarraybuilder.h"
+#include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class VertexArray;
-class VertexBuffer;
+class Buffer;
 
-enum VertexFormat
-{
-	NODATA=0,
-	VERTEX2=1,
-	VERTEX3,
-	VERTEX4,
-	NORMAL3=6,
-	TEXCOORD1=8,
-	TEXCOORD2,
-	TEXCOORD3,
-	TEXCOORD4,
-	COLOR4_UBYTE=12,
-	COLOR3_FLOAT=14,
-	COLOR4_FLOAT,
-};
-
-inline VertexFormat operator,(VertexFormat a, VertexFormat b) { return VertexFormat((a<<4)|b); }
-uint get_stride(VertexFormat);
-
-class VertexArrayBuilder
+class VertexArray: public Bindable<VertexArray>, public Bufferable
 {
 public:
-	std::vector<float> &data;
+	class Loader: public DataFile::Loader, public VertexArrayBuilder
+	{
+	public:
+		Loader(VertexArray &);
+	};
 
-	VertexArrayBuilder(VertexArray &, std::vector<float> &);
-	void vertex(float x, float y)                     { vertex(x, y, 0, 1); }
-	void vertex(float x, float y, float z)            { vertex(x, y, z, 1); }
-	void vertex(float, float, float, float);
-	void normal(float x, float y, float z)            { nx=x; ny=y; nz=z; }
-	void texcoord(float s)                            { texcoord(s, 0, 0, 1); }
-	void texcoord(float s, float t)                   { texcoord(s, t, 0, 1); }
-	void texcoord(float s, float t, float r)          { texcoord(s, t, r, 1); }
-	void texcoord(float s, float t, float r, float q) { ts=s; tt=t; tr=r; tq=q; }
-	void color(ubyte r, ubyte g, ubyte b)             { color(r, g, b, 255); }
-	void color(ubyte r, ubyte g, ubyte b, ubyte a)    { color(r/255.f, g/255.f, b/255.f, a/255.f); }
-	void color(float r, float g, float b)             { color(r, g, b, 1); }
-	void color(float r, float g, float b, float a)    { cr=r; cg=g; cb=b; ca=a; }
-	~VertexArrayBuilder();
 private:
-	VertexArray  &array;
-	VertexFormat format;
-	uint         stride;
+	struct Array
+	{
+		unsigned char component;
+		unsigned char offset;
 
-	float cr, cg, cb, ca;  // Color
-	float ts, tt, tr, tq;  // TexCoord
-	float nx, ny, nz;     // Normal
-};
+		Array();
+	};
 
-class VertexArray
-{
+	VertexFormat format;
+	std::vector<float> data;
+	unsigned stride;
+	std::vector<Array> arrays;
+	mutable bool dirty;
+
+	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         clear();
-	RefPtr<VertexArrayBuilder> modify() { return new VertexArrayBuilder(*this, data); }
-	void         apply() const;
-	void         update_data();
+	void reset(const VertexFormat &);
+	const VertexFormat &get_format() const { return format; }
 private:
-	VertexFormat format;
-	std::vector<float> data;
-	uint         stride;
-	VertexBuffer *vbuf;
-	bool         own_vbuf;
+	static unsigned get_array_slot(unsigned char);
+
+public:
+	/// Deprecated alias for use_buffer
+	void use_vertex_buffer(Buffer *b) { use_buffer(b); }
 
-	void set_array(unsigned, unsigned, unsigned) const;
+	void clear();
+	void reserve(unsigned);
+	float *append();
+	float *modify(unsigned);
+private:
+	virtual unsigned get_data_size() const;
+	virtual void upload_data() const;
 
-	static unsigned enabled_arrays;
+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