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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 52b88882..9610905d 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -10,65 +10,25 @@ Distributed under the LGPL
 
 #include <vector>
 #include <msp/core/refptr.h>
+#include <msp/datafile/loader.h>
 #include "types.h"
+#include "vertexarraybuilder.h"
+#include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class VertexArray;
 class VertexBuffer;
 
-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
-{
-public:
-	std::vector<float> &data;
-
-	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;
-
-	float cr, cg, cb, ca;  // Color
-	float ts, tt, tr, tq;  // TexCoord
-	float nx, ny, nz;     // Normal
-};
-
 class VertexArray
 {
 public:
+	class Loader: public DataFile::Loader, public VertexArrayBuilder
+	{
+	public:
+		Loader(VertexArray &);
+	};
+
 	VertexArray(VertexFormat);
 	~VertexArray();
 
@@ -77,7 +37,8 @@ public:
 	void         use_vertex_buffer();
 	void         use_vertex_buffer(VertexBuffer *);
 	void         clear();
-	RefPtr<VertexArrayBuilder> modify() { return new VertexArrayBuilder(*this, data); }
+	void         reset(VertexFormat);
+	RefPtr<VertexArrayBuilder> modify();
 	void         apply() const;
 	void         update_data();
 private:
@@ -87,6 +48,8 @@ private:
 	VertexBuffer *vbuf;
 	bool         own_vbuf;
 
+	VertexArray(const VertexArray &);
+	VertexArray &operator=(const VertexArray &);
 	void set_array(unsigned, unsigned, unsigned) const;
 
 	static unsigned enabled_arrays;