diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index d104b2f2056a873d781118decc40d4b0867be7d6..009d9b75765768e7a793daec3228a0230f7a4d09 100644 (file)
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.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.Vector2;
import ru.deadsoftware.cavecraft.Assets;
import ru.deadsoftware.cavecraft.CaveGame;
-import ru.deadsoftware.cavecraft.Items;
import ru.deadsoftware.cavecraft.GameScreen;
+import ru.deadsoftware.cavecraft.Items;
import ru.deadsoftware.cavecraft.game.mobs.Mob;
import ru.deadsoftware.cavecraft.game.objects.Player;
Assets.minecraftFont.draw(fontBatch, str, x, y);
}
- private void drawWorld() {
- int minX = (int) (camera.position.x/16);
- int minY = (int) (camera.position.y/16);
+ private void drawWorldBackground() {
+ int minX = (int) (camera.position.x/16)-1;
+ int minY = (int) (camera.position.y/16)-1;
int maxX = (int) ((camera.position.x+camera.viewportWidth)/16)+1;
int maxY = (int) ((camera.position.y+camera.viewportHeight)/16)+1;
- if (minX<0) minX=0;
if (minY<0) minY=0;
- if (maxX>gameProc.world.getWidth()) maxX = gameProc.world.getWidth();
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){/* &&
- !Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).foreground) {
- spriteBatch.draw(
- Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(),
- x * 16 - camera.position.x,y * 16 - camera.position.y);*/
+ if (gameProc.world.getForeMap(x,y)>0){
} else if (gameProc.world.getBackMap(x,y)>0) {
spriteBatch.draw(
Items.BLOCKS.getValueAt(gameProc.world.getBackMap(x,y)).getTexture(),
}
private void drawWorldForeground(){
- int minX = (int) (camera.position.x/16);
- int minY = (int) (camera.position.y/16);
+ int minX = (int) (camera.position.x/16)-1;
+ int minY = (int) (camera.position.y/16)-1;
int maxX = (int) ((camera.position.x+camera.viewportWidth)/16)+1;
int maxY = (int) ((camera.position.y+camera.viewportHeight)/16)+1;
- if (minX<0) minX=0;
if (minY<0) minY=0;
- if (maxX>gameProc.world.getWidth()) maxX = gameProc.world.getWidth();
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) { /*&&
- Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).foreground) {*/
+ if (gameProc.world.getForeMap(x,y)>0) {
spriteBatch.draw(
Items.BLOCKS.getValueAt(gameProc.world.getForeMap(x,y)).getTexture(),
x * 16 - camera.position.x,y * 16 - camera.position.y);
}
private void drawMob(Mob mob) {
+ mob.draw(spriteBatch,
+ mob.position.x-camera.position.x-gameProc.world.getWidth()*16, mob.position.y-camera.position.y);
mob.draw(spriteBatch,
mob.position.x-camera.position.x, mob.position.y-camera.position.y);
+ mob.draw(spriteBatch,
+ mob.position.x-camera.position.x+gameProc.world.getWidth()*16, mob.position.y-camera.position.y);
}
private void drawPlayer(Player pl) {
}
private void drawGamePlay() {
- drawWorld();
+ drawWorldBackground();
Mob.animateMobs();
for (Mob mob : gameProc.mobs) drawMob(mob);
drawPlayer(gameProc.player);
}
spriteBatch.end();
- shapeRenderer.begin(ShapeRenderer.ShapeType.Line);
- shapeRenderer.setColor(Color.ORANGE);
- shapeRenderer.line(0-camera.position.x, 128*16-camera.position.y,
- gameProc.world.getWidth()*16-camera.position.x, 128*16-camera.position.y);
- shapeRenderer.end();
-
if (CaveGame.TOUCH) {
spriteBatch.begin();
drawTouchGui();
drawString("CaveCraft "+CaveGame.VERSION, 0, 0);
drawString("FPS: "+GameScreen.FPS, 0, 20);
drawString("X: "+(int)(gameProc.player.position.x/16), 0, 40);
- drawString("Y: "+(int)(gameProc.player.position.y/16), 0, 60);
+ drawString("Y: "+(gameProc.world.getHeight()-(int)(gameProc.player.position.y/16)), 0, 60);
drawString("Seed: "+WorldGen.getSeed(), 0, 80);
drawString("Mobs: "+gameProc.mobs.size, 0, 100);
fontBatch.end();