X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameProc.java;h=b100ddc77251572ddee3e4e54d8cde36ce5e2542;hp=0e3993d8a4caf0018cd28e9e5e5279d1e8ad3b74;hb=792296717939ac50df33865ae3acbb010e812ad1;hpb=a7ae39b1ed142e467b11689cd47010e5b9f90ceb

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
index 0e3993d..b100ddc 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
@@ -1,10 +1,12 @@
 package ru.deadsoftware.cavecraft.game;
 
-import com.badlogic.gdx.math.RandomXS128;
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.TimeUtils;
-import ru.deadsoftware.cavecraft.game.mobs.Human;
+import ru.deadsoftware.cavecraft.*;
 import ru.deadsoftware.cavecraft.game.mobs.Mob;
+import ru.deadsoftware.cavecraft.game.mobs.Pig;
 import ru.deadsoftware.cavecraft.game.objects.Player;
 
 public class GameProc {
@@ -23,31 +25,99 @@ public class GameProc {
     public int invSlot;
     public int ctrlMode;
 
-    public boolean isTouchDown = false;
-    public int touchDownX, touchDownY;
+    public boolean isTouchDown, isKeyDown;
+    public int touchDownX, touchDownY, keyDownCode;
+    public int touchDownButton;
     public long touchDownTime;
 
     public GameProc() {
-        world = new GameWorld(4096,256);
-        renderer = new GameRenderer(this);
+        world = new GameWorld(1024,256);
+        if (CaveGame.TOUCH) {
+            renderer = new GameRenderer(this,320,
+                    320*((float)GameScreen.getHeight()/GameScreen.getWidth()));
+        } else {
+            renderer = new GameRenderer(this,480,
+                    480*((float)GameScreen.getHeight()/GameScreen.getWidth()));
+        }
         physics = new GamePhysics(this);
         player = new Player(world.getSpawnPoint());
         mobs = new Array<Mob>();
-
+        for (int i=0; i<world.getWidth(); i+=64) {
+            mobs.add(new Pig(i*16, 0, world));
+        }
+        if (!CaveGame.TOUCH) ctrlMode = 1;
     }
 
     public void resetRenderer() {
-        renderer = new GameRenderer(this);
+        if (CaveGame.TOUCH) {
+            renderer = new GameRenderer(this,320,
+                    320*((float)GameScreen.getHeight()/GameScreen.getWidth()));
+        } else {
+            renderer = new GameRenderer(this,480,
+                    480*((float)GameScreen.getHeight()/GameScreen.getWidth()));
+        }
+    }
+
+    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 && CaveGame.TOUCH) {
+            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 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;
+            if ((Gdx.input.getX()*
+                    (renderer.camera.viewportWidth/GameScreen.getWidth())+renderer.camera.position.x)<0)
+                cursorX--;
+        }
+    }
+
+    private void checkCursorBounds() {
+        if (cursorY < 0) cursorY = 0;
+        if (cursorY >= world.getHeight()) cursorY = world.getHeight()-1;
+        if (ctrlMode==1) {
+            if (cursorX*16+8<player.position.x+player.texWidth/2)
+                player.dir=0;
+            if (cursorX*16+8>player.position.x+player.texWidth/2)
+                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;
         }
     }