diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-11-14 11:57:02 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-11-15 12:39:49 -0800 |
| commit | bcad3b6d4b4066e151db51a6abc8618ed1d39f46 (patch) | |
| tree | 8bbe44fc84bbfdf0d90eb98f1d1348a4d0ed584c /src/mbgl/layout/symbol_layout.cpp | |
| parent | aeba7cce84bc066d19e8e695be29ce301d06b9c0 (diff) | |
| download | qtlocation-mapboxgl-bcad3b6d4b4066e151db51a6abc8618ed1d39f46.tar.gz | |
[core] Use indexed rendering for collision boxes
Diffstat (limited to 'src/mbgl/layout/symbol_layout.cpp')
| -rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index 932745aa57..d974e6a357 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -507,14 +507,28 @@ void SymbolLayout::addToDebugBuffers(CollisionTile& collisionTile, SymbolBucket& const float maxZoom = util::clamp(zoom + util::log2(box.maxScale), util::MIN_ZOOM_F, util::MAX_ZOOM_F); const float placementZoom = util::clamp(zoom + util::log2(box.placementScale), util::MIN_ZOOM_F, util::MAX_ZOOM_F); - collisionBox.vertices.emplace_back(CollisionBoxProgram::vertex(anchor, tl, maxZoom, placementZoom), - CollisionBoxProgram::vertex(anchor, tr, maxZoom, placementZoom)); - collisionBox.vertices.emplace_back(CollisionBoxProgram::vertex(anchor, tr, maxZoom, placementZoom), - CollisionBoxProgram::vertex(anchor, br, maxZoom, placementZoom)); - collisionBox.vertices.emplace_back(CollisionBoxProgram::vertex(anchor, br, maxZoom, placementZoom), - CollisionBoxProgram::vertex(anchor, bl, maxZoom, placementZoom)); - collisionBox.vertices.emplace_back(CollisionBoxProgram::vertex(anchor, bl, maxZoom, placementZoom), - CollisionBoxProgram::vertex(anchor, tl, maxZoom, placementZoom)); + static constexpr std::size_t vertexLength = 4; + static constexpr std::size_t indexLength = 8; + + if (collisionBox.segments.empty() || collisionBox.segments.back().vertexLength + vertexLength > std::numeric_limits<uint16_t>::max()) { + collisionBox.segments.emplace_back(collisionBox.vertices.vertexSize(), collisionBox.lines.indexSize()); + } + + auto& segment = collisionBox.segments.back(); + uint16_t index = segment.vertexLength; + + collisionBox.vertices.emplace_back(CollisionBoxProgram::vertex(anchor, tl, maxZoom, placementZoom)); + collisionBox.vertices.emplace_back(CollisionBoxProgram::vertex(anchor, tr, maxZoom, placementZoom)); + collisionBox.vertices.emplace_back(CollisionBoxProgram::vertex(anchor, br, maxZoom, placementZoom)); + collisionBox.vertices.emplace_back(CollisionBoxProgram::vertex(anchor, bl, maxZoom, placementZoom)); + + collisionBox.lines.emplace_back(index + 0, index + 1); + collisionBox.lines.emplace_back(index + 1, index + 2); + collisionBox.lines.emplace_back(index + 2, index + 3); + collisionBox.lines.emplace_back(index + 3, index + 0); + + segment.vertexLength += vertexLength; + segment.indexLength += indexLength; } }; populateCollisionBox(symbolInstance.textCollisionFeature); |