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

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 3e36c18f..edea62d8 100644
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -1,14 +1,7 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007, 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_VERTEXFORMAT_H_
 #define MSP_GL_VERTEXFORMAT_H_
 
-#include <istream>
+#include <msp/strings/lexicalcast.h>
 
 namespace Msp {
 namespace GL {
@@ -19,14 +12,14 @@ enum VertexComponent
 	VERTEX3,
 	VERTEX4,
 	NORMAL3 = 6,
-	TEXCOORD1 = 8,
+	COLOR4_UBYTE = 8,
+	COLOR3_FLOAT = 10,
+	COLOR4_FLOAT,
+	TEXCOORD1 = 12,
 	TEXCOORD2,
 	TEXCOORD3,
 	TEXCOORD4,
-	COLOR4_UBYTE = 12,
-	COLOR3_FLOAT = 14,
-	COLOR4_FLOAT,
-	ATTRIB1 = 16,
+	ATTRIB1 = 44,
 	ATTRIB2,
 	ATTRIB3,
 	ATTRIB4
@@ -46,6 +39,7 @@ struct VertexFormat
 	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;
+	int offset(VertexComponent, unsigned = 0) const;
 };
 
 VertexFormat operator,(const VertexFormat &f, VertexComponent c);
@@ -59,7 +53,8 @@ inline VertexFormat operator,(VertexComponent c, unsigned i)
 inline unsigned get_stride(const VertexFormat &f)
 { return f.stride(); }
 
-std::istream &operator>>(std::istream &, VertexFormat &);
+void operator>>(const LexicalConverter &, VertexComponent &);
+void operator>>(const LexicalConverter &, VertexFormat &);
 
 } // namespace GL
 } // namespace Msp