X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameRenderer.java;h=dd136b8aa2a75aba3bcdf11c3e3422b854f9f8f0;hb=1b645eda9f49799923666a57804fb3058cda1582;hp=b555f6bde14fc927d6e4de3d965de81bdf5a9887;hpb=ed1189467d0d1b57df7ca1335f2134c08acae5ec;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java index b555f6b..dd136b8 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java @@ -7,21 +7,19 @@ import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.math.Intersector; +import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Rectangle; -import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack; import ru.deadsoftware.cavedroid.MainConfig; import ru.deadsoftware.cavedroid.game.mobs.Mob; import ru.deadsoftware.cavedroid.game.mobs.MobsController; import ru.deadsoftware.cavedroid.game.mobs.Player; -import ru.deadsoftware.cavedroid.game.objects.Block; +import ru.deadsoftware.cavedroid.game.model.block.Block; +import ru.deadsoftware.cavedroid.game.model.item.Item; import ru.deadsoftware.cavedroid.game.objects.Drop; import ru.deadsoftware.cavedroid.game.objects.DropController; -import ru.deadsoftware.cavedroid.game.objects.Item; import ru.deadsoftware.cavedroid.game.world.GameWorld; import ru.deadsoftware.cavedroid.misc.ControlMode; import ru.deadsoftware.cavedroid.misc.Renderer; -import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt; import javax.annotation.CheckForNull; import javax.annotation.Nullable; @@ -32,6 +30,8 @@ import static ru.deadsoftware.cavedroid.misc.Assets.*; @GameScope public class GameRenderer extends Renderer { + private static final String TAG = "GameRenderer"; + private final MainConfig mMainConfig; private final GameInput mGameInput; private final GameWorld mGameWorld; @@ -67,6 +67,11 @@ public class GameRenderer extends Renderer { if (mGameInput.getBlockDamage() > 0) { int index = 10 * mGameInput.getBlockDamage() / GameItems.getBlock(bl).getHp(); String key = "break_" + index; + + if (index > 10 || index < 0) { + return; + } + spriter.draw(textureRegions.get(key), mGameInput.getCurX() * 16 - getCamX(), mGameInput.getCurY() * 16 - getCamY()); } @@ -179,14 +184,7 @@ public class GameRenderer extends Renderer { } final Item item = GameItems.getItem(drop.getId()); - @CheckForNull final Block block = GameItems.getBlock(GameItems.getItemKey(drop.getId())); - @CheckForNull final Sprite sprite = item.isBlock() - ? block.getTexture() - : item.getSprite(); - - if (sprite == null) { - return; - } + final Sprite sprite = item.getSprite(); sprite.setPosition(drawingRect.x, drawingRect.y); sprite.setSize(drawingRect.width, drawingRect.height); @@ -203,26 +201,15 @@ public class GameRenderer extends Renderer { y + 18 + (mGameInput.getCreativeScroll() * (72f / GameProc.MAX_CREATIVE_SCROLL))); for (int i = mGameInput.getCreativeScroll() * 8; i < mGameInput.getCreativeScroll() * 8 + 40; i++) { if (i > 0 && i < GameItems.getItemsSize()) { - if (GameItems.getItem(i).isBlock()) { - spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(i)).getTexture(), - x + 8 + ((i - mGameInput.getCreativeScroll() * 8) % 8) * 18, - y + 18 + ((i - mGameInput.getCreativeScroll() * 8) / 8) * 18); - } else { - spriter.draw(GameItems.getItem(i).getTexture(), - x + 8 + ((i - mGameInput.getCreativeScroll() * 8) % 8) * 18, - y + 18 + ((i - mGameInput.getCreativeScroll() * 8) / 8) * 18); - } + spriter.draw(GameItems.getItem(i).getSprite(), + x + 8 + ((i - mGameInput.getCreativeScroll() * 8) % 8) * 18, + y + 18 + ((i - mGameInput.getCreativeScroll() * 8) / 8) * 18); } } for (int i = 0; i < 9; i++) { if (mMobsController.getPlayer().inventory[i] > 0) { - if (GameItems.getItem(mMobsController.getPlayer().inventory[i]).isBlock()) { - spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(mMobsController.getPlayer().inventory[i])).getTexture(), - x + 8 + i * 18, y + creative.getRegionHeight() - 24); - } else { - spriter.draw(GameItems.getItem(mMobsController.getPlayer().inventory[i]).getTexture(), - x + 8 + i * 18, y + creative.getRegionHeight() - 24); - } + spriter.draw(GameItems.getItem(mMobsController.getPlayer().inventory[i]).getSprite(), + x + 8 + i * 18, y + creative.getRegionHeight() - 24); } } @@ -266,15 +253,9 @@ public class GameRenderer extends Renderer { for (int i = 0; i < 9; i++) { if (mMobsController.getPlayer().inventory[i] > 0) { - if (GameItems.getItem(mMobsController.getPlayer().inventory[i]).isBlock()) { - spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(mMobsController.getPlayer().inventory[i])).getTexture(), - getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20, - 3); - } else { - spriter.draw(GameItems.getItem(mMobsController.getPlayer().inventory[i]).getTexture(), - getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20, - 3); - } + spriter.draw(GameItems.getItem(mMobsController.getPlayer().inventory[i]).getSprite(), + getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20, + 3); } } spriter.draw(hotbarSelector, @@ -298,7 +279,9 @@ public class GameRenderer extends Renderer { drawWorld(true); player.draw(spriter, player.getX() - getCamX() - player.getWidth() / 2, player.getY() - getCamY(), delta); - mMobsController.forEach( (mob) -> { drawMob(mob, delta); }); + mMobsController.getMobs().forEach((mob) -> { + drawMob(mob, delta); + }); mDropController.forEach(this::drawDrop); drawWorld(false); drawGUI(); @@ -346,8 +329,7 @@ public class GameRenderer extends Renderer { final int worldX = (int) (mMobsController.getPlayer().getMapX() - size / 2 + x); final int worldY = (int) (mMobsController.getPlayer().getUpperMapY() - size / 2 + y); - @Nullable - final Color color = getMinimapColor(worldX, worldY); + @Nullable final Color color = getMinimapColor(worldX, worldY); if (color != null) { shaper.setColor(color); @@ -363,7 +345,7 @@ public class GameRenderer extends Renderer { @Override public void render(float delta) { - int fps = (int) (1 / delta); + int fps = MathUtils.ceil(1 / delta); updateCameraPosition(); mGameInput.moveCursor(this); @@ -401,7 +383,7 @@ public class GameRenderer extends Renderer { drawString("CurY: " + mGameInput.getCurY(), 0, 40); drawString("Velocity: " + player.getVelocity(), 0, 50); drawString("Swim: " + player.swim, 0, 60); - drawString("Mobs: " + mMobsController.getSize(), 0, 70); + drawString("Mobs: " + mMobsController.getMobs().size(), 0, 70); drawString("Drops: " + mDropController.getSize(), 0, 80); drawString("Block: " + GameItems.getBlockKey(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())), 0, 90); drawString("Hand: " + GameItems.getItemKey(mMobsController.getPlayer().inventory[mMobsController.getPlayer().slot]), 0, 100);