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

gdx: simplify sub-classing GdxMap apps, add createLayers()

Browse Source
This commit is contained in:
Hannes Janetzek 2013-09-16 20:17:17 +02:00
parent 1498325ecd
commit a660048bcb
5 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
vtm-gdx-android/src/org/oscim/gdx/MainActivity.java
View File

@ -19,42 +19,41 @@ import com.badlogic.gdx.utils.SharedLibraryLoader;
public class MainActivity extends AndroidApplication { public class MainActivity extends AndroidApplication {
private final class AndroidGLAdapter extends AndroidGL20 implements GL20{ private final class AndroidGLAdapter extends AndroidGL20 implements GL20 {
} }
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// set globals // set globals
CanvasAdapter.g = AndroidGraphics.INSTANCE; CanvasAdapter.g = AndroidGraphics.INSTANCE;
GLAdapter.g = new AndroidGLAdapter(); GLAdapter.g = new AndroidGLAdapter();
Log.logger = new AndroidLog(); Log.logger = new AndroidLog();
// TODO make this dpi dependent // TODO make this dpi dependent
Tile.SIZE = 400; Tile.SIZE = 400;
AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration(); AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
cfg.useGL20 = true; cfg.useGL20 = true;
new SharedLibraryLoader().load("vtm-jni"); new SharedLibraryLoader().load("vtm-jni");
initialize(new GdxMapAndroid(), cfg); initialize(new GdxMapAndroid(), cfg);
} }
class GdxMapAndroid extends GdxMap {
class GdxMapAndroid extends GdxMap{
@Override @Override
public void create() { public void createLayers() {
super.create();
//TileSource ts = new OSciMap4TileSource(); //TileSource ts = new OSciMap4TileSource();
//ts.setOption("url", "http://city.informatik.uni-bremen.de/osci/testing"); //ts.setOption("url", "http://opensciencemap.org/tiles/vtm");
TileSource ts = new OSciMap2TileSource(); TileSource ts = new OSciMap2TileSource();
ts.setOption("url", "http://city.informatik.uni-bremen.de/osci/map-live"); ts.setOption("url", "http://opensciencemap.org/osci/map-live");
initDefaultMap(ts, true, true, true); initDefaultLayers(ts, true, true, true);
} }
} }
} }

2
vtm-gdx-desktop/src/org/oscim/gdx/GdxGLAdapter.java
View File

@ -39,7 +39,7 @@ import com.badlogic.gdx.utils.GdxRuntimeException;
* compatible. Some glGetXXX methods are not implemented. * compatible. Some glGetXXX methods are not implemented.
* *
* @author mzechner */ * @author mzechner */
final class GdxGLAdapter implements org.oscim.backend.GL20 { public final class GdxGLAdapter implements org.oscim.backend.GL20 {
public void glActiveTexture (int texture) { public void glActiveTexture (int texture) {
GL13.glActiveTexture(texture); GL13.glActiveTexture(texture);
} }

48
vtm-gdx-desktop/src/org/oscim/gdx/Main.java → vtm-gdx-desktop/src/org/oscim/gdx/GdxMapApp.java
View File

@ -11,9 +11,22 @@ import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
import com.badlogic.gdx.utils.SharedLibraryLoader; import com.badlogic.gdx.utils.SharedLibraryLoader;
public class Main { public class GdxMapApp extends GdxMap {
static {
// set our globals
new SharedLibraryLoader().load("vtm-jni");
CanvasAdapter.g = AwtGraphics.INSTANCE;
GLAdapter.g = new GdxGLAdapter();
GLAdapter.GDX_DESKTOP_QUIRKS = true;
}
public static void main(String[] args) { public static void main(String[] args) {
Tile.SIZE = 360;
new LwjglApplication(new GdxMapApp(), getConfig());
}
static protected LwjglApplicationConfiguration getConfig() {
LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration(); LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();
cfg.title = "vtm-gdx"; cfg.title = "vtm-gdx";
cfg.useGL20 = true; cfg.useGL20 = true;
@ -21,34 +34,13 @@ public class Main {
cfg.height = 800; cfg.height = 800;
cfg.stencil = 8; cfg.stencil = 8;
cfg.foregroundFPS = 20; cfg.foregroundFPS = 20;
// cfg.samples = 4; return cfg;
// set our globals
CanvasAdapter.g = AwtGraphics.INSTANCE;
GLAdapter.g = new GdxGLAdapter();
GLAdapter.GDX_DESKTOP_QUIRKS = true;
Tile.SIZE = 360;
new SharedLibraryLoader().load("vtm-jni");
new LwjglApplication(new GdxMapDesktop(), cfg);
} }
static class GdxMapDesktop extends GdxMap { @Override
public void createLayers() {
public GdxMapDesktop() { TileSource tileSource = new OSciMap4TileSource();
super(); tileSource.setOption("url", "http://opensciencemap.org/tiles/vtm");
} initDefaultLayers(tileSource, false, true, true);
@Override
public void create() {
super.create();
TileSource tileSource = new OSciMap4TileSource();
tileSource.setOption("url", "http://city.informatik.uni-bremen.de/tiles/vtm");
initDefaultMap(tileSource, false, true, true);
}
} }
} }

6
vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
View File

@ -98,7 +98,7 @@ class GwtGdxMap extends GdxMap {
tileSource.setOption("url", url); tileSource.setOption("url", url);
initDefaultMap(tileSource, false, true, true); initDefaultLayers(tileSource, false, true, true);
if ("naturalearth".equals(c.getBackgroundLayer())) if ("naturalearth".equals(c.getBackgroundLayer()))
mMap.setBackgroundMap(new BitmapTileLayer(mMap, NaturalEarth.INSTANCE)); mMap.setBackgroundMap(new BitmapTileLayer(mMap, NaturalEarth.INSTANCE));
@ -139,4 +139,8 @@ class GwtGdxMap extends GdxMap {
}; };
timer.scheduleRepeating(5000); timer.scheduleRepeating(5000);
} }
@Override
protected void createLayers() {
}
} }

