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

Move heightmap calculation logic to SkyLightUpdate

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-10-31 23:34:04 +00:00
parent 59a3e8c096
commit c39a1407a2
3 changed files with 72 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/world/format/Chunk.php
View File

@ -195,71 +195,6 @@ class Chunk{
$this->heightMap->set($x, $z, $value);
}
/**
* Recalculates the heightmap for the whole chunk.
*
* @param \SplFixedArray|bool[] $directSkyLightBlockers
* @phpstan-param \SplFixedArray<bool> $directSkyLightBlockers
*/
public function recalculateHeightMap(\SplFixedArray $directSkyLightBlockers) : void{
$maxSubChunkY = $this->subChunks->count() - 1;
for(; $maxSubChunkY >= 0; $maxSubChunkY--){
if(!$this->getSubChunk($maxSubChunkY)->isEmptyFast()){
break;
}
}
if($maxSubChunkY === -1){ //whole column is definitely empty
$this->setHeightMapArray(array_fill(0, 256, 0));
return;
}
for($z = 0; $z < 16; ++$z){
for($x = 0; $x < 16; ++$x){
$y = null;
for($subChunkY = $maxSubChunkY; $subChunkY >= 0; $subChunkY--){
$subHighestBlockY = $this->getSubChunk($subChunkY)->getHighestBlockAt($x, $z);
if($subHighestBlockY !== -1){
$y = ($subChunkY * 16) + $subHighestBlockY;
break;
}
}
if($y === null){ //no blocks in the column
$this->setHeightMap($x, $z, 0);
}else{
for(; $y >= 0; --$y){
if($directSkyLightBlockers[$this->getFullBlock($x, $y, $z)]){
$this->setHeightMap($x, $z, $y + 1);
break;
}
}
}
}
}
}
/**
* Recalculates the heightmap for the block column at the specified X/Z chunk coordinates
*
* @param int $x 0-15
* @param int $z 0-15
* @param \SplFixedArray|bool[] $directSkyLightBlockers
* @phpstan-param \SplFixedArray<bool> $directSkyLightBlockers
*
* @return int New calculated heightmap value (0-256 inclusive)
*/
public function recalculateHeightMapColumn(int $x, int $z, \SplFixedArray $directSkyLightBlockers) : int{
$y = $this->getHighestBlockAt($x, $z);
for(; $y >= 0; --$y){
if($directSkyLightBlockers[$this->getFullBlock($x, $y, $z)]){
break;
}
}
$this->setHeightMap($x, $z, $y + 1);
return $y + 1;
}
/**
* Returns the biome ID at the specified X/Z chunk block coordinates
*