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

Chunk: clean up internals that were designed for variable subchunk stack size

Browse Source 
this exposed a few bugs in lighting updates too.
This commit is contained in:
Dylan K. Taylor 2019-10-23 18:25:42 +01:00
parent 508c53b53a
commit f71eecfe56
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,7 +216,7 @@ class Chunk{
* @param int $level * @param int $level
*/ */
public function setAllBlockSkyLight(int $level) : void{ public function setAllBlockSkyLight(int $level) : void{
for($y = $this->getHighestSubChunkIndex(); $y >= 0; --$y){ for($y = $this->subChunks->count() - 1; $y >= 0; --$y){
$this->getSubChunk($y)->setBlockSkyLightArray(LightArray::fill($level)); $this->getSubChunk($y)->setBlockSkyLightArray(LightArray::fill($level));
} }
} }
@ -250,7 +250,7 @@ class Chunk{
* @param int $level * @param int $level
*/ */
public function setAllBlockLight(int $level) : void{ public function setAllBlockLight(int $level) : void{
for($y = $this->getHighestSubChunkIndex(); $y >= 0; --$y){ for($y = $this->subChunks->count() - 1; $y >= 0; --$y){
$this->getSubChunk($y)->setBlockLightArray(LightArray::fill($level)); $this->getSubChunk($y)->setBlockLightArray(LightArray::fill($level));
} }
} }
@ -264,12 +264,7 @@ class Chunk{
* @return int 0-255, or -1 if there are no blocks in the column * @return int 0-255, or -1 if there are no blocks in the column
*/ */
public function getHighestBlockAt(int $x, int $z) : int{ public function getHighestBlockAt(int $x, int $z) : int{
$index = $this->getHighestSubChunkIndex(); for($y = $this->subChunks->count() - 1; $y >= 0; --$y){
if($index === -1){
return -1;
}
for($y = $index; $y >= 0; --$y){
$height = $this->getSubChunk($y)->getHighestBlockAt($x, $z) | ($y << 4); $height = $this->getSubChunk($y)->getHighestBlockAt($x, $z) | ($y << 4);
if($height !== -1){ if($height !== -1){
return $height; return $height;
@ -279,10 +274,6 @@ class Chunk{
return -1; return -1;
} }
public function getMaxY() : int{
return ($this->getHighestSubChunkIndex() << 4) | 0x0f;
}
/** /**
* Returns the heightmap value at the specified X/Z chunk block coordinates * Returns the heightmap value at the specified X/Z chunk block coordinates
* *
@ -345,15 +336,13 @@ class Chunk{
* TODO: fast adjacent light spread * TODO: fast adjacent light spread
*/ */
public function populateSkyLight() : void{ public function populateSkyLight() : void{
$maxY = $this->getMaxY();
$this->setAllBlockSkyLight(0); $this->setAllBlockSkyLight(0);
for($x = 0; $x < 16; ++$x){ for($x = 0; $x < 16; ++$x){
for($z = 0; $z < 16; ++$z){ for($z = 0; $z < 16; ++$z){
$heightMap = $this->getHeightMap($x, $z); $heightMap = $this->getHeightMap($x, $z);
for($y = $maxY; $y >= $heightMap; --$y){ for($y = ($this->subChunks->count() * 16) - 1; $y >= $heightMap; --$y){
$this->setBlockSkyLight($x, $y, $z, 15); $this->setBlockSkyLight($x, $y, $z, 15);
} }
@ -693,29 +682,20 @@ class Chunk{
return $this->subChunks; return $this->subChunks;
} }
/**
* Returns the Y coordinate of the highest non-empty subchunk in this chunk.
*
* @return int
*/
public function getHighestSubChunkIndex() : int{
for($y = $this->subChunks->count() - 1; $y >= 0; --$y){
if($this->subChunks[$y]->isEmptyFast()){
continue;
}
break;
}
return $y;
}
/** /**
* Returns the count of subchunks that need sending to players * Returns the count of subchunks that need sending to players
* *
* @return int * @return int
*/ */
public function getSubChunkSendCount() : int{ public function getSubChunkSendCount() : int{
return $this->getHighestSubChunkIndex() + 1; for($count = $this->subChunks->count(); $count > 0; --$count){
if($this->subChunks[$count - 1]->isEmptyFast()){
continue;
}
break;
}
return $count;
} }
/** /**