xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BitmapTileLayer: fade steps enhancements, support for permanent transparency (#444)

Browse Source
This commit is contained in:
Andrey Novikov 2017-11-13 11:07:49 +03:00 committed by Emux
parent fe2c067272
commit f9e06c80ad
No known key found for this signature in database
GPG Key ID: 89C6921D7AF2BDD0
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vtm/src/org/oscim/layers/tile/bitmap/BitmapTileLayer.java
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2017 Andrey Novikov
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -36,6 +37,7 @@ public class BitmapTileLayer extends TileLayer {
private final static int CACHE_LIMIT = 40; private final static int CACHE_LIMIT = 40;
protected final TileSource mTileSource; protected final TileSource mTileSource;
private float mBitmapAlpha;
public static class FadeStep { public static class FadeStep {
public final double scaleStart, scaleEnd; public final double scaleStart, scaleEnd;
@ -47,13 +49,28 @@ public class BitmapTileLayer extends TileLayer {
this.alphaStart = alphaStart; this.alphaStart = alphaStart;
this.alphaEnd = alphaEnd; this.alphaEnd = alphaEnd;
} }
public FadeStep(double scaleStart, double scaleEnd, float alphaStart, float alphaEnd) {
this.scaleStart = scaleStart;
this.scaleEnd = scaleEnd;
this.alphaStart = alphaStart;
this.alphaEnd = alphaEnd;
}
} }
public BitmapTileLayer(Map map, TileSource tileSource) { public BitmapTileLayer(Map map, TileSource tileSource) {
this(map, tileSource, CACHE_LIMIT); this(map, tileSource, CACHE_LIMIT);
} }
public BitmapTileLayer(Map map, TileSource tileSource, float bitmapAlpha) {
this(map, tileSource, CACHE_LIMIT, bitmapAlpha);
}
public BitmapTileLayer(Map map, TileSource tileSource, int cacheLimit) { public BitmapTileLayer(Map map, TileSource tileSource, int cacheLimit) {
this(map, tileSource, cacheLimit, 0f);
}
public BitmapTileLayer(Map map, TileSource tileSource, int cacheLimit, float bitmapAlpha) {
super(map, super(map,
new TileManager(map, cacheLimit), new TileManager(map, cacheLimit),
new VectorTileRenderer()); new VectorTileRenderer());
@ -62,7 +79,16 @@ public class BitmapTileLayer extends TileLayer {
tileSource.getZoomLevelMax()); tileSource.getZoomLevelMax());
mTileSource = tileSource; mTileSource = tileSource;
mBitmapAlpha = bitmapAlpha;
tileRenderer().setBitmapAlpha(mBitmapAlpha);
initLoader(getNumLoaders()); initLoader(getNumLoaders());
setFade(map.getMapPosition());
}
public void setBitmapAlpha(float bitmapAlpha) {
mBitmapAlpha = bitmapAlpha;
tileRenderer().setBitmapAlpha(mBitmapAlpha);
map().updateMap(true);
} }
@Override @Override
@ -72,6 +98,10 @@ public class BitmapTileLayer extends TileLayer {
if (event != Map.POSITION_EVENT) if (event != Map.POSITION_EVENT)
return; return;
setFade(pos);
}
private void setFade(MapPosition pos) {
FadeStep[] fade = mTileSource.getFadeSteps(); FadeStep[] fade = mTileSource.getFadeSteps();
if (fade == null) { if (fade == null) {
@ -79,7 +109,7 @@ public class BitmapTileLayer extends TileLayer {
return; return;
} }
float alpha = 0; float alpha = 0f;
for (FadeStep f : fade) { for (FadeStep f : fade) {
if (pos.scale < f.scaleStart || pos.scale > f.scaleEnd) if (pos.scale < f.scaleStart || pos.scale > f.scaleEnd)
continue; continue;
@ -88,14 +118,15 @@ public class BitmapTileLayer extends TileLayer {
alpha = f.alphaStart; alpha = f.alphaStart;
break; break;
} }
double range = f.scaleEnd / f.scaleStart; double range = f.scaleEnd - f.scaleStart;
float a = (float) ((range - (pos.scale / f.scaleStart)) / range); float a = (float) ((pos.scale - f.scaleStart) / range);
a = FastMath.clamp(a, 0, 1); a = FastMath.clamp(a, 0f, 1f);
// interpolate alpha between start and end // interpolate alpha between start and end
alpha = a * f.alphaStart + (1 - a) * f.alphaEnd; alpha = (1 - a) * f.alphaStart + a * f.alphaEnd;
break; break;
} }
alpha = FastMath.clamp(alpha, 0f, mBitmapAlpha);
tileRenderer().setBitmapAlpha(alpha); tileRenderer().setBitmapAlpha(alpha);
} }

5
vtm/src/org/oscim/tiling/TileSource.java
View File

@ -1,6 +1,7 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016-2017 devemux86 * Copyright 2016-2017 devemux86
* Copyright 2017 Andrey Novikov
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -110,6 +111,10 @@ public abstract class TileSource {
return mZoomMin; return mZoomMin;
} }
public void setFadeSteps(FadeStep[] fadeSteps) {
mFadeSteps = fadeSteps;
}
public FadeStep[] getFadeSteps() { public FadeStep[] getFadeSteps() {
return mFadeSteps; return mFadeSteps;
} }