diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 7f693c4b20f587776da84664e021bb7d9385ebc2..58564bf3300e5a301c7a3969a83573e81a4abf5b 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavecraft.misc.Assets;
import ru.deadsoftware.cavecraft.CaveGame;
-import ru.deadsoftware.cavecraft.misc.Renderer;
+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.misc.Renderer;
public class GameRenderer extends Renderer {
if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight();
for (int y=minY; y<maxY; y++) {
for (int x=minX; x<maxX; x++) {
- if (gameProc.world.getForeMap(x,y)>0){
- } else if (gameProc.world.getBackMap(x,y)>0) {
+ if ((gameProc.world.getForeMap(x,y)==0 || Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).transparent)
+ && gameProc.world.getBackMap(x,y)>0) {
spriteBatch.draw(
- Items.BLOCKS.getValueAt(gameProc.world.getBackMap(x,y)).getTexture(),
+ Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.world.getBackMap(x,y)).getTexture()],
x * 16 - camera.position.x,y * 16 - camera.position.y);
Assets.shade.setPosition(x * 16 - camera.position.x,y * 16 - camera.position.y);
Assets.shade.draw(spriteBatch);
}
+ if (gameProc.world.getForeMap(x,y)>0 && Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).background) {
+ spriteBatch.draw(
+ Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture()],
+ x * 16 - camera.position.x,y * 16 - camera.position.y);
+ }
}
}
}
if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight();
for (int y=minY; y<maxY; y++) {
for (int x=minX; x<maxX; x++) {
- if (gameProc.world.getForeMap(x,y)>0) {
+ if (gameProc.world.getForeMap(x,y)>0 && !Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).background) {
spriteBatch.draw(
- Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(),
+ Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture()],
x * 16 - camera.position.x,y * 16 - camera.position.y);
}
}
float x = camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2;
float y = camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2;
spriteBatch.draw(Assets.creativeInv, x, y);
- spriteBatch.draw(Assets.creativeScroll, x+156, y+18);
- for (int i=1; i<Items.BLOCKS.size; i++) {
- spriteBatch.draw(Items.BLOCKS.getValueAt(i).getTexture(),x+8+(i%8)*18,
- y+18+(i/8)*18);
+ spriteBatch.draw(Assets.creativeScroll, x+156,
+ y+18+(gameProc.creativeScroll*(72/gameProc.maxCreativeScroll)));
+ for (int i=gameProc.creativeScroll*8; i<gameProc.creativeScroll*8+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=0; i<9; i++) {
if (gameProc.player.inventory[i]>0)
- spriteBatch.draw(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(),
+ spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()],
x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24);
}
}
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(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(),
+ spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture()],
camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2+3+i*20,
3);
}
spriteBatch.draw(Assets.touchLMB, camera.viewportWidth-52, camera.viewportHeight-26);
spriteBatch.draw(Assets.touchRMB, camera.viewportWidth-26, camera.viewportHeight-26);
spriteBatch.draw(Assets.touchToggleMode, 78, camera.viewportHeight-26);
+ if (gameProc.ctrlMode==1) {
+ Assets.shade.setPosition(83, camera.viewportHeight-21);
+ Assets.shade.draw(spriteBatch);
+ }
}
private void drawGamePlay() {
drawWorldBackground();
- Mob.animateMobs();
+ //Mob.animateMobs();
for (Mob mob : gameProc.mobs) drawMob(mob);
drawPlayer(gameProc.player);
drawWorldForeground();
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);
+ }
+
spriteBatch.end();
}