#ifndef MSP_GL_VERTEXFORMAT_H_
#define MSP_GL_VERTEXFORMAT_H_
-#include <msp/core/attributes.h>
#include <msp/strings/lexicalcast.h>
namespace Msp {
COLOR4_FLOAT,
NORMAL3 = 18,
TANGENT3 = 26,
- BINORMAL3 = 34,
- // Attributes 5 and 6 reserved for vertex groups and weights
- TEXCOORD1 = 56,
+ GROUP1 = 32,
+ GROUP2,
+ GROUP3,
+ GROUP4,
+ WEIGHT1 = 40,
+ WEIGHT2,
+ WEIGHT3,
+ WEIGHT4,
+ TEXCOORD1 = 48,
TEXCOORD2,
TEXCOORD3,
TEXCOORD4,
- GENERIC1 = 88,
+ GENERIC1 = 80,
GENERIC2,
GENERIC3,
GENERIC4,
RAW_ATTRIB4
};
-DEPRECATED typedef VertexAttribute VertexComponent;
-
class VertexFormat
{
private:
inline VertexFormat operator,(VertexAttribute a1, VertexAttribute a2)
{ return (VertexFormat(a1), a2); }
-inline VertexFormat operator,(VertexAttribute a, unsigned i)
-{ return (VertexFormat(a), i); }
-
VertexAttribute make_indexed_attribute(VertexAttribute, unsigned);
-DEPRECATED inline VertexAttribute make_indexed_component(VertexAttribute a, unsigned i)
+inline VertexAttribute operator,(VertexAttribute a, unsigned i)
{ return make_indexed_attribute(a, i); }
inline unsigned get_attribute_semantic(unsigned char a)
inline unsigned get_attribute_size(unsigned char a)
{ return (a&3)+1; }
-DEPRECATED inline unsigned get_component_type(unsigned char c)
-{ return get_attribute_semantic(c); }
-
-DEPRECATED inline unsigned get_component_size(unsigned char c)
-{ return get_attribute_size(c); }
-
-DEPRECATED inline unsigned get_stride(const VertexFormat &f)
-{ return f.stride(); }
-
void operator>>(const LexicalConverter &, VertexAttribute &);
} // namespace GL