Fix bugs

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / GameRenderer.java

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index f1e830d61586e77267c6ca88b8494f8e84aeff6d..b8b53249be9296363957889c991ae7bf377f5a80 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -1,11 +1,11 @@
 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.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;
@@ -18,9 +18,9 @@ public class GameRenderer {
 
     private GameProc gameProc;
 
-    public OrthographicCamera camera, fontCam, touchCam;
+    public OrthographicCamera camera, fontCam;
     ShapeRenderer shapeRenderer;
-    SpriteBatch spriteBatch, fontBatch, touchBatch;
+    SpriteBatch spriteBatch, fontBatch;
 
     public GameRenderer(GameProc gameProc) {
         Gdx.gl.glClearColor(0f,.6f,.6f,1f);
@@ -30,8 +30,8 @@ public class GameRenderer {
             camera.setToOrtho(true, 480,
                     480 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
         } else {
-            camera.setToOrtho(true, 240,
-                    240 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
+            camera.setToOrtho(true, 320,
+                    320 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
         }
         shapeRenderer = new ShapeRenderer();
         shapeRenderer.setProjectionMatrix(camera.combined);
@@ -43,11 +43,6 @@ public class GameRenderer {
         fontCam.setToOrtho(true, GameScreen.getWidth(), GameScreen.getHeight());
         fontBatch = new SpriteBatch();
         fontBatch.setProjectionMatrix(fontCam.combined);
-        touchCam = new OrthographicCamera();
-        touchCam.setToOrtho(true, 240,
-                240*((float)GameScreen.getHeight()/GameScreen.getWidth()));
-        touchBatch = new SpriteBatch();
-        touchBatch.setProjectionMatrix(touchCam.combined);
     }
 
     private void setFontColor(int r, int g, int b) {
@@ -112,47 +107,47 @@ public class GameRenderer {
     }
 
     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() {
@@ -167,7 +162,7 @@ public class GameRenderer {
         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);
+                        x+8+i*18, y+Assets.creativeInv.getRegionHeight()-24);
         }
     }
 
@@ -192,17 +187,18 @@ public class GameRenderer {
     }
 
     private void drawTouchGui() {
-        touchBatch.draw(Assets.touchArrows[0],26,touchCam.viewportHeight-52);
-        touchBatch.draw(Assets.touchArrows[1],0,touchCam.viewportHeight-26);
-        touchBatch.draw(Assets.touchArrows[2],26,touchCam.viewportHeight-26);
-        touchBatch.draw(Assets.touchArrows[3],52,touchCam.viewportHeight-26);
-        touchBatch.draw(Assets.touchLMB, touchCam.viewportWidth-52, touchCam.viewportHeight-26);
-        touchBatch.draw(Assets.touchRMB, touchCam.viewportWidth-26, touchCam.viewportHeight-26);
-        touchBatch.draw(Assets.touchToggleMode, 78, touchCam.viewportHeight-26);
+        spriteBatch.draw(Assets.touchArrows[0],26,camera.viewportHeight-52);
+        spriteBatch.draw(Assets.touchArrows[1],0,camera.viewportHeight-26);
+        spriteBatch.draw(Assets.touchArrows[2],26,camera.viewportHeight-26);
+        spriteBatch.draw(Assets.touchArrows[3],52,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);
     }
 
     private void drawGamePlay() {
         drawWorld();
+        Mob.animateMobs();
         for (Mob mob : gameProc.mobs) drawMob(mob);
         drawPlayer(gameProc.player);
         drawWorldForeground();
@@ -225,9 +221,9 @@ public class GameRenderer {
         spriteBatch.end();
 
         if (CaveGame.TOUCH) {
-            touchBatch.begin();
+            spriteBatch.begin();
             drawTouchGui();
-            touchBatch.end();
+            spriteBatch.end();
         }
 
         fontBatch.begin();
@@ -235,7 +231,9 @@ public class GameRenderer {
         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();
     }