X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Fworld%2FGameWorld.java;h=d3e56c1a760ba6d9991870343bc2502efee48942;hb=894d9f1babeff18c9cbb5f83206ff2c549de0bdb;hp=18afcd4b3eec1c725a4675c5b8b429c317256da4;hpb=2aa65a4cdb47df8014f28342d460fc6639bed885;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
index 18afcd4..d3e56c1 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
@@ -1,13 +1,10 @@
 package ru.deadsoftware.cavedroid.game.world;
 
-import com.badlogic.gdx.utils.Disposable;
-import com.badlogic.gdx.utils.TimeUtils;
 import kotlin.Pair;
 import ru.deadsoftware.cavedroid.game.GameItems;
 import ru.deadsoftware.cavedroid.game.GameScope;
-import ru.deadsoftware.cavedroid.game.mobs.FallingGravel;
-import ru.deadsoftware.cavedroid.game.mobs.FallingSand;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
+import ru.deadsoftware.cavedroid.game.model.world.generator.WorldGeneratorConfig;
 import ru.deadsoftware.cavedroid.game.objects.Block;
 import ru.deadsoftware.cavedroid.game.objects.DropController;
 
@@ -15,25 +12,16 @@ import javax.annotation.CheckForNull;
 import javax.inject.Inject;
 
 @GameScope
-public class GameWorld implements Disposable {
-
-    private static final int DEFAULT_WIDTH = 1024;
-    private static final int DEFAULT_HEIGHT = 256;
-    private static final int UPDATE_RANGE = 16;
+public class GameWorld {
 
     private final DropController mDropController;
     private final MobsController mMobsController;
-    private final GameFluidsThread mGameFluidsThread;
 
     private final int mWidth;
     private final int mHeight;
     private final int[][] mForeMap;
     private final int[][] mBackMap;
 
-    private boolean mShouldUpdate;
-    private int mUpdateX;
-    private int mUpdateY;
-
     @Inject
     public GameWorld(DropController dropController,
                      MobsController mobsController,
@@ -45,9 +33,10 @@ public class GameWorld implements Disposable {
         boolean isNewGame = foreMap == null || backMap == null;
 
         if (isNewGame) {
-            mWidth = DEFAULT_WIDTH;
-            mHeight = DEFAULT_HEIGHT;
-            Pair<int[][], int[][]> maps = GameWorldGenerator.INSTANCE.generate(mWidth, mHeight, TimeUtils.millis());
+            final WorldGeneratorConfig config = WorldGeneratorConfig.Companion.getDefault();
+            mWidth = config.getWidth();
+            mHeight = config.getHeight();
+            Pair<int[][], int[][]> maps = new GameWorldGenerator(config).generate();
             mForeMap = maps.getFirst();
             mBackMap = maps.getSecond();
             mMobsController.getPlayer().respawn(this);
@@ -57,8 +46,6 @@ public class GameWorld implements Disposable {
             mWidth = mForeMap.length;
             mHeight = mForeMap[0].length;
         }
-
-        mGameFluidsThread = new GameFluidsThread(this, mMobsController, Thread.currentThread());
     }
 
     public int getWidth() {
@@ -176,9 +163,6 @@ public class GameWorld implements Disposable {
         } else if (GameItems.isSlab(value) && getForeMap(x, y) == value) {
             placeSlab(x, y, value);
         }
-        mUpdateX = x - 8;
-        mUpdateY = y - 8;
-        mShouldUpdate = true;
     }
 
     public void placeToBackground(int x, int y, int value) {
@@ -203,60 +187,4 @@ public class GameWorld implements Disposable {
         }
         placeToBackground(x, y, 0);
     }
-
-    private void updateBlock(int x, int y) {
-        if (getForeMap(x, y) == 10) {
-            if (!hasForeAt(x, y + 1) || !getForeMapBlock(x, y + 1).hasCollision()) {
-                setForeMap(x, y, 0);
-                mMobsController.addMob(FallingSand.class, x * 16, y * 16);
-                updateBlock(x, y - 1);
-            }   
-        }
-
-        if (getForeMap(x, y) == 11) {
-            if (!hasForeAt(x, y + 1) || !getForeMapBlock(x, y + 1).hasCollision()) {
-                setForeMap(x, y, 0);
-                mMobsController.addMob(FallingGravel.class, x * 16, y * 16);
-                updateBlock(x, y - 1);
-            }
-        }
-
-        if (hasForeAt(x, y) && getForeMapBlock(x, y).requiresBlock()) {
-            if (!hasForeAt(x, y + 1) || !getForeMapBlock(x, y + 1).hasCollision()) {
-                destroyForeMap(x, y);
-                updateBlock(x, y - 1);
-            }
-        }
-
-        if (getForeMap(x, y) == 2) {
-            if (hasForeAt(x, y - 1) && (getForeMapBlock(x, y - 1).hasCollision() ||
-                    GameItems.isFluid(getForeMap(x, y - 1)))) {
-                setForeMap(x, y, 3);
-            }
-        }
-    }
-
-    public void update() {
-        if (mShouldUpdate) {
-            for (int y = mUpdateY; y < mUpdateY + UPDATE_RANGE; y++) {
-                for (int x = mUpdateX; x < mUpdateX + UPDATE_RANGE; x++) {
-                    updateBlock(x, y);
-                }
-            }
-            mShouldUpdate = false;
-        }
-
-        if (!mGameFluidsThread.isAlive()) {
-            mGameFluidsThread.start();
-        }
-    }
-
-    public void startFluidsThread() {
-        mGameFluidsThread.start();
-    }
-
-    @Override
-    public void dispose() {
-        mGameFluidsThread.interrupt();
-    }
 }
\ No newline at end of file