-inline VertexFormat operator,(VertexFormat a, VertexFormat b) { return VertexFormat(a<<4 | b); }
-uint get_stride(VertexFormat);
-std::istream &operator>>(std::istream &, VertexFormat &);
+class VertexFormat
+{
+private:
+ enum { MAX_COMPONENTS = 15 };
+
+ unsigned char count;
+ unsigned char components[MAX_COMPONENTS];
+
+public:
+ VertexFormat();
+ VertexFormat(VertexComponent);
+
+ VertexFormat operator,(VertexComponent c) const;
+ VertexFormat operator,(unsigned i) const;
+
+ bool empty() const { return !count; }
+ const unsigned char *begin() const { return components; }
+ const unsigned char *end() const { return components+count; }
+ unsigned stride() const;
+ int offset(VertexComponent) const;
+};
+
+inline VertexFormat operator,(VertexComponent c1, VertexComponent c2)
+{ return (VertexFormat(c1), c2); }
+
+inline VertexFormat operator,(VertexComponent c, unsigned i)
+{ return (VertexFormat(c), i); }
+
+VertexComponent make_indexed_component(VertexComponent, unsigned);
+
+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(); }
+
+void operator>>(const LexicalConverter &, VertexComponent &);