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

Add dynamic shape property for stairs

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-11-23 16:14:39 +00:00
parent 1170b66fd5
commit d426d18b77
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/pocketmine/block/Stair.php
View File

@ -31,10 +31,18 @@ use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
abstract class Stair extends Transparent{ abstract class Stair extends Transparent{
private const SHAPE_STRAIGHT = "straight";
private const SHAPE_INNER_LEFT = "inner_left";
private const SHAPE_INNER_RIGHT = "inner_right";
private const SHAPE_OUTER_LEFT = "outer_left";
private const SHAPE_OUTER_RIGHT = "outer_right";
/** @var int */ /** @var int */
protected $facing = Facing::NORTH; protected $facing = Facing::NORTH;
/** @var bool */ /** @var bool */
protected $upsideDown = false; protected $upsideDown = false;
/** @var string */
protected $shape = self::SHAPE_STRAIGHT;
protected function writeStateToMeta() : int{ protected function writeStateToMeta() : int{
return (5 - $this->facing) | ($this->upsideDown ? 0x04 : 0); return (5 - $this->facing) | ($this->upsideDown ? 0x04 : 0);
@ -49,6 +57,19 @@ abstract class Stair extends Transparent{
return 0b111; return 0b111;
} }
public function readStateFromWorld() : void{
parent::readStateFromWorld();
$clockwise = Facing::rotate($this->facing, Facing::AXIS_Y, true);
if(($backFacing = $this->getPossibleCornerFacing(false)) !== null){
$this->shape = $backFacing === $clockwise ? self::SHAPE_OUTER_RIGHT : self::SHAPE_OUTER_LEFT;
}elseif(($frontFacing = $this->getPossibleCornerFacing(true)) !== null){
$this->shape = $frontFacing === $clockwise ? self::SHAPE_INNER_RIGHT : self::SHAPE_INNER_LEFT;
}else{
$this->shape = self::SHAPE_STRAIGHT;
}
}
protected function recalculateCollisionBoxes() : array{ protected function recalculateCollisionBoxes() : array{
$minYSlab = $this->upsideDown ? 0.5 : 0; $minYSlab = $this->upsideDown ? 0.5 : 0;
@ -61,15 +82,14 @@ abstract class Stair extends Transparent{
$topStep = new AxisAlignedBB(0, $minY, 0, 1, $minY + 0.5, 1); $topStep = new AxisAlignedBB(0, $minY, 0, 1, $minY + 0.5, 1);
$topStep->trim(Facing::opposite($this->facing), 0.5); $topStep->trim(Facing::opposite($this->facing), 0.5);
/** @var Stair $corner */ if($this->shape === self::SHAPE_OUTER_LEFT or $this->shape === self::SHAPE_OUTER_RIGHT){
if(($backFacing = $this->getPossibleCornerFacing(false)) !== null){ $topStep->trim(Facing::rotate($this->facing, Facing::AXIS_Y, $this->shape === self::SHAPE_OUTER_LEFT), 0.5);
$topStep->trim(Facing::opposite($backFacing), 0.5); }elseif($this->shape === self::SHAPE_INNER_LEFT or $this->shape === self::SHAPE_INNER_RIGHT){
}elseif(($frontFacing = $this->getPossibleCornerFacing(true)) !== null){
//add an extra cube //add an extra cube
$extraCube = new AxisAlignedBB(0, $minY, 0, 1, $minY + 0.5, 1); $extraCube = new AxisAlignedBB(0, $minY, 0, 1, $minY + 0.5, 1);
$bbs[] = $extraCube $bbs[] = $extraCube
->trim($this->facing, 0.5) ->trim($this->facing, 0.5) //avoid overlapping with main step
->trim(Facing::opposite($frontFacing), 0.5); ->trim(Facing::rotate($this->facing, Facing::AXIS_Y, $this->shape === self::SHAPE_INNER_LEFT), 0.5);
} }
$bbs[] = $topStep; $bbs[] = $topStep;
@ -79,13 +99,11 @@ abstract class Stair extends Transparent{
private function getPossibleCornerFacing(bool $oppositeFacing) : ?int{ private function getPossibleCornerFacing(bool $oppositeFacing) : ?int{
$side = $this->getSide($oppositeFacing ? Facing::opposite($this->facing) : $this->facing); $side = $this->getSide($oppositeFacing ? Facing::opposite($this->facing) : $this->facing);
if($side instanceof Stair and $side->upsideDown === $this->upsideDown and ( return (
$side->facing === Facing::rotate($this->facing, Facing::AXIS_Y, true) or $side instanceof Stair and
$side->facing === Facing::rotate($this->facing, Facing::AXIS_Y, false)) $side->upsideDown === $this->upsideDown and
){ Facing::axis($side->facing) !== Facing::axis($this->facing) //perpendicular
return $side->facing; ) ? $side->facing : null;
}
return null;
} }
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{ public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{