X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.h;h=6e54f681717f4269fb135f66bd18420b5d87943e;hp=52b8888227b80cc39bc365d7b484bf0d639f3e85;hb=4691b76467eadabfb0a7e810b12fe858a36ad519;hpb=f098a871fc6dc7b61a5aca5581fa327e4124c036

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 52b88882..6e54f681 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,95 +1,106 @@
-/* $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 "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,
-};
+/**
+Stores vertex data.  Both legacy and generic attributes are supported.  Mixing
+the two is possible but discouraged, as driver-specific issues may arise.
 
-inline VertexFormat operator,(VertexFormat a, VertexFormat b) { return VertexFormat((a<<4)|b); }
-uint get_stride(VertexFormat);
+The array's contents can be modified with the append and modify methods.  To
+obtain the location of an individual component within the vertex, use
+VertexFormat::offset.
 
-class VertexArrayBuilder
+A higher-level interface for filling in vertex data is available in the
+VertexArrayBuilder class.
+*/
+class VertexArray: public Bindable<VertexArray>, public Bufferable
 {
 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();
+	class Loader: public DataFile::Loader, public VertexArrayBuilder
+	{
+	public:
+		Loader(VertexArray &);
+	};
+
 private:
-	VertexArray  &array;
+	struct Array
+	{
+		unsigned char component;
+		unsigned char offset;
+
+		Array();
+	};
+
 	VertexFormat format;
-	uint         stride;
+	std::vector<float> data;
+	unsigned stride;
+	std::vector<Array> arrays;
+	bool legacy;
 
-	float cr, cg, cb, ca;  // Color
-	float ts, tt, tr, tq;  // TexCoord
-	float nx, ny, nz;     // Normal
-};
+	static bool legacy_used;
 
-class VertexArray
-{
+	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();
+	/// Resets the VertexArray to a different format.  All data is cleared.
+	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:
+	/// Clears all vertices from the array.
+	void clear();
+
+	/// Reserve space for vertices.
+	void reserve(unsigned);
+
+	/// Append a new vertex at the end of the array and return its location.
+	float *append();
+
+	/// Returns the location of a vertex for modification.
+	float *modify(unsigned);
+private:
+	virtual unsigned get_data_size() const;
+	virtual const void *get_data_pointer() const { return &data[0]; }
+
+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 set_array(unsigned, unsigned, unsigned) const;
+	/** Equivalent to apply(true).  For compatibility with the Bindable
+	interface. */
+	void bind() const { apply(); }
 
-	static unsigned enabled_arrays;
+	/** Applies component arrays to the GL.  If legacy is true, they are applied
+	as is.  If legacy is false, any legacy attributes are converted to generic
+	attributes. */
+	void apply(bool legacy = 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