summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2e1a887)
It now returns VertexAttribute instead of VertexFormat, avoiding the need
to call make_indexed_attribute in some cases.
inline VertexFormat operator,(VertexAttribute a1, VertexAttribute a2)
{ return (VertexFormat(a1), a2); }
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);
VertexAttribute make_indexed_attribute(VertexAttribute, unsigned);
+inline VertexAttribute operator,(VertexAttribute a, unsigned i)
+{ return make_indexed_attribute(a, i); }
+
DEPRECATED inline VertexAttribute make_indexed_component(VertexAttribute a, unsigned i)
{ return make_indexed_attribute(a, i); }
DEPRECATED inline VertexAttribute make_indexed_component(VertexAttribute a, unsigned i)
{ return make_indexed_attribute(a, i); }
{
instance_data = new VertexArray((RAW_ATTRIB4,matrix_location, RAW_ATTRIB4,matrix_location+1, RAW_ATTRIB4,matrix_location+2));
const VertexFormat &fmt = instance_data->get_format();
{
instance_data = new VertexArray((RAW_ATTRIB4,matrix_location, RAW_ATTRIB4,matrix_location+1, RAW_ATTRIB4,matrix_location+2));
const VertexFormat &fmt = instance_data->get_format();
- matrix_offset = fmt.offset(make_indexed_attribute(RAW_ATTRIB4, matrix_location));
+ matrix_offset = fmt.offset((RAW_ATTRIB4,matrix_location));
instance_buffer = new Buffer;
instance_data->use_buffer(instance_buffer);
instance_buffer = new Buffer;
instance_data->use_buffer(instance_buffer);