Drop Id tags and copyright notices from files

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

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 2432d7b60d54aec2fbf8e478cdfec5ff8971f90f..2768e445df26809284e0076699eebc9fbc27762e 100644 (file)
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -1,33 +1,25 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_VERTEXFORMAT_H_
 #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
@@ -46,6 +38,8 @@ struct 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;
+       int offset(VertexComponent, unsigned = 0) const;
 };
 
 VertexFormat operator,(const VertexFormat &f, VertexComponent c);
@@ -56,8 +50,11 @@ VertexFormat operator,(const VertexFormat &f, unsigned i);
 inline VertexFormat operator,(VertexComponent c, unsigned i)
 { return (VertexFormat(c), i); }
 
-uint get_stride(const VertexFormat &);
-std::istream &operator>>(std::istream &, VertexFormat &);
+inline unsigned get_stride(const VertexFormat &f)
+{ return f.stride(); }
+
+void operator>>(const LexicalConverter &, VertexComponent &);
+void operator>>(const LexicalConverter &, VertexFormat &);
 
 } // namespace GL
 } // namespace Msp