tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into libuv010

Browse Source 
Conflicts:
	setup-libraries.sh
This commit is contained in:
Mike Morris
2014-08-26 16:55:08 -04:00
parent 7ae3b8e8ee 60f7813544
commit 050b00cb58
29 changed files with 440 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/map/map.cpp
View File

@@ -511,18 +511,12 @@ void Map::updateTiles() {
}
void Map::updateRenderState() {
std::forward_list<Tile::ID> ids;
// Update all clipping IDs.
ClipIDGenerator generator;
for (const std::shared_ptr<StyleSource> &source : getActiveSources()) {
ids.splice_after(ids.before_begin(), source->source->getIDs());
generator.update(source->source->getLoadedTiles());
source->source->updateMatrices(painter.projMatrix, state);
}
const std::map<Tile::ID, ClipID> clipIDs = computeClipIDs(ids);
for (const std::shared_ptr<StyleSource> &source : getActiveSources()) {
source->source->updateClipIDs(clipIDs);
}
}
void Map::prepare() {