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

GdxMap: make map renderer protected

Browse Source
This commit is contained in:
Emux 2017-03-18 15:17:16 +02:00
parent 32c57a42a4
commit 9c58d8219c
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2016 devemux86 * Copyright 2016-2017 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -40,7 +40,7 @@ public abstract class GdxMap implements ApplicationListener {
protected Map mMap; protected Map mMap;
protected GestureDetector mGestureDetector; protected GestureDetector mGestureDetector;
private MapRenderer mMapRenderer; protected MapRenderer mMapRenderer;
public GdxMap() { public GdxMap() {
} }

13
vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java
View File

@ -40,9 +40,6 @@ public class GdxSpriteBatchTest extends GdxMap {
private GeoPoint position = new GeoPoint(47.1970869, 18.4398422); private GeoPoint position = new GeoPoint(47.1970869, 18.4398422);
private int mapScale = 2000 << 6; private int mapScale = 2000 << 6;
// I'm guessing it is private in GdxMap?
private MapRenderer mapRenderer;
private OrthographicCamera camera; private OrthographicCamera camera;
private Viewport viewport; private Viewport viewport;
private SpriteBatch spriteBatch; private SpriteBatch spriteBatch;
@ -59,9 +56,9 @@ public class GdxSpriteBatchTest extends GdxMap {
viewport = new ScreenViewport(camera); viewport = new ScreenViewport(camera);
spriteBatch = new SpriteBatch(); spriteBatch = new SpriteBatch();
mapRenderer = new MapRenderer(mMap); mMapRenderer = new MapRenderer(mMap);
mapRenderer.onSurfaceCreated(); mMapRenderer.onSurfaceCreated();
mapRenderer.onSurfaceChanged(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); mMapRenderer.onSurfaceChanged(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
mMap.viewport().setScreenSize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); mMap.viewport().setScreenSize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
// Generate a simple texture for testing // Generate a simple texture for testing
@ -91,7 +88,7 @@ public class GdxSpriteBatchTest extends GdxMap {
gl.viewport(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); gl.viewport(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
gl.frontFace(GL.CW); gl.frontFace(GL.CW);
mapRenderer.onDrawFrame(); mMapRenderer.onDrawFrame();
gl.flush(); gl.flush();
GLState.bindVertexBuffer(0); GLState.bindVertexBuffer(0);
@ -116,7 +113,7 @@ public class GdxSpriteBatchTest extends GdxMap {
@Override @Override
public void resize(int w, int h) { public void resize(int w, int h) {
mapRenderer.onSurfaceChanged(w, h); mMapRenderer.onSurfaceChanged(w, h);
mMap.viewport().setScreenSize(w, h); mMap.viewport().setScreenSize(w, h);
viewport.update(w, h); viewport.update(w, h);
} }