From e31546afa76ba2e87065ad087107547ab6a25d46 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Mon, 11 Jul 2022 00:02:43 +0300 Subject: [PATCH] =?UTF-8?q?'50.=20=D0=9F=D1=80=D0=B8=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D1=85=D0=BE=D0=B4=D0=B5=20=D0=B2=20=D1=81=D0=BF=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=B0=D1=82=D0=BE=D1=80=20=D0=B1=D1=80=D0=BE=D0=BD?= =?UTF-8?q?=D1=8F=20=D0=BD=D0=B5=20=D0=B8=D1=81=D1=87=D0=B5=D0=B7=D0=B0?= =?UTF-8?q?=D0=B5=D1=82'=20-=20fixed,=20intergrated=20@Tema1d=20's=20writi?= =?UTF-8?q?ng=20to=20LevelAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/world/generator/NormalGenerator.php | 171 ------- .../generator/noise/NoiseGeneratorSimplex.php | 438 ------------------ src/world/generator/noise/OctaveGenerator.php | 108 ----- .../generator/noise/PerlinOctaveGenerator.php | 63 --- .../populator/TallGrassPopulator.php | 70 --- .../generator/populator/TreePopulator.php | 67 --- 6 files changed, 917 deletions(-) delete mode 100644 src/world/generator/NormalGenerator.php delete mode 100644 src/world/generator/noise/NoiseGeneratorSimplex.php delete mode 100644 src/world/generator/noise/OctaveGenerator.php delete mode 100644 src/world/generator/noise/PerlinOctaveGenerator.php delete mode 100644 src/world/generator/populator/TallGrassPopulator.php delete mode 100644 src/world/generator/populator/TreePopulator.php diff --git a/src/world/generator/NormalGenerator.php b/src/world/generator/NormalGenerator.php deleted file mode 100644 index 080b6ed4..00000000 --- a/src/world/generator/NormalGenerator.php +++ /dev/null @@ -1,171 +0,0 @@ -level = $level; - $this->random = $random; - $this->random->setSeed($this->level->getSeed()); - $this->noiseHills = new NoiseGeneratorSimplex($this->random, 3); - $this->noisePatches = new NoiseGeneratorSimplex($this->random, 2); - $this->noisePatchesSmall = new NoiseGeneratorSimplex($this->random, 2); - $this->noiseBase = new NoiseGeneratorSimplex($this->random, 16); - - - $ores = new OrePopulator(); - $ores->setOreTypes(array( - new OreType(new CoalOreBlock(), 20, 16, 0, 128), - new OreType(New IronOreBlock(), 20, 8, 0, 64), - new OreType(new RedstoneOreBlock(), 8, 7, 0, 16), - new OreType(new LapisOreBlock(), 1, 6, 0, 32), - new OreType(new GoldOreBlock(), 2, 8, 0, 32), - new OreType(new DiamondOreBlock(), 1, 7, 0, 16), - new OreType(new DirtBlock(), 20, 32, 0, 128), - new OreType(new GravelBlock(), 10, 16, 0, 128), - )); - $this->populators[] = $ores; - - $trees = new TreePopulator(); - $trees->setBaseAmount(3); - $trees->setRandomAmount(0); - $this->populators[] = $trees; - - $tallGrass = new TallGrassPopulator(); - $tallGrass->setBaseAmount(5); - $tallGrass->setRandomAmount(0); - $this->populators[] = $tallGrass; - } - - public function generateChunk($chunkX, $chunkZ){ - $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); - $hills = array(); - $patchesSmall = array(); - $base = array(); - for($z = 0; $z < 16; ++$z){ - for($x = 0; $x < 16; ++$x){ - $i = ($z << 4) + $x; - $hills[$i] = $this->noiseHills->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), 0.11, 12, true); - $patches[$i] = $this->noisePatches->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), 0.03, 16, true); - $patchesSmall[$i] = $this->noisePatchesSmall->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), 0.5, 4, true); - $base[$i] = $this->noiseBase->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), 0.7, 16, true); - - if($base[$i] < 0){ - $base[$i] *= 0.5; - } - } - } - - for($chunkY = 0; $chunkY < 8; ++$chunkY){ - $chunk = ""; - $startY = $chunkY << 4; - $endY = $startY + 16; - for($z = 0; $z < 16; ++$z){ - for($x = 0; $x < 16; ++$x){ - $i = ($z << 4) + $x; - $height = $this->worldHeight + $hills[$i] * 14 + $base[$i] * 7; - $height = (int) $height; - - for($y = $startY; $y < $endY; ++$y){ - $diff = $height - $y; - if($y <= 4 and ($y === 0 or $this->random->nextFloat() < 0.75)){ - $chunk .= "\x07"; //bedrock - }elseif($diff > 2){ - $chunk .= "\x01"; //stone - }elseif($diff > 0){ - if($patches[$i] > 0.7){ - $chunk .= "\x01"; //stone - }elseif($patches[$i] < -0.8){ - $chunk .= "\x0d"; //gravel - }else{ - $chunk .= "\x03"; //dirt - } - }elseif($y <= $this->waterHeight){ - if(($this->waterHeight - $y) <= 1 and $diff === 0){ - $chunk .= "\x0c"; //sand - }elseif($diff === 0){ - if($patchesSmall[$i] > 0.3){ - $chunk .= "\x0d"; //gravel - }elseif($patchesSmall[$i] < -0.45){ - $chunk .= "\x0c"; //sand - }else{ - $chunk .= "\x03"; //dirt - } - }else{ - $chunk .= "\x09"; //still_water - } - }elseif($diff === 0){ - if($patches[$i] > 0.7){ - $chunk .= "\x01"; //stone - }elseif($patches[$i] < -0.8){ - $chunk .= "\x0d"; //gravel - }else{ - $chunk .= "\x02"; //grass - } - }else{ - $chunk .= "\x00"; - } - } - $chunk .= "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"; - } - } - $this->level->setMiniChunk($chunkX, $chunkZ, $chunkY, $chunk); - } - - } - public function populateLevel(){ - - } - public function populateChunk($chunkX, $chunkZ){ - $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); - foreach($this->populators as $populator){ - $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); - $populator->populate($this->level, $chunkX, $chunkZ, $this->random); - } - } - - public function getSpawn(){ - return $this->level->getSafeSpawn(new Vector3(127.5, 128, 127.5)); - } - -} \ No newline at end of file diff --git a/src/world/generator/noise/NoiseGeneratorSimplex.php b/src/world/generator/noise/NoiseGeneratorSimplex.php deleted file mode 100644 index 2989ba71..00000000 --- a/src/world/generator/noise/NoiseGeneratorSimplex.php +++ /dev/null @@ -1,438 +0,0 @@ - - * This is a modified version of the freely published version in the paper by - * Stefan Gustavson at - * - * http://staffwww.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf - */ -class NoiseGeneratorSimplex extends NoiseGeneratorPerlin{ - protected static $SQRT_3; - protected static $SQRT_5; - protected static $F2; - protected static $G2; - protected static $G22; - protected static $F3; - protected static $G3; - protected static $F4; - protected static $G4; - protected static $G42; - protected static $G43; - protected static $G44; - protected static $grad4 = [[0, 1, 1, 1],[0, 1, 1, -1],[0, 1, -1, 1],[0, 1, -1, -1], - [0, -1, 1, 1],[0, -1, 1, -1],[0, -1, -1, 1],[0, -1, -1, -1], - [1, 0, 1, 1],[1, 0, 1, -1],[1, 0, -1, 1],[1, 0, -1, -1], - [-1, 0, 1, 1],[-1, 0, 1, -1],[-1, 0, -1, 1],[-1, 0, -1, -1], - [1, 1, 0, 1],[1, 1, 0, -1],[1, -1, 0, 1],[1, -1, 0, -1], - [-1, 1, 0, 1],[-1, 1, 0, -1],[-1, -1, 0, 1],[-1, -1, 0, -1], - [1, 1, 1, 0],[1, 1, -1, 0],[1, -1, 1, 0],[1, -1, -1, 0], - [-1, 1, 1, 0],[-1, 1, -1, 0],[-1, -1, 1, 0],[-1, -1, -1, 0]]; - protected static $simplex = [ - [0, 1, 2, 3],[0, 1, 3, 2],[0, 0, 0, 0],[0, 2, 3, 1],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[1, 2, 3, 0], - [0, 2, 1, 3],[0, 0, 0, 0],[0, 3, 1, 2],[0, 3, 2, 1],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[1, 3, 2, 0], - [0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0], - [1, 2, 0, 3],[0, 0, 0, 0],[1, 3, 0, 2],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[2, 3, 0, 1],[2, 3, 1, 0], - [1, 0, 2, 3],[1, 0, 3, 2],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[2, 0, 3, 1],[0, 0, 0, 0],[2, 1, 3, 0], - [0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0], - [2, 0, 1, 3],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[3, 0, 1, 2],[3, 0, 2, 1],[0, 0, 0, 0],[3, 1, 2, 0], - [2, 1, 0, 3],[0, 0, 0, 0],[0, 0, 0, 0],[0, 0, 0, 0],[3, 1, 0, 2],[0, 0, 0, 0],[3, 2, 0, 1],[3, 2, 1, 0]]; - protected $offsetW; - - public function __construct(Random $random, $octaves){ - parent::__construct($random, $octaves); - $this->offsetW = $random->nextFloat() * 256; - self::$SQRT_3 = sqrt(3); - self::$SQRT_5 = sqrt(5); - self::$F2 = 0.5 * (self::$SQRT_3 - 1); - self::$G2 = (3 - self::$SQRT_3) / 6; - self::$G22 = self::$G2 * 2.0 - 1; - self::$F3 = 1.0 / 3.0; - self::$G3 = 1.0 / 6.0; - self::$F4 = (self::$SQRT_5 - 1.0) / 4.0; - self::$G4 = (5.0 - self::$SQRT_5) / 20.0; - self::$G42 = self::$G4 * 2.0; - self::$G43 = self::$G4 * 3.0; - self::$G44 = self::$G4 * 4.0 - 1.0; - } - - protected static function dot2D($g, $x, $y){ - return $g[0] * $x + $g[1] * $y; - } - - protected static function dot3D($g, $x, $y, $z){ - return $g[0] * $x + $g[1] * $y + $g[2] * $z; - } - - protected static function dot4D($g, $x, $y, $z, $w){ - return $g[0] * $x + $g[1] * $y + $g[2] * $z + $g[3] * $w; - } - - public function getNoise3D($x, $y, $z){ - $x += $this->offsetX; - $y += $this->offsetY; - $z += $this->offsetZ; - - // Skew the input space to determine which simplex cell we're in - $s = ($x + $y + $z) * self::$F3; // Very nice and simple skew factor for 3D - $i = self::floor($x + $s); - $j = self::floor($y + $s); - $k = self::floor($z + $s); - $t = ($i + $j + $k) * self::$G3; - $X0 = $i - $t; // Unskew the cell origin back to (x,y,z) space - $Y0 = $j - $t; - $Z0 = $k - $t; - $x0 = $x - $X0; // The x,y,z distances from the cell origin - $y0 = $y - $Y0; - $z0 = $z - $Z0; - - // For the 3D case, the simplex shape is a slightly irregular tetrahedron. - - // Determine which simplex we are in. - if($x0 >= $y0){ - if($y0 >= $z0){ - $i1 = 1; - $j1 = 0; - $k1 = 0; - $i2 = 1; - $j2 = 1; - $k2 = 0; - }// X Y Z order - elseif($x0 >= $z0){ - $i1 = 1; - $j1 = 0; - $k1 = 0; - $i2 = 1; - $j2 = 0; - $k2 = 1; - }// X Z Y order - else{ - $i1 = 0; - $j1 = 0; - $k1 = 1; - $i2 = 1; - $j2 = 0; - $k2 = 1; - }// Z X Y order - }else{ // x0perm[$ii + $this->perm[$jj + $this->perm[$kk]]] % 12; - $gi1 = $this->perm[$ii + $i1 + $this->perm[$jj + $j1 + $this->perm[$kk + $k1]]] % 12; - $gi2 = $this->perm[$ii + $i2 + $this->perm[$jj + $j2 + $this->perm[$kk + $k2]]] % 12; - $gi3 = $this->perm[$ii + 1 + $this->perm[$jj + 1 + $this->perm[$kk + 1]]] % 12; - - // Calculate the contribution from the four corners - $t0 = 0.6 - $x0 * $x0 - $y0 * $y0 - $z0 * $z0; - if($t0 < 0){ - $n0 = 0.0; - }else{ - $t0 *= $t0; - $n0 = $t0 * $t0 * self::dot3D(self::$grad3[$gi0], $x0, $y0, $z0); - } - - $t1 = 0.6 - $x1 * $x1 - $y1 * $y1 - $z1 * $z1; - if($t1 < 0){ - $n1 = 0.0; - }else{ - $t1 *= $t1; - $n1 = $t1 * $t1 * self::dot3D(self::$grad3[$gi1], $x1, $y1, $z1); - } - - $t2 = 0.6 - $x2 * $x2 - $y2 * $y2 - $z2 * $z2; - if($t2 < 0){ - $n2 = 0.0; - }else{ - $t2 *= $t2; - $n2 = $t2 * $t2 * self::dot3D(self::$grad3[$gi2], $x2, $y2, $z2); - } - - $t3 = 0.6 - $x3 * $x3 - $y3 * $y3 - $z3 * $z3; - if($t3 < 0){ - $n3 = 0.0; - }else{ - $t3 *= $t3; - $n3 = $t3 * $t3 * self::dot3D(self::$grad3[$gi3], $x3, $y3, $z3); - } - - // Add contributions from each corner to get the noise value. - // The result is scaled to stay just inside [-1,1] - return 32.0 * ($n0 + $n1 + $n2 + $n3); - } - - public function getNoise2D($x, $y){ - $x += $this->offsetX; - $y += $this->offsetY; - - // Skew the input space to determine which simplex cell we're in - $s = ($x + $y) * self::$F2; // Hairy factor for 2D - $i = self::floor($x + $s); - $j = self::floor($y + $s); - $t = ($i + $j) * self::$G2; - $X0 = $i - $t; // Unskew the cell origin back to (x,y) space - $Y0 = $j - $t; - $x0 = $x - $X0; // The x,y distances from the cell origin - $y0 = $y - $Y0; - - // For the 2D case, the simplex shape is an equilateral triangle. - - // Determine which simplex we are in. - if($x0 > $y0){ - $i1 = 1; - $j1 = 0; - }// lower triangle, XY order: (0,0)->(1,0)->(1,1) - else{ - $i1 = 0; - $j1 = 1; - }// upper triangle, YX order: (0,0)->(0,1)->(1,1) - - // A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and - // a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where - // c = (3-sqrt(3))/6 - - $x1 = $x0 - $i1 + self::$G2; // Offsets for middle corner in (x,y) unskewed coords - $y1 = $y0 - $j1 + self::$G2; - $x2 = $x0 + self::$G22; // Offsets for last corner in (x,y) unskewed coords - $y2 = $y0 + self::$G22; - - // Work out the hashed gradient indices of the three simplex corners - $ii = $i & 255; - $jj = $j & 255; - $gi0 = $this->perm[$ii + $this->perm[$jj]] % 12; - $gi1 = $this->perm[$ii + $i1 + $this->perm[$jj + $j1]] % 12; - $gi2 = $this->perm[$ii + 1 + $this->perm[$jj + 1]] % 12; - - // Calculate the contribution from the three corners - $t0 = 0.5 - $x0 * $x0 - $y0 * $y0; - if($t0 < 0){ - $n0 = 0.0; - }else{ - $t0 *= $t0; - $n0 = $t0 * $t0 * self::dot2D(self::$grad3[$gi0], $x0, $y0); // (x,y) of grad3 used for 2D gradient - } - - $t1 = 0.5 - $x1 * $x1 - $y1 * $y1; - if($t1 < 0){ - $n1 = 0.0; - }else{ - $t1 *= $t1; - $n1 = $t1 * $t1 * self::dot2D(self::$grad3[$gi1], $x1, $y1); - } - - $t2 = 0.5 - $x2 * $x2 - $y2 * $y2; - if($t2 < 0){ - $n2 = 0.0; - }else{ - $t2 *= $t2; - $n2 = $t2 * $t2 * self::dot2D(self::$grad3[$gi2], $x2, $y2); - } - - // Add contributions from each corner to get the noise value. - // The result is scaled to return values in the interval [-1,1]. - return 70.0 * ($n0 + $n1 + $n2); - } - - /** - * Computes and returns the 4D simplex noise for the given coordinates in - * 4D space - * - * @param x X coordinate - * @param y Y coordinate - * @param z Z coordinate - * @param w W coordinate - * @return Noise at given location, from range -1 to 1 - */ - /*public function getNoise4D(x, y, z, w){ - x += offsetX; - y += offsetY; - z += offsetZ; - w += offsetW; - - n0, n1, n2, n3, n4; // Noise contributions from the five corners - - // Skew the (x,y,z,w) space to determine which cell of 24 simplices we're in - s = (x + y + z + w) * self::$F4; // Factor for 4D skewing - i = floor(x + s); - j = floor(y + s); - k = floor(z + s); - l = floor(w + s); - - t = (i + j + k + l) * self::$G4; // Factor for 4D unskewing - X0 = i - t; // Unskew the cell origin back to (x,y,z,w) space - Y0 = j - t; - Z0 = k - t; - W0 = l - t; - x0 = x - X0; // The x,y,z,w distances from the cell origin - y0 = y - Y0; - z0 = z - Z0; - w0 = w - W0; - - // For the 4D case, the simplex is a 4D shape I won't even try to describe. - // To find out which of the 24 possible simplices we're in, we need to - // determine the magnitude ordering of x0, y0, z0 and w0. - // The method below is a good way of finding the ordering of x,y,z,w and - // then find the correct traversal order for the simplex we’re in. - // First, six pair-wise comparisons are performed between each possible pair - // of the four coordinates, and the results are used to add up binary bits - // for an integer index. - c1 = (x0 > y0) ? 32 : 0; - c2 = (x0 > z0) ? 16 : 0; - c3 = (y0 > z0) ? 8 : 0; - c4 = (x0 > w0) ? 4 : 0; - c5 = (y0 > w0) ? 2 : 0; - c6 = (z0 > w0) ? 1 : 0; - c = c1 + c2 + c3 + c4 + c5 + c6; - i1, j1, k1, l1; // The integer offsets for the second simplex corner - i2, j2, k2, l2; // The integer offsets for the third simplex corner - i3, j3, k3, l3; // The integer offsets for the fourth simplex corner - - // simplex[c] is a 4-vector with the numbers 0, 1, 2 and 3 in some order. - // Many values of c will never occur, since e.g. x>y>z>w makes x= 3 ? 1 : 0; - j1 = simplex[c][1] >= 3 ? 1 : 0; - k1 = simplex[c][2] >= 3 ? 1 : 0; - l1 = simplex[c][3] >= 3 ? 1 : 0; - - // The number 2 in the "simplex" array is at the second largest coordinate. - i2 = simplex[c][0] >= 2 ? 1 : 0; - j2 = simplex[c][1] >= 2 ? 1 : 0; - k2 = simplex[c][2] >= 2 ? 1 : 0; - l2 = simplex[c][3] >= 2 ? 1 : 0; - - // The number 1 in the "simplex" array is at the second smallest coordinate. - i3 = simplex[c][0] >= 1 ? 1 : 0; - j3 = simplex[c][1] >= 1 ? 1 : 0; - k3 = simplex[c][2] >= 1 ? 1 : 0; - l3 = simplex[c][3] >= 1 ? 1 : 0; - - // The fifth corner has all coordinate offsets = 1, so no need to look that up. - - x1 = x0 - i1 + self::$G4; // Offsets for second corner in (x,y,z,w) coords - y1 = y0 - j1 + self::$G4; - z1 = z0 - k1 + self::$G4; - w1 = w0 - l1 + self::$G4; - - x2 = x0 - i2 + self::$G42; // Offsets for third corner in (x,y,z,w) coords - y2 = y0 - j2 + self::$G42; - z2 = z0 - k2 + self::$G42; - w2 = w0 - l2 + self::$G42; - - x3 = x0 - i3 + self::$G43; // Offsets for fourth corner in (x,y,z,w) coords - y3 = y0 - j3 + self::$G43; - z3 = z0 - k3 + self::$G43; - w3 = w0 - l3 + self::$G43; - - x4 = x0 + self::$G44; // Offsets for last corner in (x,y,z,w) coords - y4 = y0 + self::$G44; - z4 = z0 + self::$G44; - w4 = w0 + self::$G44; - - // Work out the hashed gradient indices of the five simplex corners - ii = i & 255; - jj = j & 255; - kk = k & 255; - ll = l & 255; - - gi0 = $this->perm[ii + $this->perm[jj + $this->perm[kk + $this->perm[ll]]]] % 32; - gi1 = $this->perm[ii + i1 + $this->perm[jj + j1 + $this->perm[kk + k1 + $this->perm[ll + l1]]]] % 32; - gi2 = $this->perm[ii + i2 + $this->perm[jj + j2 + $this->perm[kk + k2 + $this->perm[ll + l2]]]] % 32; - gi3 = $this->perm[ii + i3 + $this->perm[jj + j3 + $this->perm[kk + k3 + $this->perm[ll + l3]]]] % 32; - gi4 = $this->perm[ii + 1 + $this->perm[jj + 1 + $this->perm[kk + 1 + $this->perm[ll + 1]]]] % 32; - - // Calculate the contribution from the five corners - t0 = 0.6 - x0 * x0 - y0 * y0 - z0 * z0 - w0 * w0; - if(t0 < 0){ - n0 = 0.0; - }else{ - t0 *= t0; - n0 = t0 * t0 * dot(grad4[gi0], x0, y0, z0, w0); - } - - t1 = 0.6 - x1 * x1 - y1 * y1 - z1 * z1 - w1 * w1; - if(t1 < 0){ - n1 = 0.0; - }else{ - t1 *= t1; - n1 = t1 * t1 * dot(grad4[gi1], x1, y1, z1, w1); - } - - t2 = 0.6 - x2 * x2 - y2 * y2 - z2 * z2 - w2 * w2; - if(t2 < 0){ - n2 = 0.0; - }else{ - t2 *= t2; - n2 = t2 * t2 * dot(grad4[gi2], x2, y2, z2, w2); - } - - t3 = 0.6 - x3 * x3 - y3 * y3 - z3 * z3 - w3 * w3; - if(t3 < 0){ - n3 = 0.0; - }else{ - t3 *= t3; - n3 = t3 * t3 * dot(grad4[gi3], x3, y3, z3, w3); - } - - t4 = 0.6 - x4 * x4 - y4 * y4 - z4 * z4 - w4 * w4; - if(t4 < 0){ - n4 = 0.0; - }else{ - t4 *= t4; - n4 = t4 * t4 * dot(grad4[gi4], x4, y4, z4, w4); - } - - // Sum up and scale the result to cover the range [-1,1] - return 27.0 * (n0 + n1 + n2 + n3 + n4); - }*/ -} \ No newline at end of file diff --git a/src/world/generator/noise/OctaveGenerator.php b/src/world/generator/noise/OctaveGenerator.php deleted file mode 100644 index 962801be..00000000 --- a/src/world/generator/noise/OctaveGenerator.php +++ /dev/null @@ -1,108 +0,0 @@ -octaves = $octaves; - } - - public function setScale($scale){ - $this->setXScale($scale); - $this->setYScale($scale); - $this->setZScale($scale); - } - - public function getXScale(){ - return $this->xScale; - } - - public function setXScale($scale){ - $this->xScale = $scale; - } - - public function getYScale(){ - return $this->yScale; - } - - public function setYScale($scale){ - $this->yScale = $scale; - } - - public function getZScale(){ - return $this->zScale; - } - - public function setZScale($scale){ - $this->zScale = $scale; - } - - public function getOctaves(){ - $array = array(); - foreach($this->octaves as $index => $value){ - $array[$index] = clone $value; - } - return $array; - } - - //1D-noise - public function noise1D($x, $frequency, $amplitude, $normalized = false){ - return $this->noise3D($x, 0, 0, $frequency, $amplitude, $normalized); - } - - //2D-noise - public function noise2D($x, $y, $frequency, $amplitude, $normalized = false){ - return $this->noise3D($x, $y, 0, $frequency, $amplitude, $normalized); - } - - //3D-noise - public function noise3D($x, $y, $z, $frequency, $amplitude, $normalized = false){ - $result = 0; - $amp = 1; - $freq = 1; - $max = 0; - - $x *= $this->xScale; - $y *= $this->yScale; - $z *= $this->zScale; - - foreach($this->octaves as $noiseGenerator){ - $result += $octave->noise($x * $freq, $y * $freq, $z * $freq) * $amp; - $max += $amp; - $freq *= $frequency; - $amp *= $amplitude; - } - if($normalized === true){ - $result /= $max; - } - - return $result; - } - - /*public function generateNoiseOctaves($x, $y, $z, $frequency, $amplitude){ - - }*/ -} \ No newline at end of file diff --git a/src/world/generator/noise/PerlinOctaveGenerator.php b/src/world/generator/noise/PerlinOctaveGenerator.php deleted file mode 100644 index 53a79884..00000000 --- a/src/world/generator/noise/PerlinOctaveGenerator.php +++ /dev/null @@ -1,63 +0,0 @@ -octaves = array(); - for($o = 0; $o < $octaves; ++$o){ - $this->octaves[$o] = new NoiseGeneratorPerlin($random); - } - } - - /*public function generateNoiseOctaves($x, $y, $z, $sizeX, $sizeY, $sizeZ, $fX, $fY, $fZ){ - $adouble = array_fill(0, $sizeX * $sizeY * $sizeZ, 0.0); - - $d3 = 1.0; - - foreach($this->octaves as $octave){ - $dX = $x * $d3 * $fX; - $dY = $y * $d3 * $fY; - $dZ = $x * $d3 * $fZ; - - $x1 = NoiseGenerator::floor($dX); - $z1 = NoiseGenerator::floor($dZ); - - $dX -= $x1; - $dZ -= $z1; - - $x1 %= 16777216; - $z1 %= 16777216; - //$x1 &= 0xFFFFFF; - //$z1 &= 0xFFFFFF; - - $dX += $x1; - $dZ += $z1; - $octave->populateNoiseArray($adouble, $dX, $dY, $dZ, $sizeX, $sizeY, $sizeZ, $fX * $d3, $fY * $d3, $fZ * $d3, $d3); - $d3 *= 0.5; - } - - return $adouble; - }*/ -} \ No newline at end of file diff --git a/src/world/generator/populator/TallGrassPopulator.php b/src/world/generator/populator/TallGrassPopulator.php deleted file mode 100644 index ba37bf59..00000000 --- a/src/world/generator/populator/TallGrassPopulator.php +++ /dev/null @@ -1,70 +0,0 @@ -randomAmount = $amount; - } - - public function setBaseAmount($amount){ - $this->baseAmount = $amount; - } - - public function populate(Level $level, $chunkX, $chunkZ, Random $random){ - $this->level = $level; - $amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount; - for($i = 0; $i < $amount; ++$i){ - $x = $random->nextRange($chunkX << 4, ($chunkX << 4) + 15); - $z = $random->nextRange($chunkZ << 4, ($chunkZ << 4) + 15); - for($size = 30; $size > 0; --$size){ - $xx = $x - 7 + $random->nextRange(0, 15); - $zz = $z - 7 + $random->nextRange(0, 15); - $yy = $this->getHighestWorkableBlock($xx, $zz); - $vector = new Vector3($xx, $yy, $zz); - if($yy !== -1 and $this->canTallGrassStay($this->level->getBlockRaw($vector))){ - $this->level->setBlockRaw($vector, new TallGrassBlock(1)); - } - } - } - } - - private function canTallGrassStay(Block $block){ - return $block->getID() === AIR and $block->getSide(0)->getID() === GRASS; - } - - private function getHighestWorkableBlock($x, $z){ - for($y = 128; $y > 0; --$y){ - $b = $this->level->getBlockRaw(new Vector3($x, $y, $z)); - if($b->getID() === AIR or $b->getID() === LEAVES){ - if(--$y <= 0){ - return -1; - } - }else{ - break; - } - } - return ++$y; - } -} \ No newline at end of file diff --git a/src/world/generator/populator/TreePopulator.php b/src/world/generator/populator/TreePopulator.php deleted file mode 100644 index 7b6a2be3..00000000 --- a/src/world/generator/populator/TreePopulator.php +++ /dev/null @@ -1,67 +0,0 @@ -randomAmount = $amount; - } - - public function setBaseAmount($amount){ - $this->baseAmount = $amount; - } - - public function populate(Level $level, $chunkX, $chunkZ, Random $random){ - $this->level = $level; - $amount = $random->nextRange(0, $this->randomAmount + 1) + $this->baseAmount; - for($i = 0; $i < $amount; ++$i){ - $x = $random->nextRange($chunkX << 4, ($chunkX << 4) + 15); - $z = $random->nextRange($chunkZ << 4, ($chunkZ << 4) + 15); - $y = $this->getHighestWorkableBlock($x, $z); - if($y === -1){ - continue; - } - if($random->nextFloat() > 0.75){ - $meta = SaplingBlock::BIRCH; - }else{ - $meta = SaplingBlock::OAK; - } - TreeObject::growTree($this->level, new Vector3($x, $y, $z), $random, $meta); - } - } - - private function getHighestWorkableBlock($x, $z){ - for($y = 128; $y > 0; --$y){ - $b = $this->level->getBlockRaw(new Vector3($x, $y, $z)); - if($b->getID() !== DIRT and $b->getID() !== GRASS){ - if(--$y <= 0){ - return -1; - } - }else{ - break; - } - } - return ++$y; - } -} \ No newline at end of file