Turn VertexFormat into a class and hide the data member

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

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 3e36c18f4e76f2a60cd93e43d29c382f805bb7e5..fb47484b35940b7e873b6d2586d333df0edda802 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 {
@@ -19,47 +12,58 @@ 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
 };
 
-struct VertexFormat
+class VertexFormat
 {
+private:
        unsigned char *data;
 
+public:
        VertexFormat();
        VertexFormat(VertexComponent);
        VertexFormat(const VertexFormat &);
        VertexFormat &operator=(const VertexFormat &);
        ~VertexFormat();
 
+       VertexFormat operator,(VertexComponent c) const;
+       VertexFormat operator,(unsigned i) const;
+
        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);
 inline VertexFormat operator,(VertexComponent c1, VertexComponent c2)
 { return (VertexFormat(c1), c2); }
 
-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