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

Math: Added RayTraceResult, removed dependence on MovingObjectPosition

Browse Source 
MOP doesn't make any sense anyway.

RayTraceResult is a container which represents the point at which a line hits a bounding box. No dependence on blocks or entities is wanted or needed.
MovingObjectPosition has API changes to allow it to wrap RayTraceResult, but nothing uses MOP anymore anyway.

This would allow modularisation of the pocketmine\\math namespace.
This commit is contained in:
Dylan K. Taylor
2018-01-12 14:28:41 +00:00
parent fe4b5498e6
commit 45b02d92d4
5 changed files with 109 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/pocketmine/level/MovingObjectPosition.php
View File

@ -23,70 +23,53 @@ declare(strict_types=1);
namespace pocketmine\level;
use pocketmine\block\Block;
use pocketmine\entity\Entity;
use pocketmine\math\Vector3;
use pocketmine\math\RayTraceResult;
class MovingObjectPosition{
public const TYPE_BLOCK_COLLISION = 0;
public const TYPE_ENTITY_COLLISION = 1;
/** @var RayTraceResult */
public $hitResult;
/** @var int */
public $typeOfHit;
/** @var int|null */
public $blockX;
/** @var int|null */
public $blockY;
/** @var int|null */
public $blockZ;
/**
* @var int|null
* Which side was hit. If its -1 then it went the full length of the ray trace.
* -1 or one of the Vector3::SIDE_* constants
*/
public $sideHit;
/** @var Vector3 */
public $hitVector;
/** @var Entity|null */
public $entityHit = null;
/** @var Block|null */
public $blockHit = null;
protected function __construct(){
protected function __construct(int $hitType, RayTraceResult $hitResult){
$this->typeOfHit = $hitType;
$this->hitResult = $hitResult;
}
/**
* @param int $x
* @param int $y
* @param int $z
* @param int $side
* @param Vector3 $hitVector
* @param Block $block
* @param RayTraceResult $result
*
* @return MovingObjectPosition
*/
public static function fromBlock(int $x, int $y, int $z, int $side, Vector3 $hitVector) : MovingObjectPosition{
$ob = new MovingObjectPosition;
$ob->typeOfHit = self::TYPE_BLOCK_COLLISION;
$ob->blockX = $x;
$ob->blockY = $y;
$ob->blockZ = $z;
$ob->sideHit = $side;
$ob->hitVector = $hitVector->asVector3();
public static function fromBlock(Block $block, RayTraceResult $result) : MovingObjectPosition{
$ob = new MovingObjectPosition(self::TYPE_BLOCK_COLLISION, $result);
$ob->blockHit = $block;
return $ob;
}
/**
* @param Entity $entity
* @param Entity $entity
*
* @param RayTraceResult $result
*
* @return MovingObjectPosition
*/
public static function fromEntity(Entity $entity) : MovingObjectPosition{
$ob = new MovingObjectPosition;
$ob->typeOfHit = self::TYPE_ENTITY_COLLISION;
public static function fromEntity(Entity $entity, RayTraceResult $result) : MovingObjectPosition{
$ob = new MovingObjectPosition(self::TYPE_ENTITY_COLLISION, $result);
$ob->entityHit = $entity;
$ob->hitVector = $entity->asVector3();
return $ob;
}
}