20
vtm-gdx/src/org/oscim/gdx/GdxMap.java
View File

@ -2,7 +2,6 @@ package org.oscim.gdx;
import org.oscim.backend.AssetAdapter; import org.oscim.backend.AssetAdapter;
import org.oscim.backend.Log; import org.oscim.backend.Log;
import org.oscim.core.MapPosition;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.layers.GenericLayer; import org.oscim.layers.GenericLayer;
import org.oscim.layers.tile.vector.BuildingLayer; import org.oscim.layers.tile.vector.BuildingLayer;
@ -10,9 +9,9 @@ import org.oscim.layers.tile.vector.VectorTileLayer;
import org.oscim.layers.tile.vector.labeling.LabelLayer; import org.oscim.layers.tile.vector.labeling.LabelLayer;
import org.oscim.map.Map; import org.oscim.map.Map;
import org.oscim.map.Viewport; import org.oscim.map.Viewport;
import org.oscim.renderer.GLState;
import org.oscim.renderer.GridRenderer; import org.oscim.renderer.GridRenderer;
import org.oscim.renderer.MapRenderer; import org.oscim.renderer.MapRenderer;
import org.oscim.renderer.GLState;
import org.oscim.theme.InternalRenderTheme; import org.oscim.theme.InternalRenderTheme;
import org.oscim.tiling.source.TileSource; import org.oscim.tiling.source.TileSource;
@ -29,7 +28,7 @@ import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer;
import com.badlogic.gdx.utils.Timer.Task; import com.badlogic.gdx.utils.Timer.Task;
public class GdxMap implements ApplicationListener { public abstract class GdxMap implements ApplicationListener {
protected final Map mMap; protected final Map mMap;
private final MapRenderer mMapRenderer; private final MapRenderer mMapRenderer;
@ -89,7 +88,7 @@ public class GdxMap implements ApplicationListener {
} }
protected void initDefaultMap(TileSource tileSource, boolean tileGrid, boolean labels, protected void initDefaultLayers(TileSource tileSource, boolean tileGrid, boolean labels,
boolean buildings) { boolean buildings) {
if (tileSource != null) { if (tileSource != null) {
@ -133,11 +132,13 @@ public class GdxMap implements ApplicationListener {
mHeight = h; mHeight = h;
mMap.getViewport().setViewport(w, h); mMap.getViewport().setViewport(w, h);
MapPosition p = new MapPosition();
p.setZoomLevel(14); //MapPosition p = new MapPosition();
p.setPosition(53.08, 8.83); //p.setZoomLevel(14);
//p.setPosition(53.08, 8.83);
//p.setPosition(0.0, 0.0); //p.setPosition(0.0, 0.0);
mMap.setMapPosition(p); //mMap.setMapPosition(p);
mMapRenderer.onSurfaceCreated(); mMapRenderer.onSurfaceCreated();
mMapRenderer.onSurfaceChanged(w, h); mMapRenderer.onSurfaceChanged(w, h);
@ -154,8 +155,11 @@ public class GdxMap implements ApplicationListener {
// fps.setPosition(10, 30); // fps.setPosition(10, 30);
// fps.setColor(0, 1, 0, 1); // fps.setColor(0, 1, 0, 1);
// ui.addActor(fps); // ui.addActor(fps);
createLayers();
} }
protected abstract void createLayers();
@Override @Override
public void dispose() { public void dispose() {