diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 423469372609e4c3f53321bf2b00d0f37974519a..93dc8b95f233bd1abb8ac5e01c9efbece0498a30 100644 (file)
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.math.Rectangle;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+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.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.render.IGameRenderer;
import ru.deadsoftware.cavedroid.game.ui.TooltipManager;
import ru.deadsoftware.cavedroid.game.ui.windows.GameWindowsManager;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.misc.Renderer;
+import ru.deadsoftware.cavedroid.misc.utils.MeasureUnitsUtilsKt;
import ru.deadsoftware.cavedroid.misc.utils.RenderingUtilsKt;
-import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt;
import javax.annotation.CheckForNull;
import javax.inject.Inject;
@GameScope
public class GameRenderer extends Renderer {
+ private static final float CAMERA_SPEED = 72f;
+ private static final float MAX_CAM_DISTANCE_FROM_PLAYER = 64f;
private static final float DRAG_THRESHOLD = 1f;
private static final TouchButton nullButton = new TouchButton(null, -1, true);
private final MainConfig mMainConfig;
private final MobsController mMobsController;
+ private final GameWorld mGameWorld;
private final List<IGameRenderer> mRenderers;
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 Vector2 mCamCenterToPlayer = new Vector2();
+
+ private float mTouchDownX, mTouchDownY;
+ private long mCameraDelayMs = 0L;
+
@Inject
GameRenderer(MainConfig mainConfig,
MobsController mobsController,
+ GameWorld gameWorld,
Set<IGameRenderer> renderers,
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());
mMainConfig = mainConfig;
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;
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;
+
+ float camCenterX = getCamX() + getWidth() / 2;
+ float camCenterY = getCamY() + getHeight() / 2;
+
+ float camTargetX, camTargetY;
+
+ 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 = MeasureUnitsUtilsKt.getPx(player.cursorX) + MeasureUnitsUtilsKt.getPx(1) / 2;
+ camTargetY = MeasureUnitsUtilsKt.getPx(player.cursorY) + MeasureUnitsUtilsKt.getPx(1) / 2;
+ }
+
+ 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;
+
+ if (moveVector.x >= worldWidth) {
+ camX += mGameWorld.getWidthPx();
+ moveVector.x -= mGameWorld.getWidthPx();
+ } else if (moveVector.x <= -worldWidth) {
+ camX -= mGameWorld.getWidthPx();
+ moveVector.x += mGameWorld.getWidthPx();
+ }
+
+ setCamPos(camX + moveVector.x * delta * 2, camY + moveVector.y * delta * 2);
+
- private void updateCameraPosition() {
+ camX = getCamX();
+ camY = getCamY();
+
+ if (camX + getWidth() / 2 > plTargetX + MAX_CAM_DISTANCE_FROM_PLAYER) {
+ camX = plTargetX + MAX_CAM_DISTANCE_FROM_PLAYER - getWidth() / 2;
+ }
+
+ if (camY + getHeight() / 2 > plTargetY + MAX_CAM_DISTANCE_FROM_PLAYER) {
+ camY = plTargetY + MAX_CAM_DISTANCE_FROM_PLAYER - getHeight() / 2;
+ }
+
+ if (camX + getWidth() / 2 < plTargetX - MAX_CAM_DISTANCE_FROM_PLAYER) {
+ camX = plTargetX - MAX_CAM_DISTANCE_FROM_PLAYER - getWidth() / 2;
+ }
+
+ if (camY + getHeight() / 2 < plTargetY - MAX_CAM_DISTANCE_FROM_PLAYER) {
+ camY = plTargetY - MAX_CAM_DISTANCE_FROM_PLAYER - getHeight() / 2;
+ }
+
+ setCamPos(camX, camY);
+ }
+
+ private void updateStaticCameraPosition(float targetX, float targetY) {
+ setCamPos(targetX - getWidth() / 2, targetY - getHeight() / 2);
+ }
+
+ 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) {
+ if (mMainConfig.isUseDynamicCamera()) {
+ updateDynamicCameraPosition(delta);
+ } else {
+ updateStaticCameraPosition();
+ }
}
private float transformScreenX(int screenX) {
boolean anyProcessed = false;
- for (IGameInputHandler<MouseInputAction> handler : mMouseInputHandlers) {
+ for (IMouseInputHandler handler : mMouseInputHandlers) {
final boolean conditions = handler.checkConditions(action);
if (conditions) {
anyProcessed = true;
float touchX = transformScreenX(screenX);
float touchY = transformScreenY(screenY);
+ final Joystick joy = mMainConfig.getJoystick();
+
if (mMainConfig.isTouch()) {
+ if (joy != null && joy.getActive() && joy.getPointer() == pointer) {
+ return onMouseActionEvent(screenX, screenY, nullButton.getCode(), true, pointer);
+ }
+
TouchButton touchedKey = getTouchedKey(touchX, touchY);
if (touchedKey.isMouse()) {
return onMouseActionEvent(screenX, screenY, touchedKey.getCode(), true, pointer);
boolean anyProcessed = false;
- for (IGameInputHandler<KeyboardInputAction> handler : mKeyboardInputHandlers) {
+ for (IKeyboardInputHandler handler : mKeyboardInputHandlers) {
final boolean conditions = handler.checkConditions(action);
if (conditions) {
anyProcessed = true;
@Override
public void render(float delta) {
- updateCameraPosition();
+ updateCameraPosition(delta);
if (mMainConfig.getJoystick() != null && mMainConfig.getJoystick().getActive()) {
mMainConfig.getJoystick().updateState(
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();