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

gwt: use LoadDelayTask to only load max one tile per frame

Browse Source
This commit is contained in:
Hannes Janetzek 2014-03-17 01:18:35 +01:00
parent a46940a6b1
commit 818ea0b0c7
4 changed files with 65 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/LoadDelayTask.java Normal file
View File

@ -0,0 +1,19 @@
package org.oscim.layers.tile;
import org.oscim.renderer.MapRenderer;
import com.badlogic.gdx.Gdx;
public abstract class LoadDelayTask implements Runnable {
@Override
public void run() {
if (MapRenderer.frametime == TileLoader.lastLoadTime) {
Gdx.app.postRunnable(this);
return;
}
continueLoading();
}
public abstract void continueLoading();
}

14
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/TileLoader.java
View File

@ -19,12 +19,16 @@ import static org.oscim.tiling.ITileDataSink.QueryResult.SUCCESS;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
import org.oscim.core.MapElement; import org.oscim.core.MapElement;
import org.oscim.renderer.MapRenderer;
import org.oscim.tiling.ITileDataSink; import org.oscim.tiling.ITileDataSink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer;
public abstract class TileLoader implements ITileDataSink { public abstract class TileLoader implements ITileDataSink {
final static Logger log = LoggerFactory.getLogger(TileLoader.class);
private final TileManager mTileManager; private final TileManager mTileManager;
private Timer mTimer; private Timer mTimer;
@ -98,6 +102,8 @@ public abstract class TileLoader implements ITileDataSink {
} }
} }
public static long lastLoadTime;
/** /**
* Callback to be called by TileDataSource when finished * Callback to be called by TileDataSource when finished
* loading or on failure. MUST BE CALLED IN ANY CASE! * loading or on failure. MUST BE CALLED IN ANY CASE!
@ -105,6 +111,10 @@ public abstract class TileLoader implements ITileDataSink {
@Override @Override
public void completed(QueryResult result) { public void completed(QueryResult result) {
boolean success = (result == SUCCESS) && !isInterrupted; boolean success = (result == SUCCESS) && !isInterrupted;
long now = MapRenderer.frametime;
log.debug("completed {} diff time:{}", mTile, (now - lastLoadTime));
lastLoadTime = now;
mTileManager.jobCompleted(mTile, success); mTileManager.jobCompleted(mTile, success);
mTile = null; mTile = null;
@ -138,4 +148,8 @@ public abstract class TileLoader implements ITileDataSink {
} }
public static void postLoadDelay(LoadDelayTask task) {
Gdx.app.postRunnable(task);
}
} }

39
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/UrlTileDataSource.java
View File

@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import org.oscim.layers.tile.MapTile; import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.TileLoader;
import org.oscim.tiling.ITileDataSink; import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.ITileDataSource; import org.oscim.tiling.ITileDataSource;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -58,25 +59,31 @@ public class UrlTileDataSource implements ITileDataSource {
} }
} }
public void process(InputStream is) { public void process(final InputStream is) {
TileLoader.postLoadDelay(new org.oscim.layers.tile.LoadDelayTask() {
boolean win = false; @Override
if (is != null) { public void continueLoading() {
try { boolean win = false;
win = mTileDecoder.decode(mTile, mSink, is); if (is != null) {
} catch (IOException e) { try {
e.printStackTrace(); win = mTileDecoder.decode(mTile, mSink, is);
} catch (IOException e) {
e.printStackTrace();
}
}
if (!win)
log.debug("{} failed", mTile);
mConn.requestCompleted();
mSink.completed(win ? SUCCESS : FAILED);
mTile = null;
mSink = null;
} }
} });
if (!win)
log.debug("{} failed", mTile);
mConn.requestCompleted();
mSink.completed(win ? SUCCESS : FAILED);
mTile = null;
mSink = null;
} }
@Override @Override

11
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/tiling/source/bitmap/BitmapTileSource.java
View File

@ -5,6 +5,7 @@ import static org.oscim.tiling.ITileDataSink.QueryResult.SUCCESS;
import org.oscim.gdx.client.GwtBitmap; import org.oscim.gdx.client.GwtBitmap;
import org.oscim.layers.tile.MapTile; import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.TileLoader;
import org.oscim.tiling.ITileDataSink; import org.oscim.tiling.ITileDataSink;
import org.oscim.tiling.ITileDataSource; import org.oscim.tiling.ITileDataSource;
import org.oscim.tiling.source.LwHttp; import org.oscim.tiling.source.LwHttp;
@ -75,8 +76,14 @@ public abstract class BitmapTileSource extends UrlTileSource {
img.addLoadHandler(new LoadHandler() { img.addLoadHandler(new LoadHandler() {
public void onLoad(LoadEvent event) { public void onLoad(LoadEvent event) {
sink.setTileImage(new GwtBitmap(img)); TileLoader.postLoadDelay(new org.oscim.layers.tile.LoadDelayTask() {
sink.completed(SUCCESS);
@Override
public void continueLoading() {
sink.setTileImage(new GwtBitmap(img));
sink.completed(SUCCESS);
}
});
} }
}); });