diff --git a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java b/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java
index ffc38ccea589e80007e41a40c5c4af664472ef3e..6a912ac355f4d5145e144d68d84b6d785cfc8ebf 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);
}
@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();
+ 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);
- } else if (tx > 0 && tx < 26 && ty > tHeight - 26) {
+ if (screenX > 26 && screenX < 52 && screenY > gp.renderer.getHeight() - 52 &&
+ screenY < gp.renderer.getHeight() - 26) {
+ if (gp.ctrlMode == 1) gameInput.keyDown(Input.Keys.W);
+ else gameInput.keyDown(Input.Keys.SPACE);
+ } else if (screenX > 0 && screenX < 26 && screenY > gp.renderer.getHeight() - 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);
- } else if (tx > 52 && tx < 78 && ty > tHeight - 26) {
+ } else if (screenX > 26 && screenX < 52 && screenY > gp.renderer.getHeight() - 26) {
+ if (gp.ctrlMode == 1) gameInput.keyDown(Input.Keys.S);
+ else gameInput.keyDown(Input.Keys.CONTROL_LEFT);
+ } else if (screenX > 52 && screenX < 78 && screenY > gp.renderer.getHeight() - 26) {
gameInput.keyDown(Input.Keys.D);
- } else if (tx > 78 && tx < 104 && ty > tHeight - 26) {
+ } else if (screenX > 78 && screenX < 104 && screenY > gp.renderer.getHeight() - 26) {
gameInput.keyDown(Input.Keys.ALT_LEFT);
- } else if (tx > tWidth - 52 && tx < tWidth - 26 && ty > tHeight - 26) {
+ } else if (screenX > gp.renderer.getWidth() - 52 && screenX < gp.renderer.getWidth() - 26 &&
+ screenY > gp.renderer.getHeight() - 26) {
gameInput.touchDown(screenX, screenY, Input.Buttons.LEFT);
- } else if (tx > tWidth - 26 && screenY > ty - 26) {
+ } else if (screenX > gp.renderer.getWidth() - 26 && screenY > screenY - 26) {
gameInput.touchDown(screenX, screenY, Input.Buttons.RIGHT);
} else {
- gameInput.touchDown(screenX, screenY, Input.Buttons.LEFT);
+ gameInput.touchDown(screenX, screenY, -1);
}
} else {
gameInput.touchDown(screenX, screenY, button);
@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();
+ 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 (screenX > 26 && screenX < 52 && screenY > gp.renderer.getHeight() - 52 &&
+ screenY < gp.renderer.getHeight() - 26) {
+ if (gp.ctrlMode == 1) gameInput.keyUp(Input.Keys.W);
else gameInput.keyUp(Input.Keys.SPACE);
- } else if (tx > 0 && tx < 26 && ty > tHeight - 26) {
+ } else if (screenX > 0 && screenX < 26 && screenY > gp.renderer.getHeight() - 26) {
gameInput.keyUp(Input.Keys.A);
- } else if (tx > 26 && tx < 52 && ty > tHeight - 26) {
- if (gameProc.ctrlMode==1) gameInput.keyUp(Input.Keys.S);
+ } else if (screenX > 26 && screenX < 52 && screenY > gp.renderer.getHeight() - 26) {
+ 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) {
+ } else if (screenX > 52 && screenX < 78 && screenY > gp.renderer.getHeight() - 26) {
gameInput.keyUp(Input.Keys.D);
- } else if (tx > 78 && tx < 104 && ty > tHeight - 26) {
+ } else if (screenX > 78 && screenX < 104 && screenY > gp.renderer.getHeight() - 26) {
gameInput.keyUp(Input.Keys.ALT_LEFT);
- } else if (tx > tWidth - 52 && tx < tWidth - 26 && ty > tHeight - 26) {
+ } else if (screenX > gp.renderer.getWidth() - 52 && screenX < gp.renderer.getWidth() - 26 &&
+ screenY > gp.renderer.getHeight() - 26) {
gameInput.touchUp(screenX, screenY, Input.Buttons.LEFT);
- } else if (tx > tWidth - 26 && screenY > ty - 26) {
+ } else if (screenX > gp.renderer.getWidth() - 26 && screenY > screenY - 26) {
gameInput.touchUp(screenX, screenY, Input.Buttons.RIGHT);
} else {
- gameInput.touchUp(screenX, screenY, Input.Buttons.LEFT);
+ gameInput.touchUp(screenX, screenY, -1);
}
} else {
gameInput.touchUp(screenX, screenY, button);
@Override
public boolean touchDragged(int screenX, int screenY, int pointer) {
- screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
- screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
- gameInput.touchDragged(screenX, screenY);
+ 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);
+ }
return false;
}
@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;
}