diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 38680f94db6ddf347491736c18872f5c80e544b1..1eef325463a41614b6d98714ba21110ffb2e5af5 100644 (file)
package ru.deadsoftware.cavecraft.game;
import com.badlogic.gdx.Gdx;
package ru.deadsoftware.cavecraft.game;
import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.math.Vector2;
import ru.deadsoftware.cavecraft.CaveGame;
import com.badlogic.gdx.math.Vector2;
import ru.deadsoftware.cavecraft.CaveGame;
+import ru.deadsoftware.cavecraft.GameScreen;
import ru.deadsoftware.cavecraft.game.mobs.Mob;
import ru.deadsoftware.cavecraft.game.objects.Player;
import ru.deadsoftware.cavecraft.misc.Assets;
import ru.deadsoftware.cavecraft.game.mobs.Mob;
import ru.deadsoftware.cavecraft.game.objects.Player;
import ru.deadsoftware.cavecraft.misc.Assets;
spriteBatch.draw(Assets.creativeInv, x, y);
spriteBatch.draw(Assets.creativeScroll, x+156,
y+18+(gameProc.creativeScroll*(72/gameProc.maxCreativeScroll)));
spriteBatch.draw(Assets.creativeInv, x, y);
spriteBatch.draw(Assets.creativeScroll, x+156,
y+18+(gameProc.creativeScroll*(72/gameProc.maxCreativeScroll)));
- for (int i=gameProc.creativeScroll*8; i<(gameProc.creativeScroll+1)*40; i++) {
- if (i>0 && i<Items.BLOCKS.size)
- spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(i).getTexture()],
- x+8+((i-gameProc.creativeScroll*8)%8)*18,
- y+18+((i-gameProc.creativeScroll*8)/8)*18);
+ for (int i=gameProc.creativeScroll*8; i<gameProc.creativeScroll*8+40; i++) {
+ if (i>0 && i<Items.ITEMS.size())
+ if (Items.ITEMS.get(i).getType() == 0)
+ spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(i).getTexture()],
+ x+8+((i-gameProc.creativeScroll*8)%8)*18,
+ y+18+((i-gameProc.creativeScroll*8)/8)*18);
}
for (int i=0; i<9; i++) {
if (gameProc.player.inventory[i]>0)
}
for (int i=0; i<9; i++) {
if (gameProc.player.inventory[i]>0)
- spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()],
- x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24);
+ if (Items.ITEMS.get(i).getType() == 0)
+ spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(i).getTexture()],
+ x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24);
}
}
private void drawGUI() {
if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)>0 ||
gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY)>0 ||
}
}
private void drawGUI() {
if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)>0 ||
gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY)>0 ||
- gameProc.ctrlMode==1)
+ gameProc.ctrlMode==1 ||
+ !CaveGame.TOUCH)
spriteBatch.draw(Assets.guiCur,
gameProc.cursorX*16-camera.position.x,
gameProc.cursorY*16-camera.position.y);
spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2, 0);
for (int i=0; i<9; i++) {
if (gameProc.player.inventory[i]>0) {
spriteBatch.draw(Assets.guiCur,
gameProc.cursorX*16-camera.position.x,
gameProc.cursorY*16-camera.position.y);
spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2, 0);
for (int i=0; i<9; i++) {
if (gameProc.player.inventory[i]>0) {
- spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()],
- camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20,
- 3);
+ if (Items.ITEMS.get(gameProc.player.inventory[i]).getType()==0)
+ spriteBatch.draw(Assets.blockTextures[Items.ITEMS.get(gameProc.player.inventory[i]).getTexture()],
+ camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20,
+ 3);
}
}
spriteBatch.draw(Assets.invBarCur,
}
}
spriteBatch.draw(Assets.invBarCur,
private void drawGamePlay() {
drawWorldBackground();
private void drawGamePlay() {
drawWorldBackground();
- Mob.animateMobs();
- for (Mob mob : gameProc.mobs) drawMob(mob);
drawPlayer(gameProc.player);
drawPlayer(gameProc.player);
+ for (Mob mob : gameProc.mobs) drawMob(mob);
drawWorldForeground();
drawGUI();
}
drawWorldForeground();
drawGUI();
}
if (CaveGame.TOUCH) drawTouchGui();
if (CaveGame.TOUCH) drawTouchGui();
+ if (GameScreen.SHOW_DEBUG) {
+ drawString("FPS: "+GameScreen.FPS,0, 0);
+ drawString("X: "+(int)(gameProc.player.position.x/16),0, 10);
+ drawString("Y: "+(int)(gameProc.player.position.y/16),0, 20);
+ drawString("Mobs: "+gameProc.mobs.size(), 0, 30);
+ drawString("Block: "+Items.BLOCKS.getKeyAt(gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY)), 0, 40);
+ }
+
spriteBatch.end();
}
spriteBatch.end();
}