improved tree placement

valoeghese · May 17, 2020 · 0177636 · 0177636
1 parent 9b76b04
commit 0177636
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 31 deletions.
diff --git a/src/main/java/tk/valoeghese/fc0/world/WorldGen.java b/src/main/java/tk/valoeghese/fc0/world/WorldGen.java
@@ -47,6 +47,10 @@ public static void populateChunk(World world, Chunk chunk, Random rand) {
 		}
 	}
 
+	public static double sampleNoise(double x, double y) {
+		return noise.sample(x, y);
+	}
+
 	private static Noise noise;
 	private static Noise ridges;
 	private static long cachedSeed = 0;

diff --git a/src/main/java/tk/valoeghese/fc0/world/generator/TreeGenerator.java b/src/main/java/tk/valoeghese/fc0/world/generator/TreeGenerator.java
@@ -1,61 +1,74 @@
 package tk.valoeghese.fc0.world.generator;
 
 import tk.valoeghese.fc0.world.World;
+import tk.valoeghese.fc0.world.WorldGen;
 import tk.valoeghese.fc0.world.tile.Tile;
 
 import java.util.Random;
 
 public class TreeGenerator extends Generator {
 	@Override
 	public void generate(int startX, int startZ, Random rand, World world) {
-		int x = startX + rand.nextInt(16);
-		int z = startZ + rand.nextInt(16);
-		int y = world.getHeight(x, z) + 1;
-		int height = 3 + rand.nextInt(3);
+		int count = 1 + (int) (3 * WorldGen.sampleNoise(startX / 128.0, startZ / 128.0));
 
-		for (int xo = -2; xo <= 2; ++xo) {
-			int totalX = x + xo;
+		if (rand.nextInt(8) == 0) {
+			++count;
 
-			for (int zo = -2; zo <= 2; ++zo) {
-				int totalZ = z + zo;
+			if (rand.nextInt(4) == 0) {
+				++count;
+			}
+		}
 
-				for (int yo = 0; yo < 2; ++yo) {
-					if (yo == 1 && Math.abs(zo) == 2 && Math.abs(xo) == 2 && rand.nextBoolean()) {
-						break;
-					}
+		for (int i = 0; i < count; ++i) {
+			int x = startX + rand.nextInt(16);
+			int z = startZ + rand.nextInt(16);
+			int y = world.getHeight(x, z) + 1;
+			int height = 3 + rand.nextInt(3);
+
+			for (int xo = -2; xo <= 2; ++xo) {
+				int totalX = x + xo;
+
+				for (int zo = -2; zo <= 2; ++zo) {
+					int totalZ = z + zo;
+
+					for (int yo = 0; yo < 2; ++yo) {
+						if (yo == 1 && Math.abs(zo) == 2 && Math.abs(xo) == 2 && rand.nextBoolean()) {
+							break;
+						}
 
-					int totalY = y + height + yo;
+						int totalY = y + height + yo;
 
-					if (world.isInWorld(totalX, totalY, totalZ)) {
-						world.writeTile(totalX, totalY, totalZ, Tile.LEAVES.id);
+						if (world.isInWorld(totalX, totalY, totalZ)) {
+							world.writeTile(totalX, totalY, totalZ, Tile.LEAVES.id);
+						}
 					}
 				}
 			}
-		}
 
-		int finalCrossY = y + height + 2;
+			int finalCrossY = y + height + 2;
 
-		for (int xo = -1; xo < 2; ++xo) {
-			int totalX = xo + x;
+			for (int xo = -1; xo < 2; ++xo) {
+				int totalX = xo + x;
 
-			for (int zo = -1; zo < 2; ++zo) {
-				if (zo != 0 && xo != 0) {
-					continue;
-				}
+				for (int zo = -1; zo < 2; ++zo) {
+					if (zo != 0 && xo != 0) {
+						continue;
+					}
 
-				int totalZ = zo + z;
+					int totalZ = zo + z;
 
-				if (world.isInWorld(totalX, finalCrossY, totalZ)) {
-					world.writeTile(totalX, finalCrossY, totalZ, Tile.LEAVES.id);
+					if (world.isInWorld(totalX, finalCrossY, totalZ)) {
+						world.writeTile(totalX, finalCrossY, totalZ, Tile.LEAVES.id);
+					}
 				}
 			}
-		}
 
-		for (int yo = 0; yo < height; ++yo) {
-			int totalY = yo + y;
+			for (int yo = 0; yo < height; ++yo) {
+				int totalY = yo + y;
 
-			if (world.isInWorld(x, totalY, z)) {
-				world.writeTile(x, totalY, z, Tile.LOG.id);
+				if (world.isInWorld(x, totalY, z)) {
+					world.writeTile(x, totalY, z, Tile.LOG.id);
+				}
 			}
 		}
 	}