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

don't permanently crossfade line patterns

Browse Source 
js: a2e8527b4023d19fa0c58130a105aaf283f4b152
This commit is contained in:
Ansis Brammanis
2015-01-23 17:12:41 -05:00
parent c5d5a799be
commit d0d33a3ee7
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mbgl/renderer/painter_line.cpp
View File

@@ -70,6 +70,10 @@ void Painter::renderLine(LineBucket& bucket, util::ptr<StyleLayer> layer_desc, c
bucket.drawPoints(*linejoinShader);
}
float duration = 300 * 1_millisecond;
const float fraction = std::fmod(float(state.getZoom()), 1.0f);
float t = std::min((util::now() - lastIntegerZoomTime) / duration, 1.0f);
if (properties.dash_array.size()) {
useProgram(linesdfShader->program);
@@ -99,7 +103,15 @@ void Painter::renderLine(LineBucket& bucket, util::ptr<StyleLayer> layer_desc, c
SpriteAtlasPosition imagePos = spriteAtlas.getPosition(properties.image, true);
float factor = 8.0 / std::pow(2, state.getIntegerZoom() - id.z);
float fade = std::fmod(state.getZoom(), 1.0);
float fade;
if (state.getZoom() > lastIntegerZoom) {
// zooming in
fade = fraction + (1.0f - fraction) * t;
factor *= 2.0;
} else {
// zooming out
fade = fraction - fraction * t;
}
useProgram(linepatternShader->program);