diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index e119487ee12355a107125409e99e15927cf9eea7..648e785e8d07a96c9de6728124be0bcaac3013a8 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.graphics.OrthographicCamera;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-import com.badlogic.gdx.math.MathUtils;
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.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 {
+public class GameRenderer extends Renderer {
private GameProc gameProc;
- public OrthographicCamera camera, fontCam;
- ShapeRenderer shapeRenderer;
- SpriteBatch spriteBatch, fontBatch;
-
- public GameRenderer(GameProc gameProc) {
+ public GameRenderer(GameProc gameProc,float width, float heigth) {
+ super(width,heigth);
Gdx.gl.glClearColor(0f,.6f,.6f,1f);
this.gameProc = gameProc;
- camera = new OrthographicCamera();
- if (!CaveGame.TOUCH) {
- camera.setToOrtho(true, 480,
- 480 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
- } else {
- camera.setToOrtho(true, 320,
- 320 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
- }
- shapeRenderer = new ShapeRenderer();
- shapeRenderer.setProjectionMatrix(camera.combined);
- shapeRenderer.setAutoShapeType(true);
- spriteBatch = new SpriteBatch();
- spriteBatch.setProjectionMatrix(camera.combined);
-
- fontCam = new OrthographicCamera();
- fontCam.setToOrtho(true, GameScreen.getWidth(), GameScreen.getHeight());
- fontBatch = new SpriteBatch();
- fontBatch.setProjectionMatrix(fontCam.combined);
- }
-
- private void setFontColor(int r, int g, int b) {
- Assets.minecraftFont.setColor(r/255f, g/255f, b/255f, 1f);
- }
-
- private void drawString(String str, float x, float y) {
- 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);*/
- } 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);
+ }
}
}
}
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(),
+ Assets.blockTextures[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) {
- if (!pl.moveX.equals(Vector2.Zero) || Assets.playerSkin[0][2].getRotation()!=0) {
- Assets.playerSkin[0][2].rotate(Mob.ANIM_SPEED);
- Assets.playerSkin[1][2].rotate(-Mob.ANIM_SPEED);
- Assets.playerSkin[0][3].rotate(-Mob.ANIM_SPEED);
- Assets.playerSkin[1][3].rotate(Mob.ANIM_SPEED);
+ if (!pl.moveX.equals(Vector2.Zero) || Assets.playerSprite[0][2].getRotation()!=0) {
+ Assets.playerSprite[0][2].rotate(Player.ANIM_SPEED);
+ Assets.playerSprite[1][2].rotate(-Player.ANIM_SPEED);
+ Assets.playerSprite[0][3].rotate(-Player.ANIM_SPEED);
+ Assets.playerSprite[1][3].rotate(Player.ANIM_SPEED);
} else {
- Assets.playerSkin[0][2].setRotation(0);
- Assets.playerSkin[1][2].setRotation(0);
- Assets.playerSkin[0][3].setRotation(0);
- Assets.playerSkin[1][3].setRotation(0);
+ Assets.playerSprite[0][2].setRotation(0);
+ Assets.playerSprite[1][2].setRotation(0);
+ Assets.playerSprite[0][3].setRotation(0);
+ Assets.playerSprite[1][3].setRotation(0);
}
- if (Assets.playerSkin[0][2].getRotation()>=60 || Assets.playerSkin[0][2].getRotation()<=-60)
- Mob.ANIM_SPEED = -Mob.ANIM_SPEED;
+ if (Assets.playerSprite[0][2].getRotation()>=60 || Assets.playerSprite[0][2].getRotation()<=-60)
+ Player.ANIM_SPEED = -Player.ANIM_SPEED;
//back hand
- Assets.playerSkin[1][2].setPosition(
+ Assets.playerSprite[1][2].setPosition(
pl.position.x - camera.position.x - 6,
pl.position.y - camera.position.y);
- Assets.playerSkin[1][2].draw(spriteBatch);
+ Assets.playerSprite[1][2].draw(spriteBatch);
//back leg
- Assets.playerSkin[1][3].setPosition(
+ Assets.playerSprite[1][3].setPosition(
pl.position.x - camera.position.x - 6,
pl.position.y - camera.position.y + 10);
- Assets.playerSkin[1][3].draw(spriteBatch);
+ Assets.playerSprite[1][3].draw(spriteBatch);
//front leg
- Assets.playerSkin[0][3].setPosition(
+ Assets.playerSprite[0][3].setPosition(
pl.position.x - camera.position.x - 6,
pl.position.y - camera.position.y + 10);
- Assets.playerSkin[0][3].draw(spriteBatch);
+ Assets.playerSprite[0][3].draw(spriteBatch);
//head
- spriteBatch.draw(Assets.playerSkin[pl.dir][0],
+ spriteBatch.draw(Assets.playerSprite[pl.dir][0],
pl.position.x - camera.position.x - 2,
pl.position.y - camera.position.y - 2);
//body
- spriteBatch.draw(Assets.playerSkin[pl.dir][1],
+ spriteBatch.draw(Assets.playerSprite[pl.dir][1],
pl.position.x - camera.position.x - 2, pl.position.y - camera.position.y + 8);
//front hand
- Assets.playerSkin[0][2].setPosition(
+ Assets.playerSprite[0][2].setPosition(
pl.position.x - camera.position.x - 6,
pl.position.y - camera.position.y);
- Assets.playerSkin[0][2].draw(spriteBatch);
+ Assets.playerSprite[0][2].draw(spriteBatch);
}
private void drawCreative() {
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+1))));
+ for (int i=gameProc.creativeScroll*40; 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*40)%8)*18,
+ y+18+((i-gameProc.creativeScroll*40)/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(),
- x+8+i*18, y+184);
+ 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);
}
}
private void drawGamePlay() {
- drawWorld();
+ drawWorldBackground();
+ Mob.animateMobs();
for (Mob mob : gameProc.mobs) drawMob(mob);
drawPlayer(gameProc.player);
drawWorldForeground();
drawGUI();
}
+ @Override
public void render() {
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
drawCreative();
break;
}
- spriteBatch.end();
- if (CaveGame.TOUCH) {
- spriteBatch.begin();
- drawTouchGui();
- spriteBatch.end();
- }
+ if (CaveGame.TOUCH) drawTouchGui();
- fontBatch.begin();
- setFontColor(255,255,255);
- 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);
- fontBatch.end();
+ spriteBatch.end();
}
}