#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
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 &);