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

improve distance function, hard to get active/proxy tiles in limitCache now

Browse Source
This commit is contained in:
Hannes Janetzek 2012-09-07 21:12:22 +02:00
parent 2f0270e696
commit c01aa685a2
1 changed files with 85 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/org/mapsforge/android/glrenderer/MapRenderer.java
View File

@ -65,7 +65,7 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
private static final int MAX_TILES_IN_QUEUE = 40; private static final int MAX_TILES_IN_QUEUE = 40;
private static final int CACHE_TILES_MAX = 250; private static final int CACHE_TILES_MAX = 250;
private static final int LIMIT_BUFFERS = 12 * MB; private static final int LIMIT_BUFFERS = 16 * MB;
private static int CACHE_TILES = CACHE_TILES_MAX; private static int CACHE_TILES = CACHE_TILES_MAX;
@ -156,14 +156,16 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
MapPosition mapPosition) { MapPosition mapPosition) {
int h = (Tile.TILE_SIZE >> 1); int h = (Tile.TILE_SIZE >> 1);
byte zoom = mapPosition.zoomLevel; byte zoom = mapPosition.zoomLevel;
long x = mTileX + h; long x = (long) mapPosition.x;
long y = mTileY + h; long y = (long) mapPosition.y;
int diff; int diff;
long dx, dy; long dx, dy;
int cnt = 0; int cnt = 0;
// TODO this could need some fixing.. // TODO this could need some fixing, and optimization
// and be optimized to consider move/zoom direction // to consider move/zoom direction
for (int i = 0, n = tiles.size(); i < n; i++) { for (int i = 0, n = tiles.size(); i < n; i++) {
MapTile t = (MapTile) tiles.get(i); MapTile t = (MapTile) tiles.get(i);
diff = (t.zoomLevel - zoom); diff = (t.zoomLevel - zoom);
@ -173,28 +175,30 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
if (diff == 0) { if (diff == 0) {
dx = (t.pixelX + h) - x; dx = (t.pixelX + h) - x;
dy = (t.pixelY + h) - y; dy = (t.pixelY + h) - y;
t.distance = ((dx > 0 ? dx : -dx) + (dy > 0 ? dy : -dy)) * 0.25f; // t.distance = ((dx > 0 ? dx : -dx) + (dy > 0 ? dy : -dy)) * 0.25f;
// t.distance = FloatMath.sqrt((dx * dx + dy * dy)) * 0.25f; t.distance = FloatMath.sqrt((dx * dx + dy * dy)) * 0.25f;
} else if (diff > 0) { } else if (diff > 0) {
// tile zoom level is child of current // tile zoom level is child of current
if (diff < 3) {
dx = ((t.pixelX + h) >> diff) - x; dx = ((t.pixelX + h) >> diff) - x;
dy = ((t.pixelY + h) >> diff) - y; dy = ((t.pixelY + h) >> diff) - y;
}
// dy *= mAspect; else {
t.distance = ((dx > 0 ? dx : -dx) + (dy > 0 ? dy : -dy)) * diff; dx = ((t.pixelX + h) >> (diff >> 1)) - x;
// t.distance = FloatMath.sqrt((dx * dx + dy * dy)) * diff; dy = ((t.pixelY + h) >> (diff >> 1)) - y;
}
// t.distance = ((dx > 0 ? dx : -dx) + (dy > 0 ? dy : -dy));
t.distance = FloatMath.sqrt((dx * dx + dy * dy));
} else { } else {
// tile zoom level is parent of current // tile zoom level is parent of current
dx = ((t.pixelX + h) << -diff) - x; dx = ((t.pixelX + h) << -diff) - x;
dy = ((t.pixelY + h) << -diff) - y; dy = ((t.pixelY + h) << -diff) - y;
t.distance = ((dx > 0 ? dx : -dx) + (dy > 0 ? dy : -dy)) // t.distance = ((dx > 0 ? dx : -dx) + (dy > 0 ? dy : -dy)) * (-diff * 0.5f);
* (-diff * 0.5f); t.distance = FloatMath.sqrt((dx * dx + dy * dy)) * (-diff * 0.5f);
// t.distance = FloatMath.sqrt((dx * dx + dy * dy)) * (-diff * 0.5f);
} }
// Log.d(TAG, diff + " " + (float) t.distance / Tile.TILE_SIZE + " " + t);
} }
return cnt; return cnt;
} }
@ -215,45 +219,47 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
} }
// FIXME still the chance that one jumped two zoomlevels between cur and draw... // FIXME still the chance that one jumped two zoomlevels between cur and draw...
// and this is a bit heavy in the first place // and this is all a bit heavy in the first place
private static boolean tileInUse(GLMapTile t) { private static boolean tileInUse(GLMapTile t) {
byte z = mPrevZoom; byte z = mPrevZoom;
if (t.isActive) { if (t.isActive) {
return true; return true;
} else if (t.zoomLevel == z + 1) { } else if (t.zoomLevel == z + 1) {
GLMapTile p = t.rel.parent.tile; GLMapTile p = t.rel.parent.tile;
if (p != null && p.isActive && !(p.isReady || p.newData)) if (p != null && p.isActive && !(p.isReady || p.newData))
return true; return true;
} else if (t.zoomLevel == z + 2) { } else if (t.zoomLevel == z + 2) {
GLMapTile p = t.rel.parent.parent.tile; GLMapTile p = t.rel.parent.parent.tile;
if (p != null && p.isActive && !(p.isReady || p.newData)) if (p != null && p.isActive && !(p.isReady || p.newData))
return true; return true;
} else if (t.zoomLevel == z - 1) { } else if (t.zoomLevel == z - 1) {
if (childIsActive(t)) if (childIsActive(t))
return true; return true;
} else if (t.zoomLevel == z - 2) { } else if (t.zoomLevel == z - 2) {
for (int i = 0; i < 4; i++) { for (TreeTile c : t.rel.child) {
if (t.rel.child[i] == null) if (c == null)
continue; continue;
GLMapTile child = t.rel.child[i].tile; if (c.tile != null && childIsActive(c.tile))
if (child != null && childIsActive(child))
return true; return true;
} }
} else if (t.zoomLevel == z - 3) { } else if (t.zoomLevel == z - 3) {
for (int i = 0; i < 4; i++) { for (TreeTile c : t.rel.child) {
if (t.rel.child[i] == null) if (c == null)
continue; continue;
TreeTile c = t.rel.child[i];
for (int j = 0; j < 4; j++) { for (TreeTile c2 : c.child) {
if (c.child[j] == null) if (c2 == null)
continue; continue;
GLMapTile child = c.child[j].tile;
if (child != null && childIsActive(child)) if (c2.tile != null && childIsActive(c2.tile))
return true; return true;
} }
} }
@ -262,9 +268,9 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
} }
private static void limitCache(int remove) { private static void limitCache(int remove) {
boolean printAll = false;
for (int j = mTiles.size() - 1, cnt = 0; cnt < remove && j > 0; j--) { for (int j = mTiles.size() - 1, cnt = 0; cnt < remove && j > 0; j--, cnt++) {
GLMapTile t = mTiles.remove(j); GLMapTile t = mTiles.remove(j);
synchronized (t) { synchronized (t) {
@ -273,10 +279,16 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
// dont remove tile used by renderthread or mapgenerator // dont remove tile used by renderthread or mapgenerator
Log.d(TAG, "X not removing active " + t + " " + t.distance); Log.d(TAG, "X not removing active " + t + " " + t.distance);
mTiles.add(t); mTiles.add(t);
if (printAll) {
printAll = false;
for (GLMapTile tt : mTiles)
Log.d(TAG, ">>>" + tt + " " + tt.distance);
}
} else if ((t.isReady || t.newData) && tileInUse(t)) { } else if ((t.isReady || t.newData) && tileInUse(t)) {
// check if this tile could be used as proxy // check if this tile could be used as proxy
// for not yet drawn active tile // for not yet drawn active tile
Log.d(TAG, "X not removing proxy: " + t); Log.d(TAG, "X not removing proxy: " + t + " " + t.distance);
mTiles.add(t); mTiles.add(t);
} else { } else {
if (t.isLoading) { if (t.isLoading) {
@ -285,7 +297,6 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
} }
clearTile(t); clearTile(t);
cnt++;
} }
} }
} }
@ -401,9 +412,46 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
int removes = mTiles.size() - CACHE_TILES; int removes = mTiles.size() - CACHE_TILES;
if (removes > 10) { if (removes > 10) {
// int size = mTiles.size();
// for (int i = 0; i < size;) {
// GLMapTile cur = mTiles.get(i);
// if (!cur.isActive && !cur.isLoading && !cur.newData && !cur.isReady) {
// // Log.d(TAG, "remove empty tile" + cur);
// mTiles.remove(i);
// TreeTile.remove(cur);
// removes--;
// size--;
// continue;
// }
// i++;
// }
int size = mTiles.size();
updateTileDistances(mTiles, mapPosition); updateTileDistances(mTiles, mapPosition);
Collections.sort(mTiles); // Log.d(TAG, "remove tiles: " + removes);
// find 'removes' tiles with longest distance and
// move them at the end
for (int i = 1; i <= removes; i++) {
int pos = 0;
GLMapTile t = mTiles.get(0);
for (int j = 1; j <= size - i; j++) {
GLMapTile t2 = mTiles.get(j);
if (t2.distance > t.distance) {
t = t2;
pos = j;
}
}
// Log.d(TAG, "mark for removal" + cur);
mTiles.add(size - i, mTiles.remove(pos));
}
// Collections.sort(mTiles);
limitCache(removes); limitCache(removes);
} }
return true; return true;
@ -843,8 +891,6 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
} }
} }
checkBufferUsage();
int tileCnt = drawTiles.cnt; int tileCnt = drawTiles.cnt;
GLMapTile[] tiles = drawTiles.tiles; GLMapTile[] tiles = drawTiles.tiles;
@ -884,6 +930,9 @@ public class MapRenderer implements org.mapsforge.android.IMapRenderer {
} }
} }
if (uploadCnt > 0)
checkBufferUsage();
if (updateTextures > 0) if (updateTextures > 0)
TextRenderer.compileTextures(); TextRenderer.compileTextures();