mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-13 17:29:44 +00:00
Code Issues Projects Releases Wiki Activity

Improved biomes

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-03-23 08:02:18 +01:00
parent 9da26fdb88
commit a6b8170d9c
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pocketmine/level/generator/normal/Normal.php
View File

@ -79,8 +79,6 @@ class Normal extends Generator{
private static function generateKernel(){ private static function generateKernel(){
self::$GAUSSIAN_KERNEL = []; self::$GAUSSIAN_KERNEL = [];
$bellSize = 1 / self::$SMOOTH_SIZE;
$bellHeight = 2 * self::$SMOOTH_SIZE;
for($sx = -self::$SMOOTH_SIZE; $sx <= self::$SMOOTH_SIZE; ++$sx){ for($sx = -self::$SMOOTH_SIZE; $sx <= self::$SMOOTH_SIZE; ++$sx){
for($sz = -self::$SMOOTH_SIZE; $sz <= self::$SMOOTH_SIZE; ++$sz){ for($sz = -self::$SMOOTH_SIZE; $sz <= self::$SMOOTH_SIZE; ++$sz){
self::$GAUSSIAN_KERNEL[$sx + self::$SMOOTH_SIZE][$sz + self::$SMOOTH_SIZE] = 10 / sqrt($sx ** 2 + $sz ** 2 + 0.2); self::$GAUSSIAN_KERNEL[$sx + self::$SMOOTH_SIZE][$sz + self::$SMOOTH_SIZE] = 10 / sqrt($sx ** 2 + $sz ** 2 + 0.2);
@ -100,7 +98,7 @@ 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->noiseBase = new Simplex($this->random, 16, 0.02, 0.5, 2); $this->noiseBase = new Simplex($this->random, 16, 0.015, 0.5, 2);
$this->random->setSeed($this->level->getSeed()); $this->random->setSeed($this->level->getSeed());
$this->selector = new BiomeSelector($this->random, function($temperature, $rainfall){ $this->selector = new BiomeSelector($this->random, function($temperature, $rainfall){
$rainfall *= $temperature; $rainfall *= $temperature;
@ -110,19 +108,27 @@ class Normal extends Generator{
if($temperature < 0.50){ if($temperature < 0.50){
return Biome::ICE_PLAINS; return Biome::ICE_PLAINS;
}elseif($temperature < 0.95){ }elseif($temperature < 0.95){
return Biome::SMALL_MOUNTAINS; return Biome::PLAINS;
}else{ }else{
return Biome::DESERT; return Biome::DESERT;
} }
}elseif($rainfall > 0.5 and $temperature < 0.7){ }elseif($rainfall > 0.5 and $temperature < 0.7){
return Biome::SWAMP; if($rainfall < 0.7){
return Biome::OCEAN;
}elseif($rainfall < 0.85){
return Biome::RIVER;
}else{
return Biome::SWAMP;
}
}elseif($temperature < 0.50){ }elseif($temperature < 0.50){
return Biome::TAIGA; return Biome::TAIGA;
}elseif($temperature < 0.97){ }elseif($temperature < 0.97){
if($rainfall < 0.35){ if($rainfall < 0.25){
return Biome::MOUNTAINS; return Biome::MOUNTAINS;
}else { }elseif($rainfall < 0.35){
return Biome::RIVER; return Biome::SMALL_MOUNTAINS;
}else{
return Biome::PLAINS;
} }
}else{ }else{
if($rainfall < 0.45){ if($rainfall < 0.45){
@ -190,9 +196,12 @@ class Normal extends Generator{
if($sx === 0 and $sz === 0){ if($sx === 0 and $sz === 0){
continue; continue;
}else{ }else{
$adjacent = $this->selector->pickBiome($chunkX * 16 + $x + $sx * 8, $chunkZ * 16 + $z + $sz * 8); $adjacent = $this->selector->pickBiome(($chunkX + $sx) * 16 + $x, ($chunkZ + $sz) * 16 + $z);
}
$weight = self::$GAUSSIAN_KERNEL[$sx + self::$SMOOTH_SIZE][$sz + self::$SMOOTH_SIZE] / ($biome->getMaxElevation() / 128 + 2);
if($adjacent->getMaxElevation() > $biome->getMaxElevation()){
$weight /= 2;
} }
$weight = self::$GAUSSIAN_KERNEL[$sx + self::$SMOOTH_SIZE][$sz + self::$SMOOTH_SIZE];
$minSum += $adjacent->getMinElevation() * $weight; $minSum += $adjacent->getMinElevation() * $weight;
$maxSum += $adjacent->getMaxElevation() * $weight; $maxSum += $adjacent->getMaxElevation() * $weight;
$weightSum += $weight; $weightSum += $weight;