X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameRenderer.java;h=b54bead932f38f903a7f829cf88b5c1a60d73088;hb=cf4113d5bfd3fca7c3815bf14a214eebd822216c;hp=28e93bb743438aaa45c49b511bfccc2f1d60a498;hpb=17c1be4c02b27fefa1bf6abd0547ac7e9743d493;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java index 28e93bb..b54bead 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java @@ -1,259 +1,219 @@ package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.graphics.g2d.TextureRegion; -import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.math.Rectangle; -import ru.deadsoftware.cavedroid.CaveGame; -import ru.deadsoftware.cavedroid.GameScreen; -import ru.deadsoftware.cavedroid.game.mobs.Mob; -import ru.deadsoftware.cavedroid.game.objects.Drop; -import ru.deadsoftware.cavedroid.misc.ControlMode; +import com.badlogic.gdx.utils.ObjectMap; +import ru.deadsoftware.cavedroid.MainConfig; +import ru.deadsoftware.cavedroid.game.input.IGameInputHandler; +import ru.deadsoftware.cavedroid.game.input.action.KeyboardInputAction; +import ru.deadsoftware.cavedroid.game.input.action.MouseInputAction; +import ru.deadsoftware.cavedroid.game.input.action.keys.MouseInputActionKey; +import ru.deadsoftware.cavedroid.game.input.handler.mouse.CursorMouseInputHandler; +import ru.deadsoftware.cavedroid.game.input.mapper.KeyboardInputActionMapper; +import ru.deadsoftware.cavedroid.game.input.mapper.MouseInputActionMapper; +import ru.deadsoftware.cavedroid.game.mobs.MobsController; +import ru.deadsoftware.cavedroid.game.mobs.Player; +import ru.deadsoftware.cavedroid.game.objects.TouchButton; +import ru.deadsoftware.cavedroid.game.render.IGameRenderer; +import ru.deadsoftware.cavedroid.misc.Assets; import ru.deadsoftware.cavedroid.misc.Renderer; -import static ru.deadsoftware.cavedroid.GameScreen.GP; -import static ru.deadsoftware.cavedroid.misc.Assets.guiMap; -import static ru.deadsoftware.cavedroid.misc.Assets.textureRegions; +import javax.annotation.CheckForNull; +import javax.inject.Inject; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Set; +@GameScope public class GameRenderer extends Renderer { - GameRenderer(float width, float height) { - super(width, height); + private final MainConfig mMainConfig; + private final MobsController mMobsController; + private final List mRenderers; + private final CursorMouseInputHandler mCursorMouseInputHandler; + private final MouseInputActionMapper mMouseInputActionMapper; + private final KeyboardInputActionMapper mKeyboardInputActionMapper; + private final Set> mMouseInputHandlers; + private final Set> mKeyboardInputHandlers; + + @Inject + GameRenderer(MainConfig mainConfig, + MobsController mobsController, + Set renderers, + CursorMouseInputHandler cursorMouseInputHandler, + MouseInputActionMapper mouseInputActionMapper, + KeyboardInputActionMapper keyboardInputActionMapper, + Set> mouseInputHandlers, + Set> keyboardInputHandlers) { + super(mainConfig.getWidth(), mainConfig.getHeight()); + + mMainConfig = mainConfig; + mMobsController = mobsController; + mRenderers = new ArrayList<>(renderers); + mRenderers.sort(Comparator.comparingInt(IGameRenderer::getRenderLayer)); + mCursorMouseInputHandler = cursorMouseInputHandler; + mMouseInputActionMapper = mouseInputActionMapper; + mKeyboardInputActionMapper = keyboardInputActionMapper; + mMouseInputHandlers = mouseInputHandlers; + mKeyboardInputHandlers = keyboardInputHandlers; + Gdx.gl.glClearColor(0f, .6f, .6f, 1f); } - private float drawX(int x) { - return x * 16 - getCamX(); + private void updateCameraPosition() { + Player player = mMobsController.getPlayer(); + setCamPos(player.getX() + player.getWidth() / 2 - getWidth() / 2, + player.getY() + player.getHeight() / 2 - getHeight() / 2); } - private float drawY(int y) { - return y * 16 - getCamY(); + private float transformScreenX(int screenX) { + return getWidth() / Gdx.graphics.getWidth() * screenX; } - private void drawWreck(int bl) { - if (GP.input.getBlockDamage() > 0) { - int index = 10 * GP.input.getBlockDamage() / GameItems.getBlock(bl).getHp(); - String key = "break_" + index; - spriter.draw(textureRegions.get(key), GP.input.getCurX() * 16 - getCamX(), - GP.input.getCurY() * 16 - getCamY()); - } + private float transformScreenY(int screenY) { + return getHeight() / Gdx.graphics.getHeight() * screenY; } - private void drawBlock(int x, int y, boolean drawBG) { - if (drawBG) { - if ((!GP.world.hasForeAt(x, y) || GP.world.getForeMapBlock(x, y).isTransparent()) - && GP.world.hasBackAt(x, y)) { - spriter.draw(GP.world.getBackMapBlock(x, y).getTex(), drawX(x), drawY(y)); - if (!GP.world.hasForeAt(x, y) && x == GP.input.getCurX() && y == GP.input.getCurY()) - drawWreck(GP.world.getBackMap(GP.input.getCurX(), GP.input.getCurY())); - } - } - if (GP.world.hasForeAt(x, y) && GP.world.getForeMapBlock(x, y).isBackground() == drawBG) { - spriter.draw(GP.world.getForeMapBlock(x, y).getTex(), drawX(x), drawY(y)); - if (x == GP.input.getCurX() && y == GP.input.getCurY()) - drawWreck(GP.world.getForeMap(GP.input.getCurX(), GP.input.getCurY())); - } + private void handleMousePosition() { + final Rectangle viewport = getCameraViewport(); + final MouseInputAction action = new MouseInputAction( + Gdx.input.getX() * (viewport.width / Gdx.graphics.getWidth()), + Gdx.input.getY() * (viewport.height / Gdx.graphics.getHeight()), + MouseInputActionKey.None.INSTANCE, + viewport); + + mCursorMouseInputHandler.handle(action); } - private void drawWorld(boolean bg) { - int minX = (int) (getCamX() / 16) - 1; - int minY = (int) (getCamY() / 16) - 1; - int maxX = (int) ((getCamX() + getWidth()) / 16) + 1; - int maxY = (int) ((getCamY() + getHeight()) / 16) + 1; - if (minY < 0) minY = 0; - if (maxY > GP.world.getHeight()) maxY = GP.world.getHeight(); - for (int y = minY; y < maxY; y++) { - for (int x = minX; x < maxX; x++) { - drawBlock(x, y, bg); - } - } - if (bg) { - spriter.end(); - Gdx.gl.glEnable(GL20.GL_BLEND); - Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA); - shaper.begin(ShapeRenderer.ShapeType.Filled); - shaper.setColor(0f, 0f, 0f, .5f); - for (int y = minY; y < maxY; y++) { - for (int x = minX; x < maxX; x++) { - if ((!GP.world.hasForeAt(x, y) || GP.world.getForeMapBlock(x, y).isTransparent()) - && GP.world.hasBackAt(x, y)) - shaper.rect(drawX(x), drawY(y), 16, 16); - } - } - shaper.end(); - Gdx.gl.glDisable(GL20.GL_BLEND); - spriter.begin(); + private boolean handleMouseAction(@CheckForNull MouseInputAction action) { + if (action == null) { + return false; } - } - private void drawMob(Mob mob) { - float mobDrawX = mob.getX() - getCamX(); - float mobDrawY = mob.getY() - getCamY(); + boolean anyProcessed = false; - if (mobDrawX + mob.getWidth() < 0 && mobDrawX + GP.world.getWidthPx() > 0) { - mobDrawX += GP.world.getWidthPx(); - } else if (mobDrawX > getWidth() && mobDrawX + mob.getWidth() - GP.world.getWidthPx() > 0) { - mobDrawX -= GP.world.getWidthPx(); - } else if (mobDrawX + mob.getWidth() < 0 && mobDrawX > getWidth()) { - return; + for (IGameInputHandler handler : mMouseInputHandlers) { + final boolean conditions = handler.checkConditions(action); + if (conditions) { + anyProcessed = true; + handler.handle(action); + break; + } +// anyProcessed = anyProcessed || conditions; } - - mob.draw(spriter, mobDrawX, mobDrawY); + return anyProcessed; } - private void drawDrop(Drop drop) { + private boolean onMouseActionEvent(int mouseX, int mouseY, int button, boolean touchUp) { + @CheckForNull MouseInputAction action = mMouseInputActionMapper + .map((float) mouseX, (float) mouseY, getCameraViewport(), button, touchUp); + return handleMouseAction(action); } - @SuppressWarnings("IntegerDivisionInFloatingPointContext") - private void drawCreative() { - TextureRegion creative = textureRegions.get("creative"); - float x = getWidth() / 2 - (float) creative.getRegionWidth() / 2; - float y = getHeight() / 2 - (float) creative.getRegionHeight() / 2; - spriter.draw(creative, x, y); - spriter.draw(textureRegions.get("handle"), x + 156, - y + 18 + (GP.input.getCreativeScroll() * (72f / GameProc.MAX_CREATIVE_SCROLL))); - for (int i = GP.input.getCreativeScroll() * 8; i < GP.input.getCreativeScroll() * 8 + 40; i++) { - if (i > 0 && i < GameItems.getItemsSize()) - if (GameItems.getItem(i).isBlock()) { - spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(i)).getTex(), - x + 8 + ((i - GP.input.getCreativeScroll() * 8) % 8) * 18, - y + 18 + ((i - GP.input.getCreativeScroll() * 8) / 8) * 18); - } else { - spriter.draw(GameItems.getItem(i).getTex(), - x + 8 + ((i - GP.input.getCreativeScroll() * 8) % 8) * 18, - y + 18 + ((i - GP.input.getCreativeScroll() * 8) / 8) * 18); - } - } - for (int i = 0; i < 9; i++) { - if (GP.player.inventory[i] > 0) - if (GameItems.getItem(GP.player.inventory[i]).isBlock()) { - spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(GP.player.inventory[i])).getTex(), - x + 8 + i * 18, y + creative.getRegionHeight() - 24); - } else { - spriter.draw(GameItems.getItem(GP.player.inventory[i]).getTex(), - x + 8 + i * 18, y + creative.getRegionHeight() - 24); - } + @Override + public boolean touchUp(int screenX, int screenY, int pointer, int button) { + float touchX = transformScreenX(screenX); + float touchY = transformScreenY(screenY); + + if (mMainConfig.isTouch()) { + @CheckForNull TouchButton touchedKey = getTouchedKey(touchX, touchY); + if (touchedKey != null && touchedKey.isMouse()) { + return onMouseActionEvent(screenX, screenY, touchedKey.getCode(), true); + } else if (touchedKey != null) { + return keyUp(touchedKey.getCode()); + } } + return onMouseActionEvent(screenX, screenY, button, true); } - private void drawGUI() { - TextureRegion cursor = textureRegions.get("cursor"); - TextureRegion hotbar = textureRegions.get("hotbar"); - TextureRegion hotbarSelector = textureRegions.get("hotbar_selector"); - - if (GP.world.hasForeAt(GP.input.getCurX(), GP.input.getCurY()) || - GP.world.hasBackAt(GP.input.getCurX(), GP.input.getCurY()) || - GP.controlMode == ControlMode.CURSOR || - !CaveGame.TOUCH) - spriter.draw(cursor, - GP.input.getCurX() * 16 - getCamX(), - GP.input.getCurY() * 16 - getCamY()); - spriter.draw(hotbar, getWidth() / 2 - (float) hotbar.getRegionWidth() / 2, 0); - for (int i = 0; i < 9; i++) { - if (GP.player.inventory[i] > 0) { - if (GameItems.getItem(GP.player.inventory[i]).isBlock()) { - spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(GP.player.inventory[i])).getTex(), - getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20, - 3); - } else { - spriter.draw(GameItems.getItem(GP.player.inventory[i]).getTex(), - getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20, - 3); - } + @CheckForNull + private TouchButton getTouchedKey(float touchX, float touchY) { + for (ObjectMap.Entry entry : Assets.guiMap) { + TouchButton button = entry.value; + if (button.getRect().contains(touchX, touchY)) { + return button; } } - spriter.draw(hotbarSelector, - getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 - 1 + 20 * GP.player.slot, - -1); + return null; } - private void drawTouchGui() { - for (int i = 0; i < guiMap.size; i++) { - Rectangle touchKey = guiMap.getValueAt(i).getRect(); - spriter.draw(textureRegions.get(guiMap.getKeyAt(i)), - touchKey.x, touchKey.y, touchKey.width, touchKey.height); - } - if (GP.controlMode == ControlMode.CURSOR) { - spriter.draw(textureRegions.get("shade"), 83, getHeight() - 21); + @Override + public boolean touchDown(int screenX, int screenY, int pointer, int button) { + float touchX = transformScreenX(screenX); + float touchY = transformScreenY(screenY); + + if (mMainConfig.isTouch()) { + @CheckForNull TouchButton touchedKey = getTouchedKey(touchX, touchY); + if (touchedKey != null && touchedKey.isMouse()) { + return onMouseActionEvent(screenX, screenY, touchedKey.getCode(), false); + } else if (touchedKey != null) { + return keyDown(touchedKey.getCode()); + } } + + return onMouseActionEvent(screenX, screenY, button, false); } - private void drawGamePlay() { - drawWorld(true); - GP.player.draw(spriter, GP.player.getX() - getCamX() - 2, GP.player.getY() - getCamY()); - GP.mobs.forEach(this::drawMob); - GP.drops.forEach(this::drawDrop); - drawWorld(false); - drawGUI(); + @Override + public boolean touchDragged(int screenX, int screenY, int pointer) { + @CheckForNull MouseInputAction action = + mMouseInputActionMapper.mapDragged(screenX, screenY, getCameraViewport()); + return handleMouseAction(action); } @Override - public void render() { - Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + public boolean scrolled(float amountX, float amountY) { + @CheckForNull MouseInputAction action = mMouseInputActionMapper + .mapScrolled(Gdx.input.getX(), Gdx.input.getY(), amountX, amountY, getCameraViewport()); + return handleMouseAction(action); + } - spriter.begin(); - switch (CaveGame.GAME_STATE) { - case PLAY: - drawGamePlay(); - break; - case CREATIVE_INV: - drawGamePlay(); - drawCreative(); - break; + private boolean handleKeyboardAction(int keycode, boolean isKeyDown) { + @CheckForNull final KeyboardInputAction action = mKeyboardInputActionMapper + .map(keycode, isKeyDown); + + if (action == null) { + return false; } - if (CaveGame.TOUCH) drawTouchGui(); + boolean anyProcessed = false; - spriter.end(); - - if (GameScreen.SHOW_MAP) { - //DRAW MAP - shaper.begin(ShapeRenderer.ShapeType.Filled); - shaper.setColor(Color.LIGHT_GRAY); - shaper.rect(0, 0, GP.world.getWidth(), 128); - for (int y = 128; y < 256; y++) { - for (int x = 0; x < getWidth(); x++) { - if (GP.world.hasForeAt(x, y) || GP.world.hasBackAt(x, y)) { - if (GameItems.isWater(GP.world.getForeMap(x, y))) { - shaper.setColor(Color.BLUE); - } else if (GameItems.isLava(GP.world.getForeMap(x, y))) { - shaper.setColor(Color.RED); - } else { - if (GP.world.hasForeAt(x, y)) { - shaper.setColor(Color.BLACK); - } else { - shaper.setColor(Color.DARK_GRAY); - } - } - shaper.rect(x, y - 128, 1, 1); - } - } + for (IGameInputHandler handler : mKeyboardInputHandlers) { + final boolean conditions = handler.checkConditions(action); + if (conditions) { + anyProcessed = true; + handler.handle(action); + break; } - shaper.setColor(Color.OLIVE); - shaper.rect(GP.player.getMapX(), GP.player.getUpperMapY() - 128, 1, 2); - shaper.end(); - //================= } - if (GameScreen.SHOW_DEBUG) { - spriter.begin(); - drawString("FPS: " + GameScreen.FPS, 0, 0); - drawString("X: " + GP.player.getMapX(), 0, 10); - drawString("Y: " + GP.player.getUpperMapY() / 16, 0, 20); - drawString("CurX: " + GP.input.getCurX(), 0, 30); - drawString("CurY: " + GP.input.getCurY(), 0, 40); - drawString("Mobs: " + GP.mobs.size(), 0, 50); - drawString("Drops: " + GP.drops.size(), 0, 60); - drawString("Block: " + GameItems.getBlockKey(GP.world.getForeMap(GP.input.getCurX(), GP.input.getCurY())), 0, 70); - drawString("Hand: " + GameItems.getItemKey(GP.player.inventory[GP.player.slot]), 0, 80); - drawString("Game mode: " + GP.player.gameMode, 0, 90); - spriter.end(); - } + return anyProcessed; + } + @Override + public boolean keyDown(int keycode) { + return handleKeyboardAction(keycode, true); + } + + @Override + public boolean keyUp(int keycode) { + return handleKeyboardAction(keycode, false); + } + + @Override + public void render(float delta) { + updateCameraPosition(); + handleMousePosition(); +// mGameInput.moveCursor(this); + + Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + spriter.begin(); + mRenderers.forEach(iGameRenderer -> iGameRenderer.draw(spriter, shaper, getCameraViewport(), delta)); + spriter.end(); } }