X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexformat.h;h=27033200f634ac00c2ba5c6fe7d89eebc5d9160d;hb=6c2cb15dca6c24642f5026b06e6168c0d820355f;hp=75e33473227f542f9b856027349c6503d4361e96;hpb=c6c4fc39952e372eba1f44f2bc504428140f3d0e;p=libs%2Fgl.git

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 75e33473..27033200 100644
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -9,25 +9,24 @@ Distributed under the LGPL
 #define MSP_GL_VERTEXFORMAT_H_
 
 #include <istream>
-#include "types.h"
 
 namespace Msp {
 namespace GL {
 
 enum VertexComponent
 {
-	VERTEX2=1,
+	VERTEX2 = 1,
 	VERTEX3,
 	VERTEX4,
-	NORMAL3=6,
-	TEXCOORD1=8,
+	NORMAL3 = 6,
+	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
@@ -47,6 +46,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);
@@ -57,10 +57,11 @@ VertexFormat operator,(const VertexFormat &f, unsigned i);
 inline VertexFormat operator,(VertexComponent c, unsigned i)
 { return (VertexFormat(c), i); }
 
-inline uint get_stride(const VertexFormat &f)
+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