diff --git a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java b/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java
index c9de4fab9d1ac38131f30bad3a966f6839c5b5d0..0d0cb5639e934f7f8533815036b2730999ba1d41 100644 (file)
public class InputHandlerGame implements InputProcessor {
- private GameProc gameProc;
+ private GameProc gp;
private GameInput gameInput;
private float tWidth, tHeight;
- public InputHandlerGame(GameProc gameProc) {
- this.gameProc = gameProc;
- this.gameInput = new GameInput(gameProc);
- tWidth = gameProc.renderer.camera.viewportWidth;
- tHeight = gameProc.renderer.camera.viewportHeight;
+ public InputHandlerGame(GameProc gp) {
+ this.gp = gp;
+ this.gameInput = new GameInput(gp);
+ tWidth = gp.renderer.getWidth();
+ tHeight = gp.renderer.getHeight();
}
@Override
@Override
public boolean touchDown(int screenX, int screenY, int pointer, int button) {
- int tx = (int)(screenX * tWidth/getWidth());
- int ty = (int)(screenY * tHeight/getHeight());
- screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
- screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
+ int tx = (int) (screenX * tWidth / getWidth());
+ int ty = (int) (screenY * tHeight / getHeight());
+ screenX *= gp.renderer.getWidth() / getWidth();
+ screenY *= gp.renderer.getHeight() / getHeight();
if (CaveGame.TOUCH) {
if (tx > 26 && tx < 52 && ty > tHeight - 52 && ty < tHeight - 26) {
- if (gameProc.ctrlMode==1) gameInput.keyDown(Input.Keys.W);
- else gameInput.keyDown(Input.Keys.SPACE);
+ if (gp.ctrlMode == 1) gameInput.keyDown(Input.Keys.W);
+ else gameInput.keyDown(Input.Keys.SPACE);
} else if (tx > 0 && tx < 26 && ty > tHeight - 26) {
gameInput.keyDown(Input.Keys.A);
} else if (tx > 26 && tx < 52 && ty > tHeight - 26) {
- if (gameProc.ctrlMode==1) gameInput.keyDown(Input.Keys.S);
- else gameInput.keyDown(Input.Keys.CONTROL_LEFT);
+ if (gp.ctrlMode == 1) gameInput.keyDown(Input.Keys.S);
+ else gameInput.keyDown(Input.Keys.CONTROL_LEFT);
} else if (tx > 52 && tx < 78 && ty > tHeight - 26) {
gameInput.keyDown(Input.Keys.D);
} else if (tx > 78 && tx < 104 && ty > tHeight - 26) {
@Override
public boolean touchUp(int screenX, int screenY, int pointer, int button) {
- int tx = (int)(screenX * tWidth/getWidth());
- int ty = (int)(screenY * tHeight/getHeight());
- screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
- screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
+ int tx = (int) (screenX * tWidth / getWidth());
+ int ty = (int) (screenY * tHeight / getHeight());
+ screenX *= gp.renderer.getWidth() / getWidth();
+ screenY *= gp.renderer.getHeight() / getHeight();
if (CaveGame.TOUCH) {
if (tx > 26 && tx < 52 && ty > tHeight - 52 && ty < tHeight - 26) {
- if (gameProc.ctrlMode==1) gameInput.keyUp(Input.Keys.W);
+ if (gp.ctrlMode == 1) gameInput.keyUp(Input.Keys.W);
else gameInput.keyUp(Input.Keys.SPACE);
} else if (tx > 0 && tx < 26 && ty > tHeight - 26) {
gameInput.keyUp(Input.Keys.A);
} else if (tx > 26 && tx < 52 && ty > tHeight - 26) {
- if (gameProc.ctrlMode==1) gameInput.keyUp(Input.Keys.S);
+ if (gp.ctrlMode == 1) gameInput.keyUp(Input.Keys.S);
else gameInput.keyUp(Input.Keys.CONTROL_LEFT);
} else if (tx > 52 && tx < 78 && ty > tHeight - 26) {
gameInput.keyUp(Input.Keys.D);
@Override
public boolean touchDragged(int screenX, int screenY, int pointer) {
- screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
- screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
- if (gameProc.isKeyDown && (screenX>78 || screenY<gameProc.renderer.getHeight()-52)) {
- gameInput.keyUp(gameProc.keyDownCode);
+ screenX *= gp.renderer.getWidth() / getWidth();
+ screenY *= gp.renderer.getHeight() / getHeight();
+ if (gp.isKeyDown && (screenX > 78 || screenY < gp.renderer.getHeight() - 52)) {
+ gameInput.keyUp(gp.keyDownCode);
} else {
gameInput.touchDragged(screenX, screenY);
}
@Override
public boolean mouseMoved(int screenX, int screenY) {
- screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
- screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
- gameInput.mouseMoved(screenX,screenY);
return false;
}