diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 302b70586d3b55e0be012b3a380485d8b167848f..93dc8b95f233bd1abb8ac5e01c9efbece0498a30 100644 (file)
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.ObjectMap;
+import com.badlogic.gdx.utils.TimeUtils;
import ru.deadsoftware.cavedroid.MainConfig;
import ru.deadsoftware.cavedroid.MainConfig;
-import ru.deadsoftware.cavedroid.game.input.IGameInputHandler;
+import ru.deadsoftware.cavedroid.game.input.IKeyboardInputHandler;
+import ru.deadsoftware.cavedroid.game.input.IMouseInputHandler;
import ru.deadsoftware.cavedroid.game.input.Joystick;
import ru.deadsoftware.cavedroid.game.input.action.KeyboardInputAction;
import ru.deadsoftware.cavedroid.game.input.action.MouseInputAction;
import ru.deadsoftware.cavedroid.game.input.Joystick;
import ru.deadsoftware.cavedroid.game.input.action.KeyboardInputAction;
import ru.deadsoftware.cavedroid.game.input.action.MouseInputAction;
private final CursorMouseInputHandler mCursorMouseInputHandler;
private final MouseInputActionMapper mMouseInputActionMapper;
private final KeyboardInputActionMapper mKeyboardInputActionMapper;
private final CursorMouseInputHandler mCursorMouseInputHandler;
private final MouseInputActionMapper mMouseInputActionMapper;
private final KeyboardInputActionMapper mKeyboardInputActionMapper;
- private final Set<IGameInputHandler<MouseInputAction>> mMouseInputHandlers;
- private final Set<IGameInputHandler<KeyboardInputAction>> mKeyboardInputHandlers;
+ private final Set<IMouseInputHandler> mMouseInputHandlers;
+ private final Set<IKeyboardInputHandler> mKeyboardInputHandlers;
private final GameWindowsManager mGameWindowsManager;
private final TooltipManager mTooltipManager;
private final TouchButton mouseLeftTouchButton, mouseRightTouchButton;
private final GameWindowsManager mGameWindowsManager;
private final TooltipManager mTooltipManager;
private final TouchButton mouseLeftTouchButton, mouseRightTouchButton;
+ private final Vector2 mCamCenterToPlayer = new Vector2();
+
+ private float mTouchDownX, mTouchDownY;
+ private long mCameraDelayMs = 0L;
+
@Inject
GameRenderer(MainConfig mainConfig,
MobsController mobsController,
@Inject
GameRenderer(MainConfig mainConfig,
MobsController mobsController,
CursorMouseInputHandler cursorMouseInputHandler,
MouseInputActionMapper mouseInputActionMapper,
KeyboardInputActionMapper keyboardInputActionMapper,
CursorMouseInputHandler cursorMouseInputHandler,
MouseInputActionMapper mouseInputActionMapper,
KeyboardInputActionMapper keyboardInputActionMapper,
- Set<IGameInputHandler<MouseInputAction>> mouseInputHandlers,
- Set<IGameInputHandler<KeyboardInputAction>> keyboardInputHandlers,
+ Set<IMouseInputHandler> mouseInputHandlers,
+ Set<IKeyboardInputHandler> keyboardInputHandlers,
GameWindowsManager gameWindowsManager,
TooltipManager tooltipManager) {
super(mainConfig.getWidth(), mainConfig.getHeight());
GameWindowsManager gameWindowsManager,
TooltipManager tooltipManager) {
super(mainConfig.getWidth(), mainConfig.getHeight());
mMobsController = mobsController;
mGameWorld = gameWorld;
mRenderers = new ArrayList<>(renderers);
mMobsController = mobsController;
mGameWorld = gameWorld;
mRenderers = new ArrayList<>(renderers);
- mRenderers.sort(Comparator.comparingInt(IGameRenderer::getRenderLayer));
+ kotlin.collections.CollectionsKt.sortWith(mRenderers, new Comparator<IGameRenderer>() {
+ @Override
+ public int compare(IGameRenderer o1, IGameRenderer o2) {
+ return o1.getRenderLayer() - o2.getRenderLayer();
+ }
+ });
mCursorMouseInputHandler = cursorMouseInputHandler;
mMouseInputActionMapper = mouseInputActionMapper;
mKeyboardInputActionMapper = keyboardInputActionMapper;
mCursorMouseInputHandler = cursorMouseInputHandler;
mMouseInputActionMapper = mouseInputActionMapper;
mKeyboardInputActionMapper = keyboardInputActionMapper;
Gdx.gl.glClearColor(0f, .6f, .6f, 1f);
}
Gdx.gl.glClearColor(0f, .6f, .6f, 1f);
}
- private float mTouchDownX, mTouchDownY;
-
private void updateDynamicCameraPosition(float delta) {
Player player = mMobsController.getPlayer();
float plTargetX = player.getX() + player.getWidth() / 2;
float plTargetY = player.getY() + player.getHeight() / 2;
private void updateDynamicCameraPosition(float delta) {
Player player = mMobsController.getPlayer();
float plTargetX = player.getX() + player.getWidth() / 2;
float plTargetY = player.getY() + player.getHeight() / 2;
+ float camCenterX = getCamX() + getWidth() / 2;
+ float camCenterY = getCamY() + getHeight() / 2;
+
float camTargetX, camTargetY;
float camTargetX, camTargetY;
- if (player.controlMode == Player.ControlMode.WALK) {
+ boolean followPlayer = player.controlMode == Player.ControlMode.WALK || !mMainConfig.isTouch();
+
+ if (followPlayer) {
camTargetX = plTargetX + Math.min(player.getVelocity().x * 2, getWidth() / 2);
camTargetY = plTargetY + player.getVelocity().y;
} else {
camTargetX = plTargetX + Math.min(player.getVelocity().x * 2, getWidth() / 2);
camTargetY = plTargetY + player.getVelocity().y;
} else {
camTargetY = MeasureUnitsUtilsKt.getPx(player.cursorY) + MeasureUnitsUtilsKt.getPx(1) / 2;
}
camTargetY = MeasureUnitsUtilsKt.getPx(player.cursorY) + MeasureUnitsUtilsKt.getPx(1) / 2;
}
- float camCenterX = getCamX() + getWidth() / 2;
- float camCenterY = getCamY() + getHeight() / 2;
-
Vector2 moveVector = new Vector2(camTargetX - camCenterX, camTargetY - camCenterY);
Vector2 moveVector = new Vector2(camTargetX - camCenterX, camTargetY - camCenterY);
+ if (followPlayer && player.getVelocity().isZero()) {
+ mCameraDelayMs = TimeUtils.millis();
+ mCamCenterToPlayer.x = plTargetX - camCenterX;
+ mCamCenterToPlayer.y = plTargetY - camCenterY;
+ }
+
+ if (TimeUtils.timeSinceMillis(mCameraDelayMs) < 500L && !player.getVelocity().isZero()) {
+ updateStaticCameraPosition(plTargetX - mCamCenterToPlayer.x,
+ camCenterY + moveVector.y * delta * 2);
+ return;
+ }
+
float camX = getCamX();
float camY = getCamY();
float worldWidth = MeasureUnitsUtilsKt.getPx(mGameWorld.getWidth()) - getWidth() / 2;
float camX = getCamX();
float camY = getCamY();
float worldWidth = MeasureUnitsUtilsKt.getPx(mGameWorld.getWidth()) - getWidth() / 2;
setCamPos(camX, camY);
}
setCamPos(camX, camY);
}
+ private void updateStaticCameraPosition(float targetX, float targetY) {
+ setCamPos(targetX - getWidth() / 2, targetY - getHeight() / 2);
+ }
+
private void updateStaticCameraPosition() {
Player player = mMobsController.getPlayer();
private void updateStaticCameraPosition() {
Player player = mMobsController.getPlayer();
- setCamPos(player.getX() + player.getWidth() / 2 - getWidth() / 2,
- player.getY() + player.getHeight() / 2 - getHeight() / 2);
+ updateStaticCameraPosition(player.getX() + player.getWidth() / 2,
+ player.getY() + player.getHeight() / 2);
}
private void updateCameraPosition(float delta) {
}
private void updateCameraPosition(float delta) {
boolean anyProcessed = false;
boolean anyProcessed = false;
- for (IGameInputHandler<MouseInputAction> handler : mMouseInputHandlers) {
+ for (IMouseInputHandler handler : mMouseInputHandlers) {
final boolean conditions = handler.checkConditions(action);
if (conditions) {
anyProcessed = true;
final boolean conditions = handler.checkConditions(action);
if (conditions) {
anyProcessed = true;
boolean anyProcessed = false;
boolean anyProcessed = false;
- for (IGameInputHandler<KeyboardInputAction> handler : mKeyboardInputHandlers) {
+ for (IKeyboardInputHandler handler : mKeyboardInputHandlers) {
final boolean conditions = handler.checkConditions(action);
if (conditions) {
anyProcessed = true;
final boolean conditions = handler.checkConditions(action);
if (conditions) {
anyProcessed = true;
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
spriter.begin();
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
spriter.begin();
- mRenderers.forEach(iGameRenderer -> iGameRenderer.draw(spriter, shaper, getCameraViewport(), delta));
+ for (IGameRenderer iGameRenderer : mRenderers) {
+ iGameRenderer.draw(spriter, shaper, getCameraViewport(), delta);
+ }
handleMousePosition();
spriter.end();
handleMousePosition();
spriter.end();