X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameProc.java;h=47b3100aa9164e3f5d4cd22060d46deebc0331b1;hb=c6925c7674b71e9b6fe537aaca3aa7330e04e13f;hp=cf70144d75948eeac988b7c517b12a8247d11d0a;hpb=7115b8cce5cc8469c03ea1fa1fc24506a1e2765e;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
index cf70144..47b3100 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
@@ -1,6 +1,13 @@
 package ru.deadsoftware.cavecraft.game;
 
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
+import com.badlogic.gdx.math.RandomXS128;
+import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.TimeUtils;
+import ru.deadsoftware.cavecraft.*;
+import ru.deadsoftware.cavecraft.game.mobs.Human;
+import ru.deadsoftware.cavecraft.game.mobs.Mob;
 import ru.deadsoftware.cavecraft.game.objects.Player;
 
 public class GameProc {
@@ -9,36 +16,96 @@ public class GameProc {
 
     public Player player;
 
+    public Array<Mob> mobs;
+
     public GameWorld world;
     public GameRenderer renderer;
     public GamePhysics physics;
 
     public int cursorX, cursorY;
     public int invSlot;
+    public int ctrlMode;
 
     public boolean isTouchDown = false;
     public int touchDownX, touchDownY;
+    public int touchDownButton;
     public long touchDownTime;
 
     public GameProc() {
-        world = new GameWorld(512,32);
+        world = new GameWorld(1024,256);
         renderer = new GameRenderer(this);
         physics = new GamePhysics(this);
-        player = new Player();
+        player = new Player(world.getSpawnPoint());
+        mobs = new Array<Mob>();
+        if (!CaveGame.TOUCH) ctrlMode = 1;
     }
 
     public void resetRenderer() {
         renderer = new GameRenderer(this);
     }
 
+    private boolean isAutoselectable(int x, int y) {
+        return (world.getForeMap(x,y)>0 &&
+                Items.BLOCKS.getValueAt(world.getForeMap(x,y)).collision);
+    }
+
+    private void moveCursor() {
+        if (ctrlMode==0) {
+            if (player.canJump) {
+                cursorX = (int) (player.position.x + player.texWidth / 2) / 16;
+                if (player.dir == 0) cursorX--;
+                else cursorX++;
+                cursorY = (int) (player.position.y + player.texWidth) / 16;
+                if (!isAutoselectable(cursorX, cursorY)) {
+                    cursorY++;
+                }
+                if (!isAutoselectable(cursorX, cursorY)) {
+                    cursorY++;
+                }
+                if (!isAutoselectable(cursorX, cursorY)) {
+                    if (player.dir == 0) cursorX++;
+                    else cursorX--;
+                }
+            } else {
+                cursorX = (int) (player.position.x + player.texWidth / 2) / 16;
+                cursorY = (int) (player.position.y + player.height+8)/16;
+            }
+        } else if (!CaveGame.TOUCH){
+            cursorX = (int)(Gdx.input.getX()*
+                    (renderer.camera.viewportWidth/GameScreen.getWidth())+renderer.camera.position.x)/16;
+            cursorY = (int)(Gdx.input.getY()*
+                    (renderer.camera.viewportHeight/GameScreen.getHeight())+renderer.camera.position.y)/16;
+        }
+    }
+
+    private void checkCursorBounds() {
+        if (cursorX < 0) cursorX = 0;
+        if (cursorX >= world.getWidth()) cursorX = world.getWidth()-1;
+        if (cursorY < 0) cursorY = 0;
+        if (cursorY >= world.getHeight()) cursorY = world.getHeight()-1;
+        if (cursorX<(player.position.x+player.texWidth/2)/16)
+            player.dir=0;
+        if (cursorX>(player.position.x+player.texWidth/2)/16)
+            player.dir=1;
+    }
+
     public void update(float delta) {
         RUN_TIME += delta;
 
         physics.update(delta);
+        moveCursor();
+        checkCursorBounds();
 
         if (isTouchDown && TimeUtils.timeSinceMillis(touchDownTime) > 500) {
-            world.placeToBackground(cursorX,cursorY,
-                    player.inventory[invSlot]);
+            if (touchDownButton== Input.Buttons.RIGHT) {
+                world.placeToBackground(cursorX, cursorY,
+                        player.inventory[invSlot]);
+            } else if (touchDownButton==Input.Buttons.LEFT &&
+                    touchDownY< Assets.invBar.getRegionHeight() &&
+                    touchDownX>renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 &&
+                    touchDownX<renderer.camera.viewportWidth/2+Assets.invBar.getRegionWidth()/2) {
+                CaveGame.STATE = GameState.GAME_CREATIVE_INV;
+            }
             isTouchDown = false;
         }
     }