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 75e33473227f542f9b856027349c6503d4361e96..53562ef922ba3ccf4bc1cf44ffb5feeef3691f3d 100644 (file)
--- 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
@@ -57,10 +56,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