diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 389994636043d1b7985bb13a411977d82a8d1b00..76d806f40f4c8ef977b8cac409819b22f9cde1ad 100644 (file)
}
private void drawWreck(int bl) {
- if (GP.blockDmg > 0) {
- int index = 10 * GP.blockDmg / GameItems.getBlock(bl).getHp();
+ 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.curX * 16 - getCamX(), GP.curY * 16 - getCamY());
+ spriter.draw(textureRegions.get(key), GP.input.getCurX() * 16 - getCamX(),
+ GP.input.getCurY() * 16 - getCamY());
}
}
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.curX && y == GP.curY)
- drawWreck(GP.world.getBackMap(GP.curX, GP.curY));
+ 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.curX && y == GP.curY)
- drawWreck(GP.world.getForeMap(GP.curX, GP.curY));
+ if (x == GP.input.getCurX() && y == GP.input.getCurY()) {
+ drawWreck(GP.world.getForeMap(GP.input.getCurX(), GP.input.getCurY()));
+ }
}
}
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();
+ 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);
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))
+ && GP.world.hasBackAt(x, y)) {
shaper.rect(drawX(x), drawY(y), 16, 16);
+ }
}
}
shaper.end();
}
private void drawMob(Mob mob) {
- float mobDrawX = mob.pos.x - getCamX();
- float mobDrawY = mob.pos.y - getCamY();
-
- if (mobDrawX + mob.getWidth() - GP.world.getWidthPx() >= 0 && mobDrawX - GP.world.getWidthPx() <= getWidth())
- mob.draw(spriter, mobDrawX - GP.world.getWidthPx(), mobDrawY);
+ float mobDrawX = mob.getX() - getCamX();
+ float mobDrawY = mob.getY() - getCamY();
- if (mobDrawX + mob.getWidth() >= 0 && mobDrawX <= getWidth())
- mob.draw(spriter, mobDrawX, mobDrawY);
+ 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;
+ }
- if (mobDrawX + mob.getWidth() + GP.world.getWidthPx() >= 0 && mobDrawX + GP.world.getWidthPx() <= getWidth())
- mob.draw(spriter, mobDrawX + GP.world.getWidthPx(), mobDrawY);
+ mob.draw(spriter, mobDrawX, mobDrawY);
}
private void drawDrop(Drop drop) {
float y = getHeight() / 2 - (float) creative.getRegionHeight() / 2;
spriter.draw(creative, x, y);
spriter.draw(textureRegions.get("handle"), x + 156,
- y + 18 + (GP.creativeScroll * (72f / GameProc.MAX_CREATIVE_SCROLL)));
- for (int i = GP.creativeScroll * 8; i < GP.creativeScroll * 8 + 40; i++) {
- if (i > 0 && i < GameItems.getItemsSize())
+ 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.creativeScroll * 8) % 8) * 18,
- y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18);
+ 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.creativeScroll * 8) % 8) * 18,
- y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18);
+ 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 (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);
spriter.draw(GameItems.getItem(GP.player.inventory[i]).getTex(),
x + 8 + i * 18, y + creative.getRegionHeight() - 24);
}
+ }
}
}
TextureRegion hotbar = textureRegions.get("hotbar");
TextureRegion hotbarSelector = textureRegions.get("hotbar_selector");
- if (GP.world.hasForeAt(GP.curX, GP.curY) ||
- GP.world.hasBackAt(GP.curX, GP.curY) ||
+ 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)
+ !CaveGame.TOUCH) {
spriter.draw(cursor,
- GP.curX * 16 - getCamX(),
- GP.curY * 16 - getCamY());
+ 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) {
private void drawTouchGui() {
for (int i = 0; i < guiMap.size; i++) {
- Rectangle touchKey = guiMap.getValueAt(i);
+ Rectangle touchKey = guiMap.getValueAt(i).getRect();
spriter.draw(textureRegions.get(guiMap.getKeyAt(i)),
touchKey.x, touchKey.y, touchKey.width, touchKey.height);
}
private void drawGamePlay() {
drawWorld(true);
- GP.player.draw(spriter, GP.player.pos.x - getCamX() - 2, GP.player.pos.y - getCamY());
- for (Mob mob : GP.mobs) drawMob(mob);
- for (Drop drop : GP.drops) drawDrop(drop);
+ 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();
}
break;
}
- if (CaveGame.TOUCH) drawTouchGui();
+ if (CaveGame.TOUCH) {
+ drawTouchGui();
+ }
spriter.end();
}
}
shaper.setColor(Color.OLIVE);
- shaper.rect(GP.player.pos.x / 16, GP.player.pos.y / 16 - 128, 1, 2);
+ 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: " + (int) (GP.player.pos.x / 16), 0, 10);
- drawString("Y: " + (int) (GP.player.pos.y / 16), 0, 20);
- drawString("CurX: " + GP.curX, 0, 30);
- drawString("CurY: " + GP.curY, 0, 40);
+ 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.curX, GP.curY)), 0, 70);
+ 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();