diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
index c5e7d46ecd99eb7b33f9b07eb0c762d6fdda914b..5aecce295466dda979db1ed307f27f0cbead3706 100644 (file)
package ru.deadsoftware.cavedroid.game;
+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.objects.Block;
-import ru.deadsoftware.cavedroid.game.objects.Drop;
+import ru.deadsoftware.cavedroid.game.objects.DropController;
-import static ru.deadsoftware.cavedroid.GameScreen.GP;
+import javax.inject.Inject;
-@SuppressWarnings("WeakerAccess")
+@GameScope
public class GameWorld {
- private final int WIDTH;
- private final int HEIGHT;
- private final int[][] foreMap;
- private final int[][] backMap;
-
- GameWorld(int width, int height) {
- WIDTH = width;
- HEIGHT = height;
- WorldGen.genWorld(WIDTH, HEIGHT);
- foreMap = WorldGen.getForeMap();
- backMap = WorldGen.getBackMap();
+ private static final int DEFAULT_WIDTH = 1024;
+ private static final int DEFAULT_HEIGHT = 256;
+ private static final int UPDATE_RANGE = 16;
+
+ 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
+ GameWorld(DropController dropController,
+ MobsController mobsController) {
+ mDropController = dropController;
+ mMobsController = mobsController;
+
+ mWidth = DEFAULT_WIDTH;
+ mHeight = DEFAULT_HEIGHT;
+ WorldGen.genWorld(mWidth, mHeight);
+ mForeMap = WorldGen.getForeMap();
+ mBackMap = WorldGen.getBackMap();
WorldGen.clear();
- }
- GameWorld(int[][] foreMap, int[][] backMap) {
- this.foreMap = foreMap.clone();
- this.backMap = backMap.clone();
- WIDTH = foreMap.length;
- HEIGHT = foreMap[0].length;
+ mGameFluidsThread = new GameFluidsThread(this, mMobsController, Thread.currentThread());
}
+// GameWorld(int[][] foreMap, int[][] backMap) {
+// this.foreMap = foreMap.clone();
+// this.backMap = backMap.clone();
+// WIDTH = foreMap.length;
+// HEIGHT = foreMap[0].length;
+// }
+
public int getWidth() {
- return WIDTH;
+ return mWidth;
}
public int getHeight() {
- return HEIGHT;
+ return mHeight;
}
public float getWidthPx() {
- return WIDTH * 16f;
+ return mWidth * 16f;
}
public float getHeightPx() {
- return HEIGHT * 16f;
+ return mHeight * 16f;
}
int[][] getFullForeMap() {
- return foreMap;
+ return mForeMap;
}
int[][] getFullBackMap() {
- return backMap;
+ return mBackMap;
}
private int transformX(int x) {
int map = 0;
try {
x = transformX(x);
- map = (layer == 0) ? foreMap[x][y] : backMap[x][y];
+ map = (layer == 0) ? mForeMap[x][y] : mBackMap[x][y];
} catch (ArrayIndexOutOfBoundsException ignored) {
}
return map;
try {
x = transformX(x);
if (layer == 0) {
- foreMap[x][y] = value;
+ mForeMap[x][y] = value;
} else {
- backMap[x][y] = value;
+ mBackMap[x][y] = value;
}
} catch (ArrayIndexOutOfBoundsException ignored) {
}
} else if (GameItems.isSlab(value) && getForeMap(x, y) == value) {
placeSlab(x, y, value);
}
- GameProc.UPD_X = x - 8;
- GameProc.UPD_Y = y - 8;
- GameProc.DO_UPD = true;
+ mUpdateX = x - 8;
+ mUpdateY = y - 8;
+ mShouldUpdate = true;
}
public void placeToBackground(int x, int y, int value) {
}
public void destroyForeMap(int x, int y) {
- if (GameItems.getBlock(getForeMap(x, y)).hasDrop()) {
- GP.drops.add(new Drop(transformX(x) * 16 + 4, y * 16 + 4,
- GameItems.getItemId(GameItems.getBlock(getForeMap(x, y)).getDrop())));
+ Block block = GameItems.getBlock(getForeMap(x, y));
+ if (block.hasDrop()) {
+ mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, GameItems.getItemId(block.getDrop()));
}
placeToForeground(x, y, 0);
}
public void destroyBackMap(int x, int y) {
- if (GameItems.getBlock(getBackMap(x, y)).hasDrop()) {
- GP.drops.add(new Drop(transformX(x) * 16 + 4, y * 16 + 4,
- GameItems.getItemId(GameItems.getBlock(getBackMap(x, y)).getDrop())));
+ Block block = GameItems.getBlock(getBackMap(x, y));
+ if (block.hasDrop()) {
+ mDropController.addDrop(transformX(x) * 16 + 4, y * 16 + 4, GameItems.getItemId(block.getDrop()));
}
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();
+ }
+
}
\ No newline at end of file