Improve code / xml formatting, closes #54
This commit is contained in:
Emux
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit trunk//EN" "http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">
|
||||
<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE module PUBLIC
|
||||
"-//Google Inc.//DTD Google Web Toolkit trunk//EN"
|
||||
"http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">
|
||||
<module>
|
||||
<source path="org/oscim" />
|
||||
<source path="org/oscim" />
|
||||
</module>
|
||||
@@ -16,36 +16,36 @@
|
||||
*/
|
||||
package org.oscim.gdx;
|
||||
|
||||
import java.io.InputStream;
|
||||
|
||||
import org.oscim.backend.AssetAdapter;
|
||||
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.badlogic.gdx.files.FileHandle;
|
||||
import com.badlogic.gdx.utils.GdxRuntimeException;
|
||||
|
||||
import org.oscim.backend.AssetAdapter;
|
||||
|
||||
import java.io.InputStream;
|
||||
|
||||
public class GdxAssets extends AssetAdapter {
|
||||
static String pathPrefix = "";
|
||||
static String pathPrefix = "";
|
||||
|
||||
private GdxAssets(String path) {
|
||||
pathPrefix = path;
|
||||
}
|
||||
private GdxAssets(String path) {
|
||||
pathPrefix = path;
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream openFileAsStream(String fileName) {
|
||||
FileHandle file = Gdx.files.internal(pathPrefix + fileName);
|
||||
if (file == null)
|
||||
throw new IllegalArgumentException("missing file " + fileName);
|
||||
@Override
|
||||
public InputStream openFileAsStream(String fileName) {
|
||||
FileHandle file = Gdx.files.internal(pathPrefix + fileName);
|
||||
if (file == null)
|
||||
throw new IllegalArgumentException("missing file " + fileName);
|
||||
|
||||
try {
|
||||
return file.read();
|
||||
} catch (GdxRuntimeException e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
try {
|
||||
return file.read();
|
||||
} catch (GdxRuntimeException e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static void init(String path) {
|
||||
AssetAdapter.init(new GdxAssets(path));
|
||||
}
|
||||
public static void init(String path) {
|
||||
AssetAdapter.init(new GdxAssets(path));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,13 @@
|
||||
*/
|
||||
package org.oscim.gdx;
|
||||
|
||||
import com.badlogic.gdx.Application;
|
||||
import com.badlogic.gdx.ApplicationListener;
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.badlogic.gdx.InputMultiplexer;
|
||||
import com.badlogic.gdx.utils.Timer;
|
||||
import com.badlogic.gdx.utils.Timer.Task;
|
||||
|
||||
import org.oscim.layers.TileGridLayer;
|
||||
import org.oscim.layers.tile.buildings.BuildingLayer;
|
||||
import org.oscim.layers.tile.vector.VectorTileLayer;
|
||||
@@ -28,187 +35,180 @@ import org.oscim.tiling.TileSource;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.badlogic.gdx.Application;
|
||||
import com.badlogic.gdx.ApplicationListener;
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.badlogic.gdx.InputMultiplexer;
|
||||
import com.badlogic.gdx.utils.Timer;
|
||||
import com.badlogic.gdx.utils.Timer.Task;
|
||||
|
||||
public abstract class GdxMap implements ApplicationListener {
|
||||
final static Logger log = LoggerFactory.getLogger(GdxMap.class);
|
||||
final static Logger log = LoggerFactory.getLogger(GdxMap.class);
|
||||
|
||||
protected Map mMap;
|
||||
protected Map mMap;
|
||||
|
||||
VectorTileLayer mMapLayer;
|
||||
private MapRenderer mMapRenderer;
|
||||
VectorTileLayer mMapLayer;
|
||||
private MapRenderer mMapRenderer;
|
||||
|
||||
public GdxMap() {
|
||||
}
|
||||
public GdxMap() {
|
||||
}
|
||||
|
||||
protected void initDefaultLayers(TileSource tileSource, boolean tileGrid, boolean labels,
|
||||
boolean buildings) {
|
||||
Layers layers = mMap.layers();
|
||||
protected void initDefaultLayers(TileSource tileSource, boolean tileGrid, boolean labels,
|
||||
boolean buildings) {
|
||||
Layers layers = mMap.layers();
|
||||
|
||||
if (tileSource != null) {
|
||||
mMapLayer = mMap.setBaseMap(tileSource);
|
||||
mMap.setTheme(VtmThemes.DEFAULT);
|
||||
if (tileSource != null) {
|
||||
mMapLayer = mMap.setBaseMap(tileSource);
|
||||
mMap.setTheme(VtmThemes.DEFAULT);
|
||||
|
||||
if (buildings)
|
||||
layers.add(new BuildingLayer(mMap, mMapLayer));
|
||||
if (buildings)
|
||||
layers.add(new BuildingLayer(mMap, mMapLayer));
|
||||
|
||||
if (labels)
|
||||
layers.add(new LabelLayer(mMap, mMapLayer));
|
||||
}
|
||||
if (labels)
|
||||
layers.add(new LabelLayer(mMap, mMapLayer));
|
||||
}
|
||||
|
||||
if (tileGrid)
|
||||
layers.add(new TileGridLayer(mMap));
|
||||
}
|
||||
if (tileGrid)
|
||||
layers.add(new TileGridLayer(mMap));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void create() {
|
||||
mMap = new MapAdapter();
|
||||
mMapRenderer = new MapRenderer(mMap);
|
||||
@Override
|
||||
public void create() {
|
||||
mMap = new MapAdapter();
|
||||
mMapRenderer = new MapRenderer(mMap);
|
||||
|
||||
Gdx.graphics.setContinuousRendering(false);
|
||||
Gdx.app.setLogLevel(Application.LOG_DEBUG);
|
||||
Gdx.graphics.setContinuousRendering(false);
|
||||
Gdx.app.setLogLevel(Application.LOG_DEBUG);
|
||||
|
||||
int w = Gdx.graphics.getWidth();
|
||||
int h = Gdx.graphics.getHeight();
|
||||
int w = Gdx.graphics.getWidth();
|
||||
int h = Gdx.graphics.getHeight();
|
||||
|
||||
mMap.viewport().setScreenSize(w, h);
|
||||
mMapRenderer.onSurfaceCreated();
|
||||
mMapRenderer.onSurfaceChanged(w, h);
|
||||
mMap.viewport().setScreenSize(w, h);
|
||||
mMapRenderer.onSurfaceCreated();
|
||||
mMapRenderer.onSurfaceChanged(w, h);
|
||||
|
||||
InputMultiplexer mux = new InputMultiplexer();
|
||||
mux.addProcessor(new InputHandler(this));
|
||||
//mux.addProcessor(new GestureDetector(20, 0.5f, 2, 0.05f,
|
||||
// new MapController(mMap)));
|
||||
mux.addProcessor(new MotionHandler(mMap));
|
||||
InputMultiplexer mux = new InputMultiplexer();
|
||||
mux.addProcessor(new InputHandler(this));
|
||||
//mux.addProcessor(new GestureDetector(20, 0.5f, 2, 0.05f,
|
||||
// new MapController(mMap)));
|
||||
mux.addProcessor(new MotionHandler(mMap));
|
||||
|
||||
Gdx.input.setInputProcessor(mux);
|
||||
Gdx.input.setInputProcessor(mux);
|
||||
|
||||
createLayers();
|
||||
}
|
||||
createLayers();
|
||||
}
|
||||
|
||||
protected void createLayers() {
|
||||
mMap.layers().add(new TileGridLayer(mMap));
|
||||
}
|
||||
protected void createLayers() {
|
||||
mMap.layers().add(new TileGridLayer(mMap));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dispose() {
|
||||
@Override
|
||||
public void dispose() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/* private */boolean mRenderWait;
|
||||
/* private */boolean mRenderRequest;
|
||||
/* private */boolean mUpdateRequest;
|
||||
/* private */ boolean mRenderWait;
|
||||
/* private */ boolean mRenderRequest;
|
||||
/* private */ boolean mUpdateRequest;
|
||||
|
||||
@Override
|
||||
public void render() {
|
||||
if (!mRenderRequest)
|
||||
return;
|
||||
@Override
|
||||
public void render() {
|
||||
if (!mRenderRequest)
|
||||
return;
|
||||
|
||||
mMapRenderer.onDrawFrame();
|
||||
}
|
||||
mMapRenderer.onDrawFrame();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void resize(int w, int h) {
|
||||
mMap.viewport().setScreenSize(w, h);
|
||||
mMapRenderer.onSurfaceChanged(w, h);
|
||||
mMap.render();
|
||||
}
|
||||
@Override
|
||||
public void resize(int w, int h) {
|
||||
mMap.viewport().setScreenSize(w, h);
|
||||
mMapRenderer.onSurfaceChanged(w, h);
|
||||
mMap.render();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void pause() {
|
||||
}
|
||||
@Override
|
||||
public void pause() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void resume() {
|
||||
}
|
||||
@Override
|
||||
public void resume() {
|
||||
}
|
||||
|
||||
protected boolean onKeyDown(int keycode) {
|
||||
return false;
|
||||
}
|
||||
protected boolean onKeyDown(int keycode) {
|
||||
return false;
|
||||
}
|
||||
|
||||
public Map getMap() {
|
||||
return mMap;
|
||||
}
|
||||
public Map getMap() {
|
||||
return mMap;
|
||||
}
|
||||
|
||||
class MapAdapter extends Map {
|
||||
class MapAdapter extends Map {
|
||||
|
||||
@Override
|
||||
public int getWidth() {
|
||||
return Gdx.graphics.getWidth();
|
||||
}
|
||||
@Override
|
||||
public int getWidth() {
|
||||
return Gdx.graphics.getWidth();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getHeight() {
|
||||
return Gdx.graphics.getHeight();
|
||||
}
|
||||
@Override
|
||||
public int getHeight() {
|
||||
return Gdx.graphics.getHeight();
|
||||
}
|
||||
|
||||
private final Runnable mRedrawCb = new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
prepareFrame();
|
||||
Gdx.graphics.requestRendering();
|
||||
}
|
||||
};
|
||||
private final Runnable mRedrawCb = new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
prepareFrame();
|
||||
Gdx.graphics.requestRendering();
|
||||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
public void updateMap(boolean forceRender) {
|
||||
synchronized (mRedrawCb) {
|
||||
if (!mRenderRequest) {
|
||||
mRenderRequest = true;
|
||||
Gdx.app.postRunnable(mRedrawCb);
|
||||
} else {
|
||||
mRenderWait = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void updateMap(boolean forceRender) {
|
||||
synchronized (mRedrawCb) {
|
||||
if (!mRenderRequest) {
|
||||
mRenderRequest = true;
|
||||
Gdx.app.postRunnable(mRedrawCb);
|
||||
} else {
|
||||
mRenderWait = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render() {
|
||||
synchronized (mRedrawCb) {
|
||||
mRenderRequest = true;
|
||||
if (mClearMap)
|
||||
updateMap(false);
|
||||
else {
|
||||
Gdx.graphics.requestRendering();
|
||||
}
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void render() {
|
||||
synchronized (mRedrawCb) {
|
||||
mRenderRequest = true;
|
||||
if (mClearMap)
|
||||
updateMap(false);
|
||||
else {
|
||||
Gdx.graphics.requestRendering();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean post(Runnable runnable) {
|
||||
Gdx.app.postRunnable(runnable);
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public boolean post(Runnable runnable) {
|
||||
Gdx.app.postRunnable(runnable);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean postDelayed(final Runnable action, long delay) {
|
||||
Timer.schedule(new Task() {
|
||||
@Override
|
||||
public void run() {
|
||||
action.run();
|
||||
}
|
||||
}, delay / 1000f);
|
||||
return true;
|
||||
}
|
||||
@Override
|
||||
public boolean postDelayed(final Runnable action, long delay) {
|
||||
Timer.schedule(new Task() {
|
||||
@Override
|
||||
public void run() {
|
||||
action.run();
|
||||
}
|
||||
}, delay / 1000f);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void beginFrame() {
|
||||
}
|
||||
@Override
|
||||
public void beginFrame() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void doneFrame(boolean animate) {
|
||||
synchronized (mRedrawCb) {
|
||||
mRenderRequest = false;
|
||||
if (animate || mRenderWait) {
|
||||
mRenderWait = false;
|
||||
updateMap(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void doneFrame(boolean animate) {
|
||||
synchronized (mRedrawCb) {
|
||||
mRenderRequest = false;
|
||||
if (animate || mRenderWait) {
|
||||
mRenderWait = false;
|
||||
updateMap(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,237 +16,237 @@
|
||||
*/
|
||||
package org.oscim.gdx;
|
||||
|
||||
import org.oscim.core.Tile;
|
||||
import org.oscim.map.Map;
|
||||
|
||||
import com.badlogic.gdx.Input.Buttons;
|
||||
import com.badlogic.gdx.input.GestureDetector.GestureListener;
|
||||
import com.badlogic.gdx.math.Vector2;
|
||||
|
||||
import org.oscim.core.Tile;
|
||||
import org.oscim.map.Map;
|
||||
|
||||
public class GestureHandler implements GestureListener {
|
||||
private boolean mayFling = true;
|
||||
private boolean mayFling = true;
|
||||
|
||||
private boolean mPinch;
|
||||
private boolean mPinch;
|
||||
|
||||
private boolean mBeginScale;
|
||||
private float mSumScale;
|
||||
private float mSumRotate;
|
||||
private boolean mBeginScale;
|
||||
private float mSumScale;
|
||||
private float mSumRotate;
|
||||
|
||||
private boolean mBeginRotate;
|
||||
private boolean mBeginTilt;
|
||||
private boolean mBeginRotate;
|
||||
private boolean mBeginTilt;
|
||||
|
||||
private float mPrevX;
|
||||
private float mPrevY;
|
||||
private float mPrevX;
|
||||
private float mPrevY;
|
||||
|
||||
private float mPrevX2;
|
||||
private float mPrevY2;
|
||||
private float mPrevX2;
|
||||
private float mPrevY2;
|
||||
|
||||
private float mFocusX;
|
||||
private float mFocusY;
|
||||
private float mFocusX;
|
||||
private float mFocusY;
|
||||
|
||||
private double mAngle;
|
||||
protected double mPrevPinchWidth = -1;
|
||||
private double mAngle;
|
||||
protected double mPrevPinchWidth = -1;
|
||||
|
||||
protected static final int JUMP_THRESHOLD = 100;
|
||||
protected static final double PINCH_ZOOM_THRESHOLD = 5;
|
||||
protected static final double PINCH_ROTATE_THRESHOLD = 0.02;
|
||||
protected static final float PINCH_TILT_THRESHOLD = 1f;
|
||||
protected static final int JUMP_THRESHOLD = 100;
|
||||
protected static final double PINCH_ZOOM_THRESHOLD = 5;
|
||||
protected static final double PINCH_ROTATE_THRESHOLD = 0.02;
|
||||
protected static final float PINCH_TILT_THRESHOLD = 1f;
|
||||
|
||||
//private ViewController mViewport;
|
||||
private final Map mMap;
|
||||
//private ViewController mViewport;
|
||||
private final Map mMap;
|
||||
|
||||
public GestureHandler(Map map) {
|
||||
//mViewport = mMap.viewport();
|
||||
mMap = map;
|
||||
}
|
||||
public GestureHandler(Map map) {
|
||||
//mViewport = mMap.viewport();
|
||||
mMap = map;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean touchDown(float x, float y, int pointer, int button) {
|
||||
mayFling = true;
|
||||
mPinch = false;
|
||||
@Override
|
||||
public boolean touchDown(float x, float y, int pointer, int button) {
|
||||
mayFling = true;
|
||||
mPinch = false;
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean tap(float x, float y, int count, int button) {
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean tap(float x, float y, int count, int button) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean longPress(float x, float y) {
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean longPress(float x, float y) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean fling(final float velocityX, final float velocityY,
|
||||
int button) {
|
||||
//log.debug("fling " + button + " " + velocityX + "/" + velocityY);
|
||||
if (mayFling && button == Buttons.LEFT) {
|
||||
int m = Tile.SIZE * 4;
|
||||
mMap.animator().animateFling((int) velocityX, (int) velocityY, -m, m, -m, m);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean fling(final float velocityX, final float velocityY,
|
||||
int button) {
|
||||
//log.debug("fling " + button + " " + velocityX + "/" + velocityY);
|
||||
if (mayFling && button == Buttons.LEFT) {
|
||||
int m = Tile.SIZE * 4;
|
||||
mMap.animator().animateFling((int) velocityX, (int) velocityY, -m, m, -m, m);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean pan(float x, float y, float deltaX, float deltaY) {
|
||||
if (mPinch)
|
||||
return true;
|
||||
@Override
|
||||
public boolean pan(float x, float y, float deltaX, float deltaY) {
|
||||
if (mPinch)
|
||||
return true;
|
||||
|
||||
mMap.viewport().moveMap(deltaX, deltaY);
|
||||
mMap.updateMap(true);
|
||||
mMap.viewport().moveMap(deltaX, deltaY);
|
||||
mMap.updateMap(true);
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean zoom(float initialDistance, float distance) {
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean zoom(float initialDistance, float distance) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean pinch(Vector2 initialPointer1, Vector2 initialPointer2,
|
||||
Vector2 pointer1, Vector2 pointer2) {
|
||||
mayFling = false;
|
||||
@Override
|
||||
public boolean pinch(Vector2 initialPointer1, Vector2 initialPointer2,
|
||||
Vector2 pointer1, Vector2 pointer2) {
|
||||
mayFling = false;
|
||||
|
||||
if (!mPinch) {
|
||||
mPrevX = pointer1.x;
|
||||
mPrevY = pointer1.y;
|
||||
mPrevX2 = pointer2.x;
|
||||
mPrevY2 = pointer2.y;
|
||||
if (!mPinch) {
|
||||
mPrevX = pointer1.x;
|
||||
mPrevY = pointer1.y;
|
||||
mPrevX2 = pointer2.x;
|
||||
mPrevY2 = pointer2.y;
|
||||
|
||||
double dx = mPrevX - mPrevX2;
|
||||
double dy = mPrevY - mPrevY2;
|
||||
double dx = mPrevX - mPrevX2;
|
||||
double dy = mPrevY - mPrevY2;
|
||||
|
||||
mAngle = Math.atan2(dy, dx);
|
||||
mPrevPinchWidth = Math.sqrt(dx * dx + dy * dy);
|
||||
mAngle = Math.atan2(dy, dx);
|
||||
mPrevPinchWidth = Math.sqrt(dx * dx + dy * dy);
|
||||
|
||||
mPinch = true;
|
||||
mPinch = true;
|
||||
|
||||
mBeginTilt = false;
|
||||
mBeginRotate = false;
|
||||
mBeginScale = false;
|
||||
mBeginTilt = false;
|
||||
mBeginRotate = false;
|
||||
mBeginScale = false;
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
float x1 = pointer1.x;
|
||||
float y1 = pointer1.y;
|
||||
float x1 = pointer1.x;
|
||||
float y1 = pointer1.y;
|
||||
|
||||
//float mx = x1 - mPrevX;
|
||||
float my = y1 - mPrevY;
|
||||
//float mx = x1 - mPrevX;
|
||||
float my = y1 - mPrevY;
|
||||
|
||||
float x2 = pointer2.x;
|
||||
float y2 = pointer2.y;
|
||||
float x2 = pointer2.x;
|
||||
float y2 = pointer2.y;
|
||||
|
||||
float dx = (x1 - x2);
|
||||
float dy = (y1 - y2);
|
||||
float slope = 0;
|
||||
float dx = (x1 - x2);
|
||||
float dy = (y1 - y2);
|
||||
float slope = 0;
|
||||
|
||||
if (dx != 0)
|
||||
slope = dy / dx;
|
||||
if (dx != 0)
|
||||
slope = dy / dx;
|
||||
|
||||
double pinchWidth = Math.sqrt(dx * dx + dy * dy);
|
||||
double pinchWidth = Math.sqrt(dx * dx + dy * dy);
|
||||
|
||||
final double deltaPinchWidth = pinchWidth - mPrevPinchWidth;
|
||||
final double deltaPinchWidth = pinchWidth - mPrevPinchWidth;
|
||||
|
||||
double rad = Math.atan2(dy, dx);
|
||||
double r = rad - mAngle;
|
||||
double rad = Math.atan2(dy, dx);
|
||||
double r = rad - mAngle;
|
||||
|
||||
boolean startScale = (Math.abs(deltaPinchWidth) > PINCH_ZOOM_THRESHOLD);
|
||||
boolean startScale = (Math.abs(deltaPinchWidth) > PINCH_ZOOM_THRESHOLD);
|
||||
|
||||
boolean changed = false;
|
||||
boolean changed = false;
|
||||
|
||||
if (!mBeginTilt && (mBeginScale || startScale)) {
|
||||
mBeginScale = true;
|
||||
if (!mBeginTilt && (mBeginScale || startScale)) {
|
||||
mBeginScale = true;
|
||||
|
||||
float scale = (float) (pinchWidth / mPrevPinchWidth);
|
||||
float scale = (float) (pinchWidth / mPrevPinchWidth);
|
||||
|
||||
// decrease change of scale by the change of rotation
|
||||
// * 20 is just arbitrary
|
||||
if (mBeginRotate)
|
||||
scale = 1 + ((scale - 1) * Math.max((1 - (float) Math.abs(r) * 20), 0));
|
||||
// decrease change of scale by the change of rotation
|
||||
// * 20 is just arbitrary
|
||||
if (mBeginRotate)
|
||||
scale = 1 + ((scale - 1) * Math.max((1 - (float) Math.abs(r) * 20), 0));
|
||||
|
||||
mSumScale *= scale;
|
||||
mSumScale *= scale;
|
||||
|
||||
if ((mSumScale < 0.99 || mSumScale > 1.01)
|
||||
&& mSumRotate < Math.abs(0.02))
|
||||
mBeginRotate = false;
|
||||
if ((mSumScale < 0.99 || mSumScale > 1.01)
|
||||
&& mSumRotate < Math.abs(0.02))
|
||||
mBeginRotate = false;
|
||||
|
||||
float fx = (x2 + x1) / 2 - mMap.getWidth() / 2;
|
||||
float fy = (y2 + y1) / 2 - mMap.getHeight() / 2;
|
||||
float fx = (x2 + x1) / 2 - mMap.getWidth() / 2;
|
||||
float fy = (y2 + y1) / 2 - mMap.getHeight() / 2;
|
||||
|
||||
// log.debug("zoom " + deltaPinchWidth + " " + scale + " " +
|
||||
// mSumScale);
|
||||
changed = mMap.viewport().scaleMap(scale, fx, fy);
|
||||
}
|
||||
// log.debug("zoom " + deltaPinchWidth + " " + scale + " " +
|
||||
// mSumScale);
|
||||
changed = mMap.viewport().scaleMap(scale, fx, fy);
|
||||
}
|
||||
|
||||
if (!mBeginRotate && Math.abs(slope) < 1) {
|
||||
float my2 = y2 - mPrevY2;
|
||||
float threshold = PINCH_TILT_THRESHOLD;
|
||||
if (!mBeginRotate && Math.abs(slope) < 1) {
|
||||
float my2 = y2 - mPrevY2;
|
||||
float threshold = PINCH_TILT_THRESHOLD;
|
||||
|
||||
// log.debug(r + " " + slope + " m1:" + my + " m2:" + my2);
|
||||
// log.debug(r + " " + slope + " m1:" + my + " m2:" + my2);
|
||||
|
||||
if ((my > threshold && my2 > threshold)
|
||||
|| (my < -threshold && my2 < -threshold)) {
|
||||
mBeginTilt = true;
|
||||
changed = mMap.viewport().tiltMap(my / 5);
|
||||
}
|
||||
}
|
||||
if ((my > threshold && my2 > threshold)
|
||||
|| (my < -threshold && my2 < -threshold)) {
|
||||
mBeginTilt = true;
|
||||
changed = mMap.viewport().tiltMap(my / 5);
|
||||
}
|
||||
}
|
||||
|
||||
if (!mBeginTilt
|
||||
&& (mBeginRotate || (Math.abs(slope) > 1 && Math.abs(r) > PINCH_ROTATE_THRESHOLD))) {
|
||||
// log.debug("rotate: " + mBeginRotate + " " +
|
||||
// Math.toDegrees(rad));
|
||||
if (!mBeginRotate) {
|
||||
mAngle = rad;
|
||||
if (!mBeginTilt
|
||||
&& (mBeginRotate || (Math.abs(slope) > 1 && Math.abs(r) > PINCH_ROTATE_THRESHOLD))) {
|
||||
// log.debug("rotate: " + mBeginRotate + " " +
|
||||
// Math.toDegrees(rad));
|
||||
if (!mBeginRotate) {
|
||||
mAngle = rad;
|
||||
|
||||
mSumScale = 1;
|
||||
mSumRotate = 0;
|
||||
mSumScale = 1;
|
||||
mSumRotate = 0;
|
||||
|
||||
mBeginRotate = true;
|
||||
mBeginRotate = true;
|
||||
|
||||
mFocusX = (x1 + x2) / 2 - (mMap.getWidth() / 2);
|
||||
mFocusY = (y1 + y2) / 2 - (mMap.getHeight() / 2);
|
||||
} else {
|
||||
double da = rad - mAngle;
|
||||
mSumRotate += da;
|
||||
mFocusX = (x1 + x2) / 2 - (mMap.getWidth() / 2);
|
||||
mFocusY = (y1 + y2) / 2 - (mMap.getHeight() / 2);
|
||||
} else {
|
||||
double da = rad - mAngle;
|
||||
mSumRotate += da;
|
||||
|
||||
if (Math.abs(da) > 0.001) {
|
||||
double rsin = Math.sin(r);
|
||||
double rcos = Math.cos(r);
|
||||
float x = (float) (mFocusX * rcos + mFocusY * -rsin - mFocusX);
|
||||
float y = (float) (mFocusX * rsin + mFocusY * rcos - mFocusY);
|
||||
if (Math.abs(da) > 0.001) {
|
||||
double rsin = Math.sin(r);
|
||||
double rcos = Math.cos(r);
|
||||
float x = (float) (mFocusX * rcos + mFocusY * -rsin - mFocusX);
|
||||
float y = (float) (mFocusX * rsin + mFocusY * rcos - mFocusY);
|
||||
|
||||
mMap.viewport().rotateMap(da, x, y);
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
mAngle = rad;
|
||||
}
|
||||
mMap.viewport().rotateMap(da, x, y);
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
mAngle = rad;
|
||||
}
|
||||
|
||||
if (changed) {
|
||||
mMap.updateMap(true);
|
||||
mPrevPinchWidth = pinchWidth;
|
||||
mPrevY2 = y2;
|
||||
if (changed) {
|
||||
mMap.updateMap(true);
|
||||
mPrevPinchWidth = pinchWidth;
|
||||
mPrevY2 = y2;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
mPrevX = x1;
|
||||
mPrevY = y1;
|
||||
mPrevX2 = x2;
|
||||
mPrevX = x1;
|
||||
mPrevY = y1;
|
||||
mPrevX2 = x2;
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean panStop(float x, float y, int pointer, int button) {
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean panStop(float x, float y, int pointer, int button) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void pinchStop () {
|
||||
}
|
||||
@Override
|
||||
public void pinchStop() {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,226 +16,226 @@
|
||||
*/
|
||||
package org.oscim.gdx;
|
||||
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.badlogic.gdx.Input;
|
||||
import com.badlogic.gdx.Input.Buttons;
|
||||
import com.badlogic.gdx.InputProcessor;
|
||||
|
||||
import org.oscim.layers.GenericLayer;
|
||||
import org.oscim.layers.TileGridLayer;
|
||||
import org.oscim.map.Map;
|
||||
import org.oscim.map.ViewController;
|
||||
import org.oscim.theme.VtmThemes;
|
||||
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.badlogic.gdx.Input;
|
||||
import com.badlogic.gdx.Input.Buttons;
|
||||
import com.badlogic.gdx.InputProcessor;
|
||||
|
||||
public class InputHandler implements InputProcessor {
|
||||
|
||||
private ViewController mViewport;
|
||||
private final Map mMap;
|
||||
private GenericLayer mGridLayer;
|
||||
private final GdxMap mGdxApp;
|
||||
private ViewController mViewport;
|
||||
private final Map mMap;
|
||||
private GenericLayer mGridLayer;
|
||||
private final GdxMap mGdxApp;
|
||||
|
||||
public InputHandler(GdxMap map) {
|
||||
mMap = map.getMap();
|
||||
mViewport = mMap.viewport();
|
||||
mGdxApp = map;
|
||||
}
|
||||
public InputHandler(GdxMap map) {
|
||||
mMap = map.getMap();
|
||||
mViewport = mMap.viewport();
|
||||
mGdxApp = map;
|
||||
}
|
||||
|
||||
private boolean mActiveScale;
|
||||
private boolean mActiveTilt;
|
||||
private boolean mActiveRotate;
|
||||
private boolean mActiveScale;
|
||||
private boolean mActiveTilt;
|
||||
private boolean mActiveRotate;
|
||||
|
||||
private int mPosX, mPosY;
|
||||
private int mPosX, mPosY;
|
||||
|
||||
@Override
|
||||
public boolean keyDown(int keycode) {
|
||||
if (mGdxApp.onKeyDown(keycode))
|
||||
return true;
|
||||
@Override
|
||||
public boolean keyDown(int keycode) {
|
||||
if (mGdxApp.onKeyDown(keycode))
|
||||
return true;
|
||||
|
||||
switch (keycode) {
|
||||
case Input.Keys.ESCAPE:
|
||||
Gdx.app.exit();
|
||||
break;
|
||||
switch (keycode) {
|
||||
case Input.Keys.ESCAPE:
|
||||
Gdx.app.exit();
|
||||
break;
|
||||
|
||||
case Input.Keys.SHIFT_LEFT:
|
||||
case Input.Keys.SHIFT_RIGHT:
|
||||
mActiveScale = true;
|
||||
mPosY = Gdx.input.getY();
|
||||
break;
|
||||
case Input.Keys.SHIFT_LEFT:
|
||||
case Input.Keys.SHIFT_RIGHT:
|
||||
mActiveScale = true;
|
||||
mPosY = Gdx.input.getY();
|
||||
break;
|
||||
|
||||
case Input.Keys.CONTROL_LEFT:
|
||||
case Input.Keys.CONTROL_RIGHT:
|
||||
mActiveRotate = true;
|
||||
mActiveTilt = true;
|
||||
mPosX = Gdx.input.getX();
|
||||
mPosY = Gdx.input.getY();
|
||||
break;
|
||||
case Input.Keys.CONTROL_LEFT:
|
||||
case Input.Keys.CONTROL_RIGHT:
|
||||
mActiveRotate = true;
|
||||
mActiveTilt = true;
|
||||
mPosX = Gdx.input.getX();
|
||||
mPosY = Gdx.input.getY();
|
||||
break;
|
||||
|
||||
case Input.Keys.UP:
|
||||
mViewport.moveMap(0, -50);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.DOWN:
|
||||
mViewport.moveMap(0, 50);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.LEFT:
|
||||
mViewport.moveMap(-50, 0);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.RIGHT:
|
||||
mViewport.moveMap(50, 0);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.M:
|
||||
mViewport.scaleMap(1.05f, 0, 0);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.N:
|
||||
mViewport.scaleMap(0.95f, 0, 0);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.NUM_1:
|
||||
mMap.animator().animateZoom(500, 0.5, 0, 0);
|
||||
break;
|
||||
case Input.Keys.NUM_2:
|
||||
mMap.animator().animateZoom(500, 2, 0, 0);
|
||||
break;
|
||||
case Input.Keys.UP:
|
||||
mViewport.moveMap(0, -50);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.DOWN:
|
||||
mViewport.moveMap(0, 50);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.LEFT:
|
||||
mViewport.moveMap(-50, 0);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.RIGHT:
|
||||
mViewport.moveMap(50, 0);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.M:
|
||||
mViewport.scaleMap(1.05f, 0, 0);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.N:
|
||||
mViewport.scaleMap(0.95f, 0, 0);
|
||||
mMap.updateMap(true);
|
||||
break;
|
||||
case Input.Keys.NUM_1:
|
||||
mMap.animator().animateZoom(500, 0.5, 0, 0);
|
||||
break;
|
||||
case Input.Keys.NUM_2:
|
||||
mMap.animator().animateZoom(500, 2, 0, 0);
|
||||
break;
|
||||
|
||||
case Input.Keys.D:
|
||||
mMap.setTheme(VtmThemes.DEFAULT);
|
||||
mMap.updateMap(false);
|
||||
break;
|
||||
case Input.Keys.D:
|
||||
mMap.setTheme(VtmThemes.DEFAULT);
|
||||
mMap.updateMap(false);
|
||||
break;
|
||||
|
||||
case Input.Keys.T:
|
||||
mMap.setTheme(VtmThemes.TRONRENDER);
|
||||
mMap.updateMap(false);
|
||||
break;
|
||||
case Input.Keys.T:
|
||||
mMap.setTheme(VtmThemes.TRONRENDER);
|
||||
mMap.updateMap(false);
|
||||
break;
|
||||
|
||||
case Input.Keys.R:
|
||||
mMap.setTheme(VtmThemes.OSMARENDER);
|
||||
mMap.updateMap(false);
|
||||
break;
|
||||
case Input.Keys.R:
|
||||
mMap.setTheme(VtmThemes.OSMARENDER);
|
||||
mMap.updateMap(false);
|
||||
break;
|
||||
|
||||
case Input.Keys.G:
|
||||
if (mGridLayer == null) {
|
||||
mGridLayer = new TileGridLayer(mMap);
|
||||
mGridLayer.setEnabled(true);
|
||||
mMap.layers().add(mGridLayer);
|
||||
} else {
|
||||
if (mGridLayer.isEnabled()) {
|
||||
mGridLayer.setEnabled(false);
|
||||
mMap.layers().remove(mGridLayer);
|
||||
} else {
|
||||
mGridLayer.setEnabled(true);
|
||||
mMap.layers().add(mGridLayer);
|
||||
}
|
||||
}
|
||||
mMap.render();
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
case Input.Keys.G:
|
||||
if (mGridLayer == null) {
|
||||
mGridLayer = new TileGridLayer(mMap);
|
||||
mGridLayer.setEnabled(true);
|
||||
mMap.layers().add(mGridLayer);
|
||||
} else {
|
||||
if (mGridLayer.isEnabled()) {
|
||||
mGridLayer.setEnabled(false);
|
||||
mMap.layers().remove(mGridLayer);
|
||||
} else {
|
||||
mGridLayer.setEnabled(true);
|
||||
mMap.layers().add(mGridLayer);
|
||||
}
|
||||
}
|
||||
mMap.render();
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean keyUp(int keycode) {
|
||||
switch (keycode) {
|
||||
case Input.Keys.SHIFT_LEFT:
|
||||
case Input.Keys.SHIFT_RIGHT:
|
||||
mActiveScale = false;
|
||||
break;
|
||||
case Input.Keys.CONTROL_LEFT:
|
||||
case Input.Keys.CONTROL_RIGHT:
|
||||
mActiveRotate = false;
|
||||
mActiveTilt = false;
|
||||
break;
|
||||
@Override
|
||||
public boolean keyUp(int keycode) {
|
||||
switch (keycode) {
|
||||
case Input.Keys.SHIFT_LEFT:
|
||||
case Input.Keys.SHIFT_RIGHT:
|
||||
mActiveScale = false;
|
||||
break;
|
||||
case Input.Keys.CONTROL_LEFT:
|
||||
case Input.Keys.CONTROL_RIGHT:
|
||||
mActiveRotate = false;
|
||||
mActiveTilt = false;
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean keyTyped(char character) {
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean keyTyped(char character) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean touchDown(int screenX, int screenY, int pointer, int button) {
|
||||
if (button == Buttons.MIDDLE) {
|
||||
mActiveScale = true;
|
||||
mPosY = screenY;
|
||||
} else if (button == Buttons.RIGHT) {
|
||||
mActiveRotate = true;
|
||||
mPosX = screenX;
|
||||
mPosY = screenY;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean touchDown(int screenX, int screenY, int pointer, int button) {
|
||||
if (button == Buttons.MIDDLE) {
|
||||
mActiveScale = true;
|
||||
mPosY = screenY;
|
||||
} else if (button == Buttons.RIGHT) {
|
||||
mActiveRotate = true;
|
||||
mPosX = screenX;
|
||||
mPosY = screenY;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean touchUp(int screenX, int screenY, int pointer, int button) {
|
||||
mActiveScale = false;
|
||||
mActiveRotate = false;
|
||||
mActiveTilt = false;
|
||||
@Override
|
||||
public boolean touchUp(int screenX, int screenY, int pointer, int button) {
|
||||
mActiveScale = false;
|
||||
mActiveRotate = false;
|
||||
mActiveTilt = false;
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean touchDragged(int screenX, int screenY, int pointer) {
|
||||
boolean changed = false;
|
||||
@Override
|
||||
public boolean touchDragged(int screenX, int screenY, int pointer) {
|
||||
boolean changed = false;
|
||||
|
||||
if (!(mActiveScale || mActiveRotate || mActiveTilt))
|
||||
return false;
|
||||
if (!(mActiveScale || mActiveRotate || mActiveTilt))
|
||||
return false;
|
||||
|
||||
if (mActiveTilt) {
|
||||
changed = mViewport.tiltMap((screenY - mPosY) / 5f);
|
||||
mPosY = screenY;
|
||||
if (mActiveTilt) {
|
||||
changed = mViewport.tiltMap((screenY - mPosY) / 5f);
|
||||
mPosY = screenY;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (mActiveScale) {
|
||||
changed = mViewport.scaleMap(1 - (screenY - mPosY) / 100f, 0, 0);
|
||||
mPosY = screenY;
|
||||
}
|
||||
if (mActiveScale) {
|
||||
changed = mViewport.scaleMap(1 - (screenY - mPosY) / 100f, 0, 0);
|
||||
mPosY = screenY;
|
||||
}
|
||||
|
||||
if (mActiveRotate) {
|
||||
mViewport.rotateMap((screenX - mPosX) / 500f, 0, 0);
|
||||
mPosX = screenX;
|
||||
mViewport.tiltMap((screenY - mPosY) / 10f);
|
||||
mPosY = screenY;
|
||||
changed = true;
|
||||
}
|
||||
if (mActiveRotate) {
|
||||
mViewport.rotateMap((screenX - mPosX) / 500f, 0, 0);
|
||||
mPosX = screenX;
|
||||
mViewport.tiltMap((screenY - mPosY) / 10f);
|
||||
mPosY = screenY;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
if (changed) {
|
||||
mMap.updateMap(true);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
if (changed) {
|
||||
mMap.updateMap(true);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseMoved(int screenX, int screenY) {
|
||||
@Override
|
||||
public boolean mouseMoved(int screenX, int screenY) {
|
||||
|
||||
mPosX = screenX;
|
||||
mPosY = screenY;
|
||||
return false;
|
||||
}
|
||||
mPosX = screenX;
|
||||
mPosY = screenY;
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean scrolled(int amount) {
|
||||
@Override
|
||||
public boolean scrolled(int amount) {
|
||||
|
||||
if (amount > 0) {
|
||||
if (amount > 0) {
|
||||
|
||||
mMap.animator().animateZoom(250, 0.75f, 0, 0);
|
||||
} else {
|
||||
float fx = mPosX - mMap.getWidth() / 2;
|
||||
float fy = mPosY - mMap.getHeight() / 2;
|
||||
mMap.animator().animateZoom(250, 0.75f, 0, 0);
|
||||
} else {
|
||||
float fx = mPosX - mMap.getWidth() / 2;
|
||||
float fy = mPosY - mMap.getHeight() / 2;
|
||||
|
||||
mMap.animator().animateZoom(250, 1.333f, fx, fy);
|
||||
}
|
||||
mMap.updateMap(false);
|
||||
mMap.animator().animateZoom(250, 1.333f, fx, fy);
|
||||
}
|
||||
mMap.updateMap(false);
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,184 +16,184 @@
|
||||
*/
|
||||
package org.oscim.gdx;
|
||||
|
||||
import org.oscim.event.MotionEvent;
|
||||
import org.oscim.map.Map;
|
||||
|
||||
import com.badlogic.gdx.Gdx;
|
||||
import com.badlogic.gdx.Input.Buttons;
|
||||
import com.badlogic.gdx.InputProcessor;
|
||||
|
||||
import org.oscim.event.MotionEvent;
|
||||
import org.oscim.map.Map;
|
||||
|
||||
public class MotionHandler extends MotionEvent implements InputProcessor {
|
||||
private final Map mMap;
|
||||
private final Map mMap;
|
||||
|
||||
public MotionHandler(Map map) {
|
||||
mMap = map;
|
||||
}
|
||||
public MotionHandler(Map map) {
|
||||
mMap = map;
|
||||
}
|
||||
|
||||
int mPointerDown;
|
||||
long mDownTime;
|
||||
int mPointerDown;
|
||||
long mDownTime;
|
||||
|
||||
int mType;
|
||||
int mType;
|
||||
|
||||
int mPointer;
|
||||
int mCurX;
|
||||
int mCurY;
|
||||
int mPointerX[] = new int[10];
|
||||
int mPointerY[] = new int[10];
|
||||
int mPointer;
|
||||
int mCurX;
|
||||
int mCurY;
|
||||
int mPointerX[] = new int[10];
|
||||
int mPointerY[] = new int[10];
|
||||
|
||||
@Override
|
||||
public int getAction() {
|
||||
return mType;
|
||||
}
|
||||
@Override
|
||||
public int getAction() {
|
||||
return mType;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getX() {
|
||||
return mCurX;
|
||||
}
|
||||
@Override
|
||||
public float getX() {
|
||||
return mCurX;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getY() {
|
||||
return mCurY;
|
||||
}
|
||||
@Override
|
||||
public float getY() {
|
||||
return mCurY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getX(int idx) {
|
||||
if (idx >= 10)
|
||||
return 0;
|
||||
@Override
|
||||
public float getX(int idx) {
|
||||
if (idx >= 10)
|
||||
return 0;
|
||||
|
||||
return mPointerX[idx];
|
||||
}
|
||||
return mPointerX[idx];
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getY(int idx) {
|
||||
if (idx >= 10)
|
||||
return 0;
|
||||
@Override
|
||||
public float getY(int idx) {
|
||||
if (idx >= 10)
|
||||
return 0;
|
||||
|
||||
return mPointerY[idx];
|
||||
}
|
||||
return mPointerY[idx];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getPointerCount() {
|
||||
return mPointerDown;
|
||||
}
|
||||
@Override
|
||||
public int getPointerCount() {
|
||||
return mPointerDown;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getTime() {
|
||||
return (long) (mTime / 1000000d);
|
||||
}
|
||||
@Override
|
||||
public long getTime() {
|
||||
return (long) (mTime / 1000000d);
|
||||
}
|
||||
|
||||
// -------- InputProcessor ----------
|
||||
@Override
|
||||
public boolean keyDown(int keycode) {
|
||||
return false;
|
||||
}
|
||||
// -------- InputProcessor ----------
|
||||
@Override
|
||||
public boolean keyDown(int keycode) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean keyUp(int keycode) {
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean keyUp(int keycode) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean keyTyped(char character) {
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean keyTyped(char character) {
|
||||
return false;
|
||||
}
|
||||
|
||||
long mTime = System.currentTimeMillis();
|
||||
long mTime = System.currentTimeMillis();
|
||||
|
||||
@Override
|
||||
public boolean touchDown(int screenX, int screenY, int pointer, int button) {
|
||||
if (pointer >= 10)
|
||||
return true;
|
||||
@Override
|
||||
public boolean touchDown(int screenX, int screenY, int pointer, int button) {
|
||||
if (pointer >= 10)
|
||||
return true;
|
||||
|
||||
if (button != Buttons.LEFT)
|
||||
return false;
|
||||
if (button != Buttons.LEFT)
|
||||
return false;
|
||||
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
if (mPointerDown++ == 0) {
|
||||
mDownTime = getTime();
|
||||
mType = MotionEvent.ACTION_DOWN;
|
||||
} else {
|
||||
mType = MotionEvent.ACTION_POINTER_DOWN;
|
||||
}
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
if (mPointerDown++ == 0) {
|
||||
mDownTime = getTime();
|
||||
mType = MotionEvent.ACTION_DOWN;
|
||||
} else {
|
||||
mType = MotionEvent.ACTION_POINTER_DOWN;
|
||||
}
|
||||
|
||||
mPointerX[pointer] = mCurX = screenX;
|
||||
mPointerY[pointer] = mCurY = screenY;
|
||||
mPointer = pointer;
|
||||
//GdxMap.log.debug("down " + screenX + ":" + screenY
|
||||
// + " / " + pointer + " " + mPointerDown
|
||||
// + " " + (getTime() - mDownTime));
|
||||
mPointerX[pointer] = mCurX = screenX;
|
||||
mPointerY[pointer] = mCurY = screenY;
|
||||
mPointer = pointer;
|
||||
//GdxMap.log.debug("down " + screenX + ":" + screenY
|
||||
// + " / " + pointer + " " + mPointerDown
|
||||
// + " " + (getTime() - mDownTime));
|
||||
|
||||
mMap.input.fire(null, this);
|
||||
return true;
|
||||
}
|
||||
mMap.input.fire(null, this);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean touchUp(int screenX, int screenY, int pointer, int button) {
|
||||
if (pointer >= 10)
|
||||
return true;
|
||||
@Override
|
||||
public boolean touchUp(int screenX, int screenY, int pointer, int button) {
|
||||
if (pointer >= 10)
|
||||
return true;
|
||||
|
||||
if (button != Buttons.LEFT)
|
||||
return false;
|
||||
if (button != Buttons.LEFT)
|
||||
return false;
|
||||
|
||||
if (mPointerDown == 0)
|
||||
return true;
|
||||
if (mPointerDown == 0)
|
||||
return true;
|
||||
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
mType = (--mPointerDown == 0) ?
|
||||
MotionEvent.ACTION_UP :
|
||||
MotionEvent.ACTION_POINTER_UP;
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
mType = (--mPointerDown == 0) ?
|
||||
MotionEvent.ACTION_UP :
|
||||
MotionEvent.ACTION_POINTER_UP;
|
||||
|
||||
mPointerX[pointer] = mCurX = screenX;
|
||||
mPointerY[pointer] = mCurY = screenY;
|
||||
mPointer = pointer;
|
||||
mPointerX[pointer] = mCurX = screenX;
|
||||
mPointerY[pointer] = mCurY = screenY;
|
||||
mPointer = pointer;
|
||||
|
||||
//GdxMap.log.debug("up " + screenX + ":" + screenY
|
||||
// + " / " + pointer + " " + mPointerDown
|
||||
// + " " + (getTime() - mDownTime));
|
||||
//GdxMap.log.debug("up " + screenX + ":" + screenY
|
||||
// + " / " + pointer + " " + mPointerDown
|
||||
// + " " + (getTime() - mDownTime));
|
||||
|
||||
mMap.input.fire(null, this);
|
||||
return true;
|
||||
}
|
||||
mMap.input.fire(null, this);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean touchDragged(int screenX, int screenY, int pointer) {
|
||||
if (pointer >= 10)
|
||||
return true;
|
||||
@Override
|
||||
public boolean touchDragged(int screenX, int screenY, int pointer) {
|
||||
if (pointer >= 10)
|
||||
return true;
|
||||
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
mType = MotionEvent.ACTION_MOVE;
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
mType = MotionEvent.ACTION_MOVE;
|
||||
|
||||
mPointerX[pointer] = mCurX = screenX;
|
||||
mPointerY[pointer] = mCurY = screenY;
|
||||
mPointer = pointer;
|
||||
mPointerX[pointer] = mCurX = screenX;
|
||||
mPointerY[pointer] = mCurY = screenY;
|
||||
mPointer = pointer;
|
||||
|
||||
//GdxMap.log.debug("dragged " + screenX + ":" + screenY
|
||||
// + " / " + pointer + " " + (getTime() - mDownTime));
|
||||
//GdxMap.log.debug("dragged " + screenX + ":" + screenY
|
||||
// + " / " + pointer + " " + (getTime() - mDownTime));
|
||||
|
||||
mMap.input.fire(null, this);
|
||||
return true;
|
||||
}
|
||||
mMap.input.fire(null, this);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseMoved(int screenX, int screenY) {
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
mType = MotionEvent.ACTION_MOVE;
|
||||
@Override
|
||||
public boolean mouseMoved(int screenX, int screenY) {
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
mType = MotionEvent.ACTION_MOVE;
|
||||
|
||||
mPointerX[Buttons.LEFT] = mCurX = screenX;
|
||||
mPointerY[Buttons.LEFT] = mCurY = screenY;
|
||||
mPointer = Buttons.LEFT;
|
||||
mPointerX[Buttons.LEFT] = mCurX = screenX;
|
||||
mPointerY[Buttons.LEFT] = mCurY = screenY;
|
||||
mPointer = Buttons.LEFT;
|
||||
|
||||
//GdxMap.log.debug("moved " + screenX + ":" + screenY);
|
||||
//GdxMap.log.debug("moved " + screenX + ":" + screenY);
|
||||
|
||||
mMap.input.fire(null, this);
|
||||
return true;
|
||||
}
|
||||
mMap.input.fire(null, this);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean scrolled(int amount) {
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
@Override
|
||||
public boolean scrolled(int amount) {
|
||||
mTime = Gdx.input.getCurrentEventTime();
|
||||
|
||||
return false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user