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

Added basic support for blocks with multiple AABBs, fixed stairs (#1303)

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-10-12 16:29:24 +01:00
committed by GitHub
parent 0c092a7ceb
commit 15d6fd86e2
5 changed files with 127 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/pocketmine/block/Block.php
View File

@ -69,6 +69,10 @@ class Block extends Position implements BlockIds, Metadatable{
/** @var AxisAlignedBB */
public $boundingBox = null;
/** @var AxisAlignedBB[]|null */
protected $collisionBoxes = null;
/**
* @param int $id The block type's ID, 0-255
* @param int $meta Meta value of the block type
@ -489,9 +493,15 @@ class Block extends Position implements BlockIds, Metadatable{
* @return bool
*/
public function collidesWithBB(AxisAlignedBB $bb) : bool{
$bb2 = $this->getBoundingBox();
$bbs = $this->getCollisionBoxes();
return $bb2 !== null and $bb->intersectsWith($bb2);
foreach($bbs as $bb2){
if($bb->intersectsWith($bb2)){
return true;
}
}
return false;
}
/**
@ -501,6 +511,28 @@ class Block extends Position implements BlockIds, Metadatable{
}
/**
* @return AxisAlignedBB[]
*/
public function getCollisionBoxes() : array{
if($this->collisionBoxes === null){
$this->collisionBoxes = $this->recalculateCollisionBoxes();
}
return $this->collisionBoxes;
}
/**
* @return AxisAlignedBB[]
*/
protected function recalculateCollisionBoxes() : array{
if($bb = $this->recalculateBoundingBox()){
return [$bb];
}
return [];
}
/**
* @return AxisAlignedBB|null
*/
@ -532,19 +564,36 @@ class Block extends Position implements BlockIds, Metadatable{
* @return MovingObjectPosition|null
*/
public function calculateIntercept(Vector3 $pos1, Vector3 $pos2) : ?MovingObjectPosition{
$bb = $this->getBoundingBox();
if($bb === null){
$bbs = $this->getCollisionBoxes();
if(empty($bbs)){
return null;
}
$result = $bb->calculateIntercept($pos1, $pos2);
if($result !== null){
$result->blockX = $this->x;
$result->blockY = $this->y;
$result->blockZ = $this->z;
/** @var MovingObjectPosition|null $currentHit */
$currentHit = null;
/** @var int|float $currentDistance */
$currentDistance = PHP_INT_MAX;
foreach($bbs as $bb){
$nextHit = $bb->calculateIntercept($pos1, $pos2);
if($nextHit === null){
continue;
}
$nextDistance = $nextHit->hitVector->distanceSquared($pos1);
if($nextDistance < $currentDistance){
$currentHit = $nextHit;
$currentDistance = $nextDistance;
}
}
return $result;
if($currentHit !== null){
$currentHit->blockX = $this->x;
$currentHit->blockY = $this->y;
$currentHit->blockZ = $this->z;
}
return $currentHit;
}
public function setMetadata(string $metadataKey, MetadataValue $newMetadataValue){