Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

BufferView::Iterator doesn't support operator<

Browse source
This commit is contained in:
Andrew Meadows 2016-08-19 10:15:37 -07:00
parent 304c313db7
commit c3f165d9da
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -786,7 +786,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
auto indexItr = indices.cbegin<const gpu::BufferView::Index>() + partItr->_startIndex; auto indexItr = indices.cbegin<const gpu::BufferView::Index>() + partItr->_startIndex;
auto indexEnd = indexItr + numIndices; auto indexEnd = indexItr + numIndices;
while (indexItr < indexEnd) { while (indexItr != indexEnd) {
triangleIndices.push_back(*indexItr + meshIndexOffset); triangleIndices.push_back(*indexItr + meshIndexOffset);
++indexItr; ++indexItr;
} }
@ -810,7 +810,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
// the rest use previous and next index // the rest use previous and next index
uint32_t triangleCount = 1; uint32_t triangleCount = 1;
while (indexItr < indexEnd) { while (indexItr != indexEnd) {
if ((*indexItr) != model::Mesh::PRIMITIVE_RESTART_INDEX) { if ((*indexItr) != model::Mesh::PRIMITIVE_RESTART_INDEX) {
if (triangleCount % 2 == 0) { if (triangleCount % 2 == 0) {
// even triangles use first two indices in order // even triangles use first two indices in order
@ -843,7 +843,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
auto indexItr = indices.cbegin<const gpu::BufferView::Index>() + partItr->_startIndex; auto indexItr = indices.cbegin<const gpu::BufferView::Index>() + partItr->_startIndex;
auto indexEnd = indexItr + numIndices; auto indexEnd = indexItr + numIndices;
while (indexItr < indexEnd) { while (indexItr != indexEnd) {
uniqueIndices.insert(*indexItr); uniqueIndices.insert(*indexItr);
++indexItr; ++indexItr;
} }
@ -861,7 +861,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& info) {
// the rest use previous and next index // the rest use previous and next index
uint32_t triangleCount = 1; uint32_t triangleCount = 1;
while (indexItr < indexEnd) { while (indexItr != indexEnd) {
if ((*indexItr) != model::Mesh::PRIMITIVE_RESTART_INDEX) { if ((*indexItr) != model::Mesh::PRIMITIVE_RESTART_INDEX) {
if (triangleCount % 2 == 0) { if (triangleCount % 2 == 0) {
// EVEN triangles use first two indices in order // EVEN triangles use first two indices in order