X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexformat.h;h=75e33473227f542f9b856027349c6503d4361e96;hb=c6c4fc39952e372eba1f44f2bc504428140f3d0e;hp=2432d7b60d54aec2fbf8e478cdfec5ff8971f90f;hpb=b8fef9be469eb16e54068bac7e275ea225efc71c;p=libs%2Fgl.git diff --git a/source/vertexformat.h b/source/vertexformat.h index 2432d7b6..75e33473 100644 --- a/source/vertexformat.h +++ b/source/vertexformat.h @@ -1,7 +1,7 @@ /* $Id$ This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2007, 2009-2010 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ @@ -46,6 +46,7 @@ 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; }; VertexFormat operator,(const VertexFormat &f, VertexComponent c); @@ -56,7 +57,9 @@ VertexFormat operator,(const VertexFormat &f, unsigned i); inline VertexFormat operator,(VertexComponent c, unsigned i) { return (VertexFormat(c), i); } -uint get_stride(const VertexFormat &); +inline uint get_stride(const VertexFormat &f) +{ return f.stride(); } + std::istream &operator>>(std::istream &, VertexFormat &); } // namespace GL