diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 9ad88f6eb4517c61f7c437ce202a6e5c49158d9c..2a2c262a6f4fe3cb0a36feb45f33f996080cc091 100644 (file)
package ru.deadsoftware.cavecraft;
import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputProcessor;
import com.badlogic.gdx.Screen;
import ru.deadsoftware.cavecraft.game.GameInputHandler;
import ru.deadsoftware.cavecraft.game.GameProc;
-import ru.deadsoftware.cavecraft.game.GameRenderer;
public class GameScreen implements Screen {
+ public static int FPS;
+
private GameProc gameProc;
- private GameInputHandler gameInput;
public GameScreen() {
Assets.load();
+ Items.load();
gameProc = new GameProc();
- gameInput = new GameInputHandler(gameProc);
- Gdx.input.setInputProcessor(new InputHandler());
+ Gdx.input.setInputProcessor(new InputHandler(gameProc));
}
public static int getWidth() {
@Override
public void render(float delta) {
+ if (CaveGame.STATE == GameState.RESTART) {
+ gameProc = new GameProc();
+ Gdx.input.setInputProcessor(new InputHandler(gameProc));
+ CaveGame.STATE = GameState.GAME_PLAY;
+ }
+ FPS = (int)(1/delta);
gameProc.update(delta);
gameProc.renderer.render();
}
}
- private class InputHandler implements InputProcessor {
-
- @Override
- public boolean keyDown(int keycode) {
- gameInput.keyDown(keycode);
- return false;
- }
-
- @Override
- public boolean keyUp(int keycode) {
- gameInput.keyUp(keycode);
- return false;
- }
-
- @Override
- public boolean keyTyped(char character) {
- return false;
- }
-
- @Override
- public boolean touchDown(int screenX, int screenY, int pointer, int button) {
- screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
- screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
- gameInput.touchDown(screenX, screenY, button);
- return false;
- }
-
- @Override
- public boolean touchUp(int screenX, int screenY, int pointer, int button) {
- screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
- screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
- gameInput.touchUp(screenX, screenY, button);
- return false;
- }
-
- @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);
- 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;
- }
-
- @Override
- public boolean scrolled(int amount) {
- return false;
- }
- }
}