Skip to content

Hot fix for https://github.com/tangrams/tangram-es/issues/1167 #1185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tallytalwar merged 2 commits into from
Dec 16, 2016
Merged

Hot fix for https://github.com/tangrams/tangram-es/issues/1167 #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
287ce2e
Hot fix for https://github.com/tangrams/tangram-es/issues/1167
karimnaaji Dec 15, 2016
af1859d
Cleanup
karimnaaji Dec 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion core/src/labels/labels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,16 @@ void Labels::processLabelUpdate(const ViewState& viewState,
m_needUpdate |= label->evalState(dt);
label->addVerticesToMesh();
}
if (label->selectionColor()) {
m_selectionLabels.emplace_back(label.get(), tile, isProxy);
}
}
}


std::pair<Label*, Tile*> Labels::getLabel(uint32_t _selectionColor) {

for (auto& entry : m_labels) {
for (auto& entry : m_selectionLabels) {

if (entry.label->visibleState() &&
entry.label->selectionColor() == _selectionColor) {
Expand All @@ -86,6 +89,8 @@ void Labels::updateLabels(const ViewState& _viewState, float _dt,

if (!_onlyTransitions) { m_labels.clear(); }

m_selectionLabels.clear();

m_needUpdate = false;

// int lodDiscard = LODDiscardFunc(View::s_maxZoom, _view.getZoom());
Expand Down
1 change: 1 addition & 0 deletions core/src/labels/labels.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class Labels {
static bool labelComparator(const LabelEntry& _a, const LabelEntry& _b);

std::vector<LabelEntry> m_labels;
std::vector<LabelEntry> m_selectionLabels;

std::unordered_map<size_t, std::vector<Label*>> m_repeatGroups;

Expand Down