diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 944093826043bbd51204107b89fabddd04e193c9..38680f94db6ddf347491736c18872f5c80e544b1 100644 (file)
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.GL20;
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.Vector2;
import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavecraft.Assets;
import ru.deadsoftware.cavecraft.CaveGame;
import ru.deadsoftware.cavecraft.CaveGame;
-import ru.deadsoftware.cavecraft.GameScreen;
-import ru.deadsoftware.cavecraft.Items;
import ru.deadsoftware.cavecraft.game.mobs.Mob;
import ru.deadsoftware.cavecraft.game.objects.Player;
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;
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;
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 drawWorldBackground() {
}
private void drawWorldBackground() {
if (maxY>gameProc.world.getHeight()) maxY = gameProc.world.getHeight();
for (int y=minY; y<maxY; y++) {
for (int x=minX; x<maxX; x++) {
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(
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);
}
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 (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(
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);
}
}
x * 16 - camera.position.x,y * 16 - camera.position.y);
}
}
}
private void drawMob(Mob mob) {
}
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, 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 drawPlayer(Player pl) {
float x = camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2;
float y = camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2;
spriteBatch.draw(Assets.creativeInv, x, 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+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=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(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);
}
}
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(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);
}
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);
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() {
}
private void drawGamePlay() {
drawGUI();
}
drawGUI();
}
+ @Override
public void render() {
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
public void render() {
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
drawCreative();
break;
}
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: "+(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();
+ spriteBatch.end();
}
}
}
}