diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 0dcbefcc575e7d3c2c0a1ded8b533bc5278dd3a6..e063e09af073cb21899d389e6613f7fae6bdcf34 100644 (file)
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.ObjectMap;
import com.badlogic.gdx.utils.TimeUtils;
+import org.jetbrains.annotations.Nullable;
import ru.deadsoftware.cavedroid.MainConfig;
import ru.deadsoftware.cavedroid.game.input.IKeyboardInputHandler;
import ru.deadsoftware.cavedroid.game.input.IMouseInputHandler;
import ru.deadsoftware.cavedroid.misc.utils.MeasureUnitsUtilsKt;
import ru.deadsoftware.cavedroid.misc.utils.RenderingUtilsKt;
-import javax.annotation.CheckForNull;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.Comparator;
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;
}
}
- private boolean handleMouseAction(@CheckForNull MouseInputAction action) {
+ private boolean handleMouseAction(@Nullable MouseInputAction action) {
if (action == null) {
return false;
}
}
private boolean onMouseActionEvent(int mouseX, int mouseY, int button, boolean touchUp, int pointer) {
- @CheckForNull MouseInputAction action = mMouseInputActionMapper
+ @Nullable MouseInputAction action = mMouseInputActionMapper
.map((float) mouseX, (float) mouseY, getCameraViewport(), button, touchUp, pointer);
return handleMouseAction(action);
}
return false;
}
- @CheckForNull MouseInputAction action =
+ @Nullable MouseInputAction action =
mMouseInputActionMapper.mapDragged(screenX, screenY, getCameraViewport(), pointer);
return handleMouseAction(action);
}
@Override
public boolean scrolled(float amountX, float amountY) {
- @CheckForNull MouseInputAction action = mMouseInputActionMapper
+ @Nullable MouseInputAction action = mMouseInputActionMapper
.mapScrolled(Gdx.input.getX(), Gdx.input.getY(), amountX, amountY, getCameraViewport());
return handleMouseAction(action);
}
private boolean handleKeyboardAction(int keycode, boolean isKeyDown) {
- @CheckForNull final KeyboardInputAction action = mKeyboardInputActionMapper
+ @Nullable final KeyboardInputAction action = mKeyboardInputActionMapper
.map(keycode, isKeyDown);
if (action == null) {
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();