use v2 tile source

This commit is contained in:
Hannes Janetzek 2013-07-03 03:24:34 +02:00
parent 9408e92d5d
commit 6fbd84a76f
2 changed files with 31 additions and 29 deletions

View File

@ -1,28 +0,0 @@
package org.oscim.gdx.client;
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.gdx.GdxMap;
import org.oscim.tilesource.TileSource;
import com.badlogic.gdx.Gdx;
public class GwtGdxMap extends GdxMap {
public GwtGdxMap(TileSource tileSource) {
super(tileSource);
}
@Override
public void create() {
CanvasAdapter.g = GwtCanvasAdapter.INSTANCE;
GLAdapter.g = (GL20)Gdx.graphics.getGL20();
GLAdapter.GDX_WEBGL_QUIRKS = true;
//GLAdapter.NON_PREMUL_CANVAS = true;
//Gdx.app.setLogLevel(Application.LOG_DEBUG);
super.create();
}
}

View File

@ -1,11 +1,17 @@
package org.oscim.gdx.client; package org.oscim.gdx.client;
// -draftCompile -localWorkers 2 // -draftCompile -localWorkers 2
import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GL20;
import org.oscim.backend.GLAdapter;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.gdx.GdxMap;
import org.oscim.tilesource.TileSource; import org.oscim.tilesource.TileSource;
import org.oscim.tilesource.oscimap2.OSciMap2TileSource;
import org.oscim.tilesource.oscimap4.OSciMap4TileSource; import org.oscim.tilesource.oscimap4.OSciMap4TileSource;
import com.badlogic.gdx.ApplicationListener; import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.gwt.GwtApplication; import com.badlogic.gdx.backends.gwt.GwtApplication;
import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration; import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration;
import com.badlogic.gdx.backends.gwt.GwtGraphics; import com.badlogic.gdx.backends.gwt.GwtGraphics;
@ -32,7 +38,12 @@ public class GwtLauncher extends GwtApplication {
String url = getMapConfig("tileurl"); String url = getMapConfig("tileurl");
TileSource tileSource = new OSciMap4TileSource(); TileSource tileSource;
if ("oscimap4".equals(getMapConfig("tilesource")))
tileSource = new OSciMap4TileSource();
else
tileSource = new OSciMap2TileSource();
tileSource.setOption("url", url); tileSource.setOption("url", url);
return new GwtGdxMap(tileSource); return new GwtGdxMap(tileSource);
} }
@ -40,4 +51,23 @@ public class GwtLauncher extends GwtApplication {
private static native String getMapConfig(String key)/*-{ private static native String getMapConfig(String key)/*-{
return $wnd.mapconfig && $wnd.mapconfig[key] || null; return $wnd.mapconfig && $wnd.mapconfig[key] || null;
}-*/; }-*/;
class GwtGdxMap extends GdxMap {
public GwtGdxMap(TileSource tileSource) {
super(tileSource);
}
@Override
public void create() {
CanvasAdapter.g = GwtCanvasAdapter.INSTANCE;
GLAdapter.g = (GL20)Gdx.graphics.getGL20();
GLAdapter.GDX_WEBGL_QUIRKS = true;
//GLAdapter.NON_PREMUL_CANVAS = true;
//Gdx.app.setLogLevel(Application.LOG_DEBUG);
super.create();
}
}
} }