X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexformat.h;h=3e36c18f4e76f2a60cd93e43d29c382f805bb7e5;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hp=3a0eb718f5a5937b1dcca4e5b786f241bdf8ff45;hpb=85facfb688035b5bbc9a3a87d080582fbf34930b;p=libs%2Fgl.git

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 3a0eb718..3e36c18f 100644
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,29 +9,56 @@ Distributed under the LGPL
 #define MSP_GL_VERTEXFORMAT_H_
 
 #include <istream>
-#include "types.h"
 
 namespace Msp {
 namespace GL {
 
-enum VertexFormat
+enum VertexComponent
 {
-	NODATA=0,
-	VERTEX2=1,
+	VERTEX2 = 1,
 	VERTEX3,
 	VERTEX4,
-	NORMAL3=6,
-	TEXCOORD1=8,
+	NORMAL3 = 6,
+	TEXCOORD1 = 8,
 	TEXCOORD2,
 	TEXCOORD3,
 	TEXCOORD4,
-	COLOR4_UBYTE=12,
-	COLOR3_FLOAT=14,
+	COLOR4_UBYTE = 12,
+	COLOR3_FLOAT = 14,
 	COLOR4_FLOAT,
+	ATTRIB1 = 16,
+	ATTRIB2,
+	ATTRIB3,
+	ATTRIB4
 };
 
-inline VertexFormat operator,(VertexFormat a, VertexFormat b) { return VertexFormat(a<<4 | b); }
-uint get_stride(VertexFormat);
+struct VertexFormat
+{
+	unsigned char *data;
+
+	VertexFormat();
+	VertexFormat(VertexComponent);
+	VertexFormat(const VertexFormat &);
+	VertexFormat &operator=(const VertexFormat &);
+	~VertexFormat();
+
+	bool empty() const { return !data || !data[0]; }
+	const unsigned char *begin() const { return data ? data+1 : 0; }
+	const unsigned char *end() const { return data ? data+1+data[0] : 0; }
+	unsigned stride() const;
+};
+
+VertexFormat operator,(const VertexFormat &f, VertexComponent c);
+inline VertexFormat operator,(VertexComponent c1, VertexComponent c2)
+{ return (VertexFormat(c1), c2); }
+
+VertexFormat operator,(const VertexFormat &f, unsigned i);
+inline VertexFormat operator,(VertexComponent c, unsigned i)
+{ return (VertexFormat(c), i); }
+
+inline unsigned get_stride(const VertexFormat &f)
+{ return f.stride(); }
+
 std::istream &operator>>(std::istream &, VertexFormat &);
 
 } // namespace GL