X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameRenderer.java;h=cc3bcdee8c9f849e89f1d8184bb68b397c4660e8;hb=503cd1720db3f53b7cbf7e3819968044de29a465;hp=4ab0704af7a016e18dc63956affbe4bd5c4f279b;hpb=48de33432d9615967da21b22b950bd526b330572;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
index 4ab0704..cc3bcde 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameRenderer.java
@@ -6,21 +6,22 @@ import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.math.Vector3;
 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;
 
 public class GameRenderer {
 
     private GameProc gameProc;
 
-    public Vector3 camTargetPos;
-    public OrthographicCamera camera;
+    public OrthographicCamera camera, fontCam;
     ShapeRenderer shapeRenderer;
-    SpriteBatch spriteBatch;
+    SpriteBatch spriteBatch, fontBatch;
 
     public GameRenderer(GameProc gameProc) {
         Gdx.gl.glClearColor(0f,.6f,.6f,1f);
@@ -28,14 +29,25 @@ public class GameRenderer {
         camera = new OrthographicCamera();
         camera.setToOrtho(true, 360,
                 360*((float)GameScreen.getHeight()/GameScreen.getWidth()));
-        camera.position.x=0;
-        camera.position.y=0;
-        camTargetPos = camera.position.cpy();
+
         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() {
@@ -64,14 +76,51 @@ public class GameRenderer {
         }
     }
 
+    private void drawMob(Mob mob) {
+        mob.draw(spriteBatch,
+                mob.position.x-camera.position.x, mob.position.y-camera.position.y);
+    }
+
     private void drawPlayer(Player pl) {
-        spriteBatch.draw(Assets.playerSkin[pl.dir],
-                pl.position.x - camera.position.x, pl.position.y - camera.position.y);
+        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);
+        } 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);
+        }
+        if (Assets.playerSkin[0][2].getRotation()>=60 || Assets.playerSkin[0][2].getRotation()<=-60)
+            Mob.ANIM_SPEED = -Mob.ANIM_SPEED;
+        Assets.playerSkin[1][2].setPosition(
+                pl.position.x - camera.position.x - 6,
+                pl.position.y - camera.position.y);
+        Assets.playerSkin[1][2].draw(spriteBatch);
+        Assets.playerSkin[1][3].setPosition(
+                pl.position.x - camera.position.x - 6,
+                pl.position.y - camera.position.y + 10);
+        Assets.playerSkin[1][3].draw(spriteBatch);
+        Assets.playerSkin[0][3].setPosition(
+                pl.position.x - camera.position.x - 6,
+                pl.position.y - camera.position.y + 10);
+        Assets.playerSkin[0][3].draw(spriteBatch);
+
+        spriteBatch.draw(Assets.playerSkin[pl.dir][0],
+                pl.position.x - camera.position.x - 2, pl.position.y - camera.position.y - 2);
+        spriteBatch.draw(Assets.playerSkin[pl.dir][1],
+                pl.position.x - camera.position.x - 2, pl.position.y - camera.position.y + 8);
+
+        Assets.playerSkin[0][2].setPosition(
+                pl.position.x - camera.position.x - 6,
+                pl.position.y - camera.position.y);
+        Assets.playerSkin[0][2].draw(spriteBatch);
     }
 
     private void drawGUI() {
-        spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2,
-                0);//camera.viewportHeight - Assets.invBar.getRegionHeight());
+        spriteBatch.draw(Assets.invBar, camera.viewportWidth/2 - Assets.invBar.getRegionWidth()/2, 0);
         for (int i=0; i<8; i++) {
             if (gameProc.player.inventory[i]>0) {
                 spriteBatch.draw(Items.BLOCKS.getValueAt(gameProc.player.inventory[i]).getTexture(),
@@ -104,6 +153,7 @@ public class GameRenderer {
 
         spriteBatch.begin();
         drawWorld();
+        for (Mob mob : gameProc.mobs) drawMob(mob);
         drawPlayer(gameProc.player);
         drawGUI();
         spriteBatch.end();
@@ -116,6 +166,19 @@ public class GameRenderer {
                     gameProc.cursorY * 16 - camera.position.y, 16, 16);
             shapeRenderer.end();
         }
+
+        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);
+        drawString("Block: "+
+                Items.BLOCKS.keys().toArray().get(gameProc.world.getForeMap(
+                        (int)(gameProc.player.position.x/16),
+                        (int)(gameProc.player.position.y/16+2))),
+                0, 80);
+        fontBatch.end();
     }
 
 }