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

- making oscimap default backend

Browse Source 
- added about-screen
- added TreeTile for Tile lookup, dropping that HashMap
- using simple line-shader instead of std-derivatives one,
  about twice as faster here
- use distance calculation from MapRenderer - removing TileScheduler
- no need for MapGeneratorJob, pass MapTile directly to MapWorkers
- added two-finger tap gestures for zoom-in/out
- added tub/tron rendertheme
- started caching for oscimap
- add x/y coordinates to MapPosition, using it in MapRenderer
- create tag hash when needed
- no need for long tile coordinates max zoomlevel 31 should suffice
This commit is contained in:
Hannes Janetzek
2012-09-03 00:13:13 +02:00
parent 78e39af35a
commit 1a27f56313
61 changed files with 2779 additions and 2076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/mapsforge/android/swrenderer/GLMapTile.java
View File

@@ -36,7 +36,7 @@ public class GLMapTile extends MapTile {
* @param zoomLevel
* ..
*/
public GLMapTile(long tileX, long tileY, byte zoomLevel) {
public GLMapTile(int tileX, int tileY, byte zoomLevel) {
super(tileX, tileY, zoomLevel);
mScale = 1;
mTextureID = -1;

29
src/org/mapsforge/android/swrenderer/MapGenerator.java
View File

@@ -17,8 +17,10 @@ package org.mapsforge.android.swrenderer;
import java.util.ArrayList;
import java.util.List;
import org.mapsforge.android.DebugSettings;
import org.mapsforge.android.MapView;
import org.mapsforge.android.mapgenerator.IMapGenerator;
import org.mapsforge.android.mapgenerator.MapGeneratorJob;
import org.mapsforge.android.mapgenerator.MapTile;
import org.mapsforge.android.rendertheme.IRenderCallback;
import org.mapsforge.android.rendertheme.RenderTheme;
import org.mapsforge.android.rendertheme.renderinstruction.Area;
@@ -98,11 +100,16 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
// private long _renderTime;
private int _nodes, _nodesDropped;
private MapView mMapView;
/**
* Constructs a new DatabaseRenderer.
*
* @param mapView
* the MapView
*/
public MapGenerator() {
public MapGenerator(MapView mapView) {
mMapView = mapView;
mCanvasRasterer = new CanvasRasterer();
mLabelPlacement = new LabelPlacement();
@@ -131,13 +138,13 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
}
@Override
public boolean executeJob(MapGeneratorJob mapGeneratorJob) {
public boolean executeJob(MapTile mapTile) {
long time_load = System.currentTimeMillis();
_nodes = 0;
_nodesDropped = 0;
// _renderTime = 0;
mCurrentTile = mapGeneratorJob.tile;
mCurrentTile = mapTile;
mCurrentTileZoom = ((long) Tile.TILE_SIZE << mCurrentTile.zoomLevel);
mCurrentTileX = mCurrentTile.pixelX;
mCurrentTileY = mCurrentTile.pixelY;
@@ -151,7 +158,7 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
//
// mTileWidth = mLon2 - mLon1;
// mTileHeight = mLat1 - mLat2;
mScale = mapGeneratorJob.getScale();
// mScale = mapGeneratorJob.getScale();
// Theme theme = mapGeneratorJob.jobParameters.theme;
// if (!theme.equals(mPreviousJobTheme)) {
@@ -203,18 +210,20 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
mCanvasRasterer.drawNodes(mAreaLabels);
time_draw = System.currentTimeMillis() - time_draw;
if (mapGeneratorJob.debugSettings.mDrawTileFrames) {
DebugSettings debugSettings = mMapView.getDebugSettings();
if (debugSettings.mDrawTileFrames) {
mCanvasRasterer.drawTileFrame();
}
if (mapGeneratorJob.debugSettings.mDrawTileCoordinates) {
if (debugSettings.mDrawTileCoordinates) {
mCanvasRasterer.drawTileCoordinates(mCurrentTile, time_load, time_draw,
_nodes, _nodesDropped);
}
clearLists();
mapGeneratorJob.setBitmap(mTileBitmap);
// mapGeneratorJob.setBitmap(mTileBitmap);
return true;
}
@@ -411,8 +420,8 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
// mPrevLayer = layer;
}
private List<ShapeContainer> mCurLevelContainer1;
private List<ShapeContainer> mCurLevelContainer2;
// private List<ShapeContainer> mCurLevelContainer1;
// private List<ShapeContainer> mCurLevelContainer2;
@Override
public void renderWay(Line line, int level) {

285
src/org/mapsforge/android/swrenderer/MapRenderer.java
View File

@@ -21,17 +21,13 @@ import java.nio.ByteOrder;
import java.nio.FloatBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
import org.mapsforge.android.DebugSettings;
import org.mapsforge.android.MapView;
import org.mapsforge.android.mapgenerator.IMapGenerator;
import org.mapsforge.android.mapgenerator.JobParameters;
import org.mapsforge.android.mapgenerator.MapGeneratorJob;
import org.mapsforge.android.mapgenerator.TileCacheKey;
import org.mapsforge.android.mapgenerator.MapTile;
import org.mapsforge.android.mapgenerator.TileDistanceSort;
import org.mapsforge.android.rendertheme.RenderTheme;
import org.mapsforge.android.utils.GlUtils;
@@ -40,7 +36,6 @@ import org.mapsforge.core.MercatorProjection;
import org.mapsforge.core.Tile;
import android.opengl.GLES20;
import android.opengl.GLUtils;
import android.opengl.Matrix;
/**
@@ -65,11 +60,11 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
private double mDrawX, mDrawY;
private long mTileX, mTileY;
private float mMapScale;
private DebugSettings mDebugSettings;
private JobParameters mJobParameter;
// private DebugSettings mDebugSettings;
// private JobParameters mJobParameter;
private MapPosition mMapPosition, mPrevMapPosition;
private ArrayList<MapGeneratorJob> mJobList;
private ArrayList<MapTile> mJobList;
ArrayList<Integer> mTextures;
MapView mMapView;
@@ -78,8 +73,8 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
GLMapTile[] newTiles;
int currentTileCnt = 0;
private TileCacheKey mTileCacheKey;
private LinkedHashMap<TileCacheKey, GLMapTile> mTiles;
// private TileCacheKey mTileCacheKey;
// private LinkedHashMap<TileCacheKey, GLMapTile> mTiles;
private ArrayList<GLMapTile> mTileList;
private boolean processedTile = true;
@@ -96,7 +91,7 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
*/
public MapRenderer(MapView mapView) {
mMapView = mapView;
mDebugSettings = mapView.getDebugSettings();
// mDebugSettings = mapView.getDebugSettings();
mMapScale = 1;
float[] vertices = {
@@ -110,12 +105,12 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
mVertices.put(vertices);
mTextures = new ArrayList<Integer>();
mJobList = new ArrayList<MapGeneratorJob>();
mJobList = new ArrayList<MapTile>();
mTiles = new LinkedHashMap<TileCacheKey, GLMapTile>(100);
// mTiles = new LinkedHashMap<TileCacheKey, GLMapTile>(100);
mTileList = new ArrayList<GLMapTile>();
mTileCacheKey = new TileCacheKey();
// mTileCacheKey = new TileCacheKey();
mInitial = true;
}
@@ -144,8 +139,8 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
for (int j = mTileList.size() - 1, cnt = 0; cnt < remove; j--, cnt++) {
GLMapTile t = mTileList.remove(j);
mTileCacheKey.set(t.tileX, t.tileY, t.zoomLevel);
mTiles.remove(mTileCacheKey);
// mTileCacheKey.set(t.tileX, t.tileY, t.zoomLevel);
// mTiles.remove(mTileCacheKey);
for (int i = 0; i < 4; i++) {
if (t.child[i] != null)
@@ -176,63 +171,63 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
long pixelLeft = x - offsetX;
long pixelTop = y - offsetY;
long tileLeft = MercatorProjection.pixelXToTileX(pixelLeft, zoomLevel);
long tileTop = MercatorProjection.pixelYToTileY(pixelTop, zoomLevel);
long tileRight = MercatorProjection.pixelXToTileX(pixelRight, zoomLevel);
long tileBottom = MercatorProjection.pixelYToTileY(pixelBottom, zoomLevel);
int tileLeft = MercatorProjection.pixelXToTileX(pixelLeft, zoomLevel);
int tileTop = MercatorProjection.pixelYToTileY(pixelTop, zoomLevel);
int tileRight = MercatorProjection.pixelXToTileX(pixelRight, zoomLevel);
int tileBottom = MercatorProjection.pixelYToTileY(pixelBottom, zoomLevel);
mJobList.clear();
// IMapGenerator mapGenerator = mMapView.getMapGenerator();
int tiles = 0;
for (long tileY = tileTop - 1; tileY <= tileBottom + 1; tileY++) {
for (long tileX = tileLeft - 1; tileX <= tileRight + 1; tileX++) {
for (int tileY = tileTop - 1; tileY <= tileBottom + 1; tileY++) {
for (int tileX = tileLeft - 1; tileX <= tileRight + 1; tileX++) {
GLMapTile tile = mTiles.get(mTileCacheKey.set(tileX, tileY, zoomLevel));
// GLMapTile tile = mTiles.get(mTileCacheKey.set(tileX, tileY, zoomLevel));
//
// if (tile == null) {
// tile = new GLMapTile(tileX, tileY, zoomLevel);
// TileCacheKey key = new TileCacheKey(mTileCacheKey);
// mTiles.put(key, tile);
//
// mTileCacheKey.set((tileX >> 1), (tileY >> 1), (byte) (zoomLevel - 1));
// tile.parent = mTiles.get(mTileCacheKey);
//
// long xx = tileX << 1;
// long yy = tileY << 1;
// byte z = (byte) (zoomLevel + 1);
//
// tile.child[0] = mTiles.get(mTileCacheKey.set(xx, yy, z));
// tile.child[1] = mTiles.get(mTileCacheKey.set(xx + 1, yy, z));
// tile.child[2] = mTiles.get(mTileCacheKey.set(xx, yy + 1, z));
// tile.child[3] = mTiles.get(mTileCacheKey.set(xx + 1, yy + 1, z));
//
// mTileList.add(tile);
// }
if (tile == null) {
tile = new GLMapTile(tileX, tileY, zoomLevel);
TileCacheKey key = new TileCacheKey(mTileCacheKey);
mTiles.put(key, tile);
mTileCacheKey.set((tileX >> 1), (tileY >> 1), (byte) (zoomLevel - 1));
tile.parent = mTiles.get(mTileCacheKey);
long xx = tileX << 1;
long yy = tileY << 1;
byte z = (byte) (zoomLevel + 1);
tile.child[0] = mTiles.get(mTileCacheKey.set(xx, yy, z));
tile.child[1] = mTiles.get(mTileCacheKey.set(xx + 1, yy, z));
tile.child[2] = mTiles.get(mTileCacheKey.set(xx, yy + 1, z));
tile.child[3] = mTiles.get(mTileCacheKey.set(xx + 1, yy + 1, z));
mTileList.add(tile);
}
newTiles[tiles++] = tile;
if (!tile.isReady || (tile.getScale() != scale)) {
// tile.isLoading = true;
// approximation for TileScheduler
if (tileY < tileTop || tileY > tileBottom || tileX < tileLeft
|| tileX > tileRight)
tile.isVisible = false;
else
tile.isVisible = true;
MapGeneratorJob job = new MapGeneratorJob(tile, mJobParameter,
mDebugSettings);
job.setScale(scale);
mJobList.add(job);
}
// newTiles[tiles++] = tile;
//
// if (!tile.isReady || (tile.getScale() != scale)) {
// // tile.isLoading = true;
// // approximation for TileScheduler
// if (tileY < tileTop || tileY > tileBottom || tileX < tileLeft
// || tileX > tileRight)
// tile.isVisible = false;
// else
// tile.isVisible = true;
//
// MapGeneratorJob job = new MapGeneratorJob(tile, mJobParameter,
// mDebugSettings);
// job.setScale(scale);
// mJobList.add(job);
// }
}
}
synchronized (this) {
limitCache(zoomLevel, (mTiles.size() - 200));
limitCache(zoomLevel, (mTileList.size() - 200));
for (int i = 0; i < tiles; i++)
currentTiles[i] = newTiles[i];
@@ -243,9 +238,9 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
mMapScale = scale;
}
if (mJobList.size() > 0) {
mMapView.addJobs(mJobList);
}
// if (mJobList.size() > 0) {
// mMapView.addJobs(mJobList);
// }
return true;
}
@@ -260,12 +255,8 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
mMapPosition = mMapView.getMapPosition().getMapPosition();
long x = (long) MercatorProjection.longitudeToPixelX(
mMapPosition.geoPoint.getLongitude(),
mMapPosition.zoomLevel);
long y = (long) MercatorProjection
.latitudeToPixelY(mMapPosition.geoPoint.getLatitude(),
mMapPosition.zoomLevel);
long x = (long) MercatorProjection.longitudeToPixelX(mMapPosition);
long y = (long) MercatorProjection.latitudeToPixelY(mMapPosition);
long tileX = MercatorProjection.pixelXToTileX(x, mMapPosition.zoomLevel);
long tileY = MercatorProjection.pixelYToTileY(y, mMapPosition.zoomLevel);
@@ -304,12 +295,12 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
mMapView.requestRender();
}
private MapGeneratorJob mMapGeneratorJob = null;
// private MapGeneratorJob mMapGeneratorJob = null;
@Override
public boolean passTile(MapGeneratorJob mapGeneratorJob) {
public boolean passTile(MapTile mapTile) {
mMapGeneratorJob = mapGeneratorJob;
// mMapGeneratorJob = mapGeneratorJob;
processedTile = false;
mMapView.requestRender();
@@ -344,11 +335,11 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
} else {
z = 1.0f / (1 << -diff);
}
drawX = MercatorProjection
.longitudeToPixelX(mMapPosition.geoPoint.getLongitude(),
tile.zoomLevel);
drawY = MercatorProjection
.latitudeToPixelY(mMapPosition.geoPoint.getLatitude(), tile.zoomLevel);
// drawX = MercatorProjection
// .longitudeToPixelX(mMapPosition.geoPoint.getLongitude(),
// tile.zoomLevel);
// drawY = MercatorProjection
// .latitudeToPixelY(mMapPosition.geoPoint.getLatitude(), tile.zoomLevel);
}
@@ -430,71 +421,71 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
GLES20.glEnable(GLES20.GL_SCISSOR_TEST);
// lock position and currentTiles while drawing
synchronized (this) {
if (mMapGeneratorJob != null) {
tile = (GLMapTile) mMapGeneratorJob.tile;
// TODO tile bitmaps texture to smaller parts avoiding uploading full
// bitmap when not necessary
if (tile.getTexture() >= 0) {
// reuse tile texture
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, tile.getTexture());
GLUtils.texSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0,
mMapGeneratorJob.getBitmap());
} else if (mTextures.size() > 0) {
// reuse texture from previous tiles
Integer texture;
texture = mTextures.remove(mTextures.size() - 1);
GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texture.intValue());
GLUtils.texSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0,
mMapGeneratorJob.getBitmap());
tile.setTexture(texture.intValue());
} else {
// create texture
tile.setTexture(GlUtils.loadTextures(mMapGeneratorJob.getBitmap()));
}
tile.setScale(mMapGeneratorJob.getScale());
tile.isReady = true;
tile.isLoading = false;
mMapGeneratorJob = null;
processedTile = true;
// loadedTexture = true;
}
int tileSize = (int) (Tile.TILE_SIZE * mMapScale);
int hWidth = mWidth >> 1;
int hHeight = mHeight >> 1;
for (int i = 0, n = currentTileCnt; i < n; i++) {
tile = currentTiles[i];
float x = (float) (tile.pixelX - mDrawX);
float y = (float) (tile.pixelY - mDrawY);
// clip rendering to tile boundaries
GLES20.glScissor(
hWidth + (int) (x * mMapScale) - 2,
hHeight - (int) (y * mMapScale) - tileSize - 2,
tileSize + 4, tileSize + 4);
if (drawTile(tile, 0, 0.0f))
continue;
// or two zoom level above
for (int k = 0; k < 4; k++) {
if (((child = tile.child[k]) != null)) {
if (drawTile(child, 2, 0.1f))
continue;
for (int j = 0; j < 4; j++)
if ((child2 = child.child[j]) != null)
drawTile(child2, 2, 0.1f);
}
}
}
}
// synchronized (this) {
// if (mMapGeneratorJob != null) {
//
// tile = (GLMapTile) mMapGeneratorJob.tile;
// // TODO tile bitmaps texture to smaller parts avoiding uploading full
// // bitmap when not necessary
// if (tile.getTexture() >= 0) {
// // reuse tile texture
// GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, tile.getTexture());
// GLUtils.texSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0,
// mMapGeneratorJob.getBitmap());
// } else if (mTextures.size() > 0) {
// // reuse texture from previous tiles
// Integer texture;
// texture = mTextures.remove(mTextures.size() - 1);
//
// GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texture.intValue());
// GLUtils.texSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0,
// mMapGeneratorJob.getBitmap());
// tile.setTexture(texture.intValue());
// } else {
// // create texture
// tile.setTexture(GlUtils.loadTextures(mMapGeneratorJob.getBitmap()));
// }
//
// tile.setScale(mMapGeneratorJob.getScale());
// tile.isReady = true;
// tile.isLoading = false;
//
// mMapGeneratorJob = null;
// processedTile = true;
// // loadedTexture = true;
// }
// int tileSize = (int) (Tile.TILE_SIZE * mMapScale);
// int hWidth = mWidth >> 1;
// int hHeight = mHeight >> 1;
// for (int i = 0, n = currentTileCnt; i < n; i++) {
// tile = currentTiles[i];
//
// float x = (float) (tile.pixelX - mDrawX);
// float y = (float) (tile.pixelY - mDrawY);
//
// // clip rendering to tile boundaries
// GLES20.glScissor(
// hWidth + (int) (x * mMapScale) - 2,
// hHeight - (int) (y * mMapScale) - tileSize - 2,
// tileSize + 4, tileSize + 4);
//
// if (drawTile(tile, 0, 0.0f))
// continue;
//
// // or two zoom level above
// for (int k = 0; k < 4; k++) {
// if (((child = tile.child[k]) != null)) {
//
// if (drawTile(child, 2, 0.1f))
// continue;
//
// for (int j = 0; j < 4; j++)
// if ((child2 = child.child[j]) != null)
// drawTile(child2, 2, 0.1f);
// }
// }
// }
// }
}
@Override
@@ -508,10 +499,10 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
GLES20.glViewport(0, 0, width, height);
mDebugSettings = mMapView.getDebugSettings();
mJobParameter = mMapView.getJobParameters();
// mDebugSettings = mMapView.getDebugSettings();
// mJobParameter = mMapView.getJobParameters();
mTiles.clear();
// mTiles.clear();
mTileList.clear();
mTextures.clear();
mInitial = true;
@@ -581,7 +572,7 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
@Override
public IMapGenerator createMapGenerator() {
return new MapGenerator();
return new MapGenerator(mMapView);
}
@Override