mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-28 06:09:57 +00:00
Code Issues Projects Releases Wiki Activity

Improved Normal generator speed

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-12-28 02:12:48 +01:00
parent 346626305c
commit ab72c32769
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
1 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/pocketmine/level/generator/Normal.php
View File

@ -50,8 +50,6 @@ class Normal extends Generator{
private $worldHeight = 65; private $worldHeight = 65;
private $waterHeight = 63; private $waterHeight = 63;
private $noiseHills; private $noiseHills;
private $noisePatches;
private $noisePatchesSmall;
private $noiseBase; private $noiseBase;
public function __construct(array $options = []){ public function __construct(array $options = []){
@ -70,10 +68,8 @@ class Normal extends Generator{
$this->level = $level; $this->level = $level;
$this->random = $random; $this->random = $random;
$this->random->setSeed($this->level->getSeed()); $this->random->setSeed($this->level->getSeed());
$this->noiseHills = new Simplex($this->random, 3, 0.11, 12); $this->noiseHills = new Simplex($this->random, 3, 0.1, 12);
$this->noisePatches = new Simplex($this->random, 2, 0.03, 16); $this->noiseBase = new Simplex($this->random, 16, 0.6, 16);
$this->noisePatchesSmall = new Simplex($this->random, 2, 0.5, 4);
$this->noiseBase = new Simplex($this->random, 16, 0.7, 16);
$ores = new Ore(); $ores = new Ore();
@ -90,8 +86,8 @@ class Normal extends Generator{
$this->populators[] = $ores; $this->populators[] = $ores;
$trees = new Tree(); $trees = new Tree();
$trees->setBaseAmount(3); $trees->setBaseAmount(1);
$trees->setRandomAmount(0); $trees->setRandomAmount(1);
$this->populators[] = $trees; $this->populators[] = $trees;
$tallGrass = new TallGrass(); $tallGrass = new TallGrass();
@ -103,15 +99,11 @@ class Normal extends Generator{
public function generateChunk($chunkX, $chunkZ){ public function generateChunk($chunkX, $chunkZ){
$this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed()); $this->random->setSeed(0xdeadbeef ^ ($chunkX << 8) ^ $chunkZ ^ $this->level->getSeed());
$hills = []; $hills = [];
$patches = [];
$patchesSmall = [];
$base = []; $base = [];
for($z = 0; $z < 16; ++$z){ for($z = 0; $z < 16; ++$z){
for($x = 0; $x < 16; ++$x){ for($x = 0; $x < 16; ++$x){
$i = ($z << 4) + $x; $i = ($z << 4) + $x;
$hills[$i] = $this->noiseHills->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), true); $hills[$i] = $this->noiseHills->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), true);
$patches[$i] = $this->noisePatches->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), true);
$patchesSmall[$i] = $this->noisePatchesSmall->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), true);
$base[$i] = $this->noiseBase->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), true); $base[$i] = $this->noiseBase->noise2D($x + ($chunkX << 4), $z + ($chunkZ << 4), true);
if($base[$i] < 0){ if($base[$i] < 0){
@ -138,35 +130,17 @@ class Normal extends Generator{
}elseif($diff > 2){ }elseif($diff > 2){
$chunk->setBlockId($x, $y, $z, Block::STONE); $chunk->setBlockId($x, $y, $z, Block::STONE);
}elseif($diff > 0){ }elseif($diff > 0){
if($patches[$i] > 0.7){ $chunk->setBlockId($x, $y, $z, Block::DIRT);
$chunk->setBlockId($x, $y, $z, Block::STONE);
}elseif($patches[$i] < -0.8){
$chunk->setBlockId($x, $y, $z, Block::GRAVEL);
}else{
$chunk->setBlockId($x, $y, $z, Block::DIRT);
}
}elseif($y <= $this->waterHeight){ }elseif($y <= $this->waterHeight){
if(($this->waterHeight - $y) <= 1 and $diff === 0){ if(($this->waterHeight - $y) <= 1 and $diff === 0){
$chunk->setBlockId($x, $y, $z, Block::SAND); $chunk->setBlockId($x, $y, $z, Block::SAND);
}elseif($diff === 0){ }elseif($diff === 0){
if($patchesSmall[$i] > 0.3){ $chunk->setBlockId($x, $y, $z, Block::DIRT);
$chunk->setBlockId($x, $y, $z, Block::GRAVEL);
}elseif($patchesSmall[$i] < -0.45){
$chunk->setBlockId($x, $y, $z, Block::SAND);
}else{
$chunk->setBlockId($x, $y, $z, Block::DIRT);
}
}else{ }else{
$chunk->setBlockId($x, $y, $z, Block::STILL_WATER); $chunk->setBlockId($x, $y, $z, Block::STILL_WATER);
} }
}elseif($diff === 0){ }elseif($diff === 0){
if($patches[$i] > 0.7){ $chunk->setBlockId($x, $y, $z, Block::GRASS);
$chunk->setBlockId($x, $y, $z, Block::STONE);
}elseif($patches[$i] < -0.8){
$chunk->setBlockId($x, $y, $z, Block::GRAVEL);
}else{
$chunk->setBlockId($x, $y, $z, Block::GRASS);
}
} }
} }