diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 2ae4756f54ab06b08b1c309ca3330348f4726d3c..93dc8b95f233bd1abb8ac5e01c9efbece0498a30 100644 (file)
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.TimeUtils;
import ru.deadsoftware.cavedroid.MainConfig;
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.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 GameWindowsManager mGameWindowsManager;
private final TooltipManager mTooltipManager;
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;
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();