#ifndef MSP_GL_VERTEXFORMAT_H_
#define MSP_GL_VERTEXFORMAT_H_
-#include <msp/core/inttypes.h>
+#include <cstdint>
#include <msp/strings/lexicalcast.h>
#include "datatype.h"
This information is presented for internal documentation purposes only; it is
inadvisable for programs to rely on it.
*/
-enum VertexAttribute
+enum VertexAttribute: std::uint16_t
{
VERTEX2 = 0x01C2,
VERTEX3 = 0x01C3,
COLOR4 = 0x05C4,
NORMAL3 = 0x09C3,
TANGENT3 = 0x0DC3,
- GROUP1 = 0x11C1,
- GROUP2 = 0x11C2,
- GROUP3 = 0x11C3,
- GROUP4 = 0x11C4,
+ GROUP1 = 0x10C9,
+ GROUP2 = 0x10CA,
+ GROUP3 = 0x10CB,
+ GROUP4 = 0x10CC,
WEIGHT1 = 0x15C1,
WEIGHT2 = 0x15C2,
WEIGHT3 = 0x15C3,
private:
enum { MAX_ATTRIBUTES = 15 };
- UInt8 count;
- UInt16 attributes[MAX_ATTRIBUTES];
+ std::uint8_t count;
+ VertexAttribute attributes[MAX_ATTRIBUTES];
public:
VertexFormat();
bool operator!=(const VertexFormat &other) const { return !(*this==other); }
bool empty() const { return !count; }
- const UInt16 *begin() const { return attributes; }
- const UInt16 *end() const { return attributes+count; }
+ const VertexAttribute *begin() const { return attributes; }
+ const VertexAttribute *end() const { return attributes+count; }
unsigned stride() const;
int offset(VertexAttribute) const;
};
inline VertexAttribute operator,(VertexAttribute a, unsigned i)
{ return make_indexed_attribute(a, i); }
-inline unsigned get_attribute_semantic(UInt16 a)
+inline unsigned get_attribute_semantic(VertexAttribute a)
{ return a>>10; }
-inline DataType get_attribute_source_type(UInt16 a)
+inline DataType get_attribute_source_type(VertexAttribute a)
{ return static_cast<DataType>((a&0x70)>>4 | (a&0x180)<<1); }
-inline unsigned get_attribute_component_count(UInt16 a)
+inline unsigned get_attribute_component_count(VertexAttribute a)
{ return a&7; }
-inline unsigned get_attribute_size(UInt16 a)
+inline unsigned get_attribute_size(VertexAttribute a)
{ return get_attribute_component_count(a)*get_type_size(get_attribute_source_type(a)); }
-inline bool is_integer_attribute(UInt16 a)
+inline bool is_integer_attribute(VertexAttribute a)
{ return a&8; }
void operator>>(const LexicalConverter &, VertexAttribute &);