From 3510e9092678e13112e38ece906c526e34ae6f7f Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sat, 1 Jul 2023 22:08:03 +0300 Subject: [PATCH] small tweaks --- src/pmf/PMFLevel.php | 5 ++++- src/world/generator/ExperimentalGenerator.php | 9 ++++++--- src/world/generator/noise/NoiseGeneratorPerlin.php | 6 +++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/pmf/PMFLevel.php b/src/pmf/PMFLevel.php index f22995c8..d8a92c44 100644 --- a/src/pmf/PMFLevel.php +++ b/src/pmf/PMFLevel.php @@ -12,6 +12,8 @@ class PMFLevel extends PMF{ private $chunks = []; private $chunkChange = []; public $chunkInfo = []; + public $placeBlocksOnNextGen = []; + public function __construct($file, $blank = false){ if(is_array($blank)){ $this->create($file, 0); @@ -600,7 +602,8 @@ class PMFLevel extends PMF{ if($this->loadChunk($X, $Z) === false){ return false; } - }elseif($this->chunks[$index][$Y] === false){ + } + if($this->chunks[$index][$Y] === false){ $this->fillMiniChunk($X, $Z, $Y); } $aX = $x - ($X << 4); diff --git a/src/world/generator/ExperimentalGenerator.php b/src/world/generator/ExperimentalGenerator.php index d2c44383..8a25efb3 100644 --- a/src/world/generator/ExperimentalGenerator.php +++ b/src/world/generator/ExperimentalGenerator.php @@ -103,10 +103,11 @@ class ExperimentalGenerator implements NewLevelGenerator{ public function generateChunk($chunkX, $chunkZ){ $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->level->getSeed()); + $noiseArray = ExperimentalGenerator::getFastNoise3D($this->noiseBase, 16, 128, 16, 4, 8, 4, $chunkX * 16, 0, $chunkZ * 16); $biomeCache = []; - + $t = microtime(true); for($chunkY = 0; $chunkY < 8; ++$chunkY){ $chunk = ""; $startY = $chunkY << 4; @@ -171,6 +172,7 @@ class ExperimentalGenerator implements NewLevelGenerator{ $this->level->setMiniChunk($chunkX, $chunkZ, $chunkY, $chunk); } + foreach($this->genPopulators as $pop){ $pop->populate($this->level, $chunkX, $chunkZ, $this->random); } @@ -196,7 +198,7 @@ class ExperimentalGenerator implements NewLevelGenerator{ for($xx = 0; $xx < $xSize; ++$xx){ for($zz = 0; $zz < $zSize; ++$zz){ for($yy = 0; $yy < $ySize; ++$yy){ - if($xx % $xSamplingRate !== 0 or $zz % $zSamplingRate !== 0 or $yy % $ySamplingRate !== 0){ + if($xx % $xSamplingRate != 0 or $zz % $zSamplingRate != 0 or $yy % $ySamplingRate != 0){ $nx = (int) ($xx / $xSamplingRate) * $xSamplingRate; $ny = (int) ($yy / $ySamplingRate) * $ySamplingRate; $nz = (int) ($zz / $zSamplingRate) * $zSamplingRate; @@ -215,7 +217,8 @@ class ExperimentalGenerator implements NewLevelGenerator{ $dy1 * ($dx1 * $noiseArray[$nx][$nz][$ny] + $dx2 * $noiseArray[$nnx][$nz][$ny]) + $dy2 * ($dx1 * $noiseArray[$nx][$nz][$nny] + $dx2 * $noiseArray[$nnx][$nz][$nny]) ) + - (($zz - $nz) / ($nnz - $nz)) * ( + (($zz - $nz) / ($nnz - $nz)) * + ( $dy1 * ($dx1 * $noiseArray[$nx][$nnz][$ny] + $dx2 * $noiseArray[$nnx][$nnz][$ny]) + $dy2 * ($dx1 * $noiseArray[$nx][$nnz][$nny] + $dx2 * $noiseArray[$nnx][$nnz][$nny]) ); diff --git a/src/world/generator/noise/NoiseGeneratorPerlin.php b/src/world/generator/noise/NoiseGeneratorPerlin.php index bc42330b..c4e8d770 100644 --- a/src/world/generator/noise/NoiseGeneratorPerlin.php +++ b/src/world/generator/noise/NoiseGeneratorPerlin.php @@ -74,9 +74,9 @@ class NoiseGeneratorPerlin extends NoiseGenerator{ $z -= $floorZ; //Fade curves - $fX = self::fade($x); - $fY = self::fade($y); - $fZ = self::fade($z); + $fX = $x * $x * $x * ($x * ($x * 6 - 15) + 10); + $fY = $y * $y * $y * ($y * ($y * 6 - 15) + 10); + $fZ = $z * $z * $z * ($z * ($z * 6 - 15) + 10); //Cube corners $A = $this->perm[$X] + $Y;