X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexformat.cpp;fp=source%2Fcore%2Fvertexformat.cpp;h=9bfca5d295ad9688303d575434999700a368240e;hp=3d15705a01765c18abe9244dbd8ae0f39261f357;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=7ab13563ec79b45a09f03da73acb15b39e192df9 diff --git a/source/core/vertexformat.cpp b/source/core/vertexformat.cpp index 3d15705a..9bfca5d2 100644 --- a/source/core/vertexformat.cpp +++ b/source/core/vertexformat.cpp @@ -38,7 +38,7 @@ VertexFormat VertexFormat::operator,(DataType t) const throw invalid_operation("VertexFormat::operator,"); VertexFormat r = *this; - UInt16 &a = r.attributes[r.count-1]; + uint16_t &a = r.attributes[r.count-1]; a = make_typed_attribute(static_cast(a), t); return r; @@ -50,7 +50,7 @@ VertexFormat VertexFormat::operator,(unsigned i) const throw invalid_operation("VertexFormat::operator,"); VertexFormat r = *this; - UInt16 &a = r.attributes[r.count-1]; + uint16_t &a = r.attributes[r.count-1]; a = make_indexed_attribute(static_cast(a), i); return r; @@ -66,7 +66,7 @@ bool VertexFormat::operator==(const VertexFormat &other) const unsigned VertexFormat::stride() const { unsigned s = 0; - for(const UInt16 *i=begin(); i!=end(); ++i) + for(const uint16_t *i=begin(); i!=end(); ++i) s += get_attribute_size(*i); return s; } @@ -75,7 +75,7 @@ int VertexFormat::offset(VertexAttribute attr) const { unsigned sem = get_attribute_semantic(attr); unsigned offs = 0; - for(const UInt16 *i=begin(); i!=end(); ++i) + for(const uint16_t *i=begin(); i!=end(); ++i) { if(get_attribute_semantic(*i)==sem) {