Support multiple sets of texture coordinates in datafiles

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

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 3e36c18f4e76f2a60cd93e43d29c382f805bb7e5..53562ef922ba3ccf4bc1cf44ffb5feeef3691f3d 100644 (file)
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -19,14 +19,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
@@ -59,7 +59,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