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

Painting: reduce complexity of getPaintingBB()

Browse Source 
this makes it easier to unit-test.
This commit is contained in:
Dylan K. Taylor 2019-05-12 16:15:31 +01:00
parent adf4639625
commit a19651a8dc
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/entity/object/Painting.php
View File

@ -114,7 +114,8 @@ class Painting extends Entity{
protected function recalculateBoundingBox() : void{ protected function recalculateBoundingBox() : void{
$facing = Bearing::toFacing($this->direction); $facing = Bearing::toFacing($this->direction);
$this->boundingBox->setBB(self::getPaintingBB($this->blockIn->getSide($facing), $facing, $this->getMotive())); $side = $this->blockIn->getSide($facing);
$this->boundingBox->setBB(self::getPaintingBB($facing, $this->getMotive())->offset($side->x, $side->y, $side->z));
} }
public function onNearbyBlockChange() : void{ public function onNearbyBlockChange() : void{
@ -165,27 +166,24 @@ class Painting extends Entity{
/** /**
* Returns the bounding-box a painting with the specified motive would have at the given position and direction. * Returns the bounding-box a painting with the specified motive would have at the given position and direction.
* *
* @param Vector3 $blockIn
* @param int $facing * @param int $facing
* @param PaintingMotive $motive * @param PaintingMotive $motive
* *
* @return AxisAlignedBB * @return AxisAlignedBB
*/ */
private static function getPaintingBB(Vector3 $blockIn, int $facing, PaintingMotive $motive) : AxisAlignedBB{ private static function getPaintingBB(int $facing, PaintingMotive $motive) : AxisAlignedBB{
$width = $motive->getWidth(); $width = $motive->getWidth();
$height = $motive->getHeight(); $height = $motive->getHeight();
$horizontalStart = (int) (ceil($width / 2) - 1); $horizontalStart = (int) (ceil($width / 2) - 1);
$verticalStart = (int) (ceil($height / 2) - 1); $verticalStart = (int) (ceil($height / 2) - 1);
$bb = AxisAlignedBB::one() return AxisAlignedBB::one()
->trim($facing, 15 / 16) ->trim($facing, 15 / 16)
->extend(Facing::rotateY($facing, true), $horizontalStart) ->extend(Facing::rotateY($facing, true), $horizontalStart)
->extend(Facing::rotateY($facing, false), -$horizontalStart + $width - 1) ->extend(Facing::rotateY($facing, false), -$horizontalStart + $width - 1)
->extend(Facing::DOWN, $verticalStart) ->extend(Facing::DOWN, $verticalStart)
->extend(Facing::UP, -$verticalStart + $height - 1); ->extend(Facing::UP, -$verticalStart + $height - 1);
return $bb->offset($blockIn->x, $blockIn->y, $blockIn->z);
} }
/** /**
@ -224,7 +222,7 @@ class Painting extends Entity{
} }
if($checkOverlap){ if($checkOverlap){
$bb = self::getPaintingBB($blockIn, $facing, $motive); $bb = self::getPaintingBB($facing, $motive)->offset($blockIn->x, $blockIn->y, $blockIn->z);
foreach($world->getNearbyEntities($bb) as $entity){ foreach($world->getNearbyEntities($bb) as $entity){
if($entity instanceof self){ if($entity instanceof self){