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

SkyLightUpdate: make heightmap calculation routines pure

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-10-31 23:42:32 +00:00
parent c39a1407a2
commit 817372c55b
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/world/format/HeightArray.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\world\format;
use function array_fill;
use function count;
final class HeightArray{
@ -44,6 +45,10 @@ final class HeightArray{
$this->array = \SplFixedArray::fromArray($values);
}
public static function fill(int $value) : self{
return new self(array_fill(0, 256, $value));
}
private static function idx(int $x, int $z) : int{
if($x < 0 or $x >= 16 or $z < 0 or $z >= 16){
throw new \InvalidArgumentException("x and z must be in the range 0-15");

18
src/world/light/SkyLightUpdate.php
View File

@ -24,11 +24,11 @@ declare(strict_types=1);
namespace pocketmine\world\light;
use pocketmine\world\format\Chunk;
use pocketmine\world\format\HeightArray;
use pocketmine\world\format\LightArray;
use pocketmine\world\utils\SubChunkExplorer;
use pocketmine\world\utils\SubChunkExplorerStatus;
use pocketmine\world\World;
use function array_fill;
use function max;
class SkyLightUpdate extends LightUpdate{
@ -75,6 +75,7 @@ class SkyLightUpdate extends LightUpdate{
if($yPlusOne === $oldHeightMap){ //Block changed directly beneath the heightmap. Check if a block was removed or changed to a different light-filter.
$newHeightMap = self::recalculateHeightMapColumn($chunk, $x & 0x0f, $z & 0x0f, $this->directSkyLightBlockers);
$chunk->setHeightMap($x & 0xf, $z & 0xf, $newHeightMap);
}elseif($yPlusOne > $oldHeightMap){ //Block changed above the heightmap.
if($this->directSkyLightBlockers[$source]){
$chunk->setHeightMap($x & 0xf, $z & 0xf, $yPlusOne);
@ -105,7 +106,8 @@ class SkyLightUpdate extends LightUpdate{
}
$chunk = $this->subChunkExplorer->currentChunk;
self::recalculateHeightMap($chunk, $this->directSkyLightBlockers);
$newHeightMap = self::recalculateHeightMap($chunk, $this->directSkyLightBlockers);
$chunk->setHeightMapArray($newHeightMap->getValues());
//setAndUpdateLight() won't bother propagating from nodes that are already what we want to change them to, so we
//have to avoid filling full light for any subchunk that contains a heightmap Y coordinate
@ -169,16 +171,16 @@ class SkyLightUpdate extends LightUpdate{
* @param \SplFixedArray|bool[] $directSkyLightBlockers
* @phpstan-param \SplFixedArray<bool> $directSkyLightBlockers
*/
private static function recalculateHeightMap(Chunk $chunk, \SplFixedArray $directSkyLightBlockers) : void{
private static function recalculateHeightMap(Chunk $chunk, \SplFixedArray $directSkyLightBlockers) : HeightArray{
$maxSubChunkY = $chunk->getSubChunks()->count() - 1;
for(; $maxSubChunkY >= 0; $maxSubChunkY--){
if(!$chunk->getSubChunk($maxSubChunkY)->isEmptyFast()){
break;
}
}
$result = HeightArray::fill(0);
if($maxSubChunkY === -1){ //whole column is definitely empty
$chunk->setHeightMapArray(array_fill(0, 256, 0));
return;
return $result;
}
for($z = 0; $z < 16; ++$z){
@ -193,17 +195,18 @@ class SkyLightUpdate extends LightUpdate{
}
if($y === null){ //no blocks in the column
$chunk->setHeightMap($x, $z, 0);
$result->set($x, $z, 0);
}else{
for(; $y >= 0; --$y){
if($directSkyLightBlockers[$chunk->getFullBlock($x, $y, $z)]){
$chunk->setHeightMap($x, $z, $y + 1);
$result->set($x, $z, $y + 1);
break;
}
}
}
}
}
return $result;
}
/**
@ -224,7 +227,6 @@ class SkyLightUpdate extends LightUpdate{
}
}
$chunk->setHeightMap($x, $z, $y + 1);
return $y + 1;
}
}