X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexformat.h;h=833b942ee82f2097bd004228879a43957fcd615d;hb=3d6188a7f48566398e7ad7548dbd47a68bc73bdc;hp=4dc780b225e843b9bba31af97375bb2114e02421;hpb=4443707c752ab8ee288f1c22be08cf82f27439d7;p=libs%2Fgl.git

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 4dc780b2..833b942e 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/core/lexicalcast.h>
 
 namespace Msp {
 namespace GL {
@@ -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