Helper functions for extracting vertex component type and size

[libs/gl.git] / source / vertexformat.h

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 4dc780b225e843b9bba31af97375bb2114e02421..35b5de3d15d9910da9ffda9bb15d521c112d1f91 100644 (file)
--- 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 {
@@ -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);
@@ -56,10 +50,17 @@ VertexFormat operator,(const VertexFormat &f, unsigned i);
 inline VertexFormat operator,(VertexComponent c, unsigned i)
 { return (VertexFormat(c), i); }
 
+inline unsigned get_component_type(unsigned char c)
+{ return c>>2; }
+
+inline unsigned get_component_size(unsigned char c)
+{ return (c&3)+1; }
+
 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