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

Fixed entity physics

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-08-28 18:26:37 +02:00
parent eab86f5f90
commit 9fb46d8fe8
3 changed files with 202 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/pocketmine/math/AxisAlignedBB.php
View File

@ -75,7 +75,7 @@ class AxisAlignedBB{
return $this;
}
public function expand($x, $y, $z){
public function grow($x, $y, $z){
$vec = clone $this;
$vec->minX -= $x;
$vec->minY -= $y;
@ -87,19 +87,29 @@ class AxisAlignedBB{
return $vec;
}
public function offset($x, $y, $z){
$vec = clone $this;
$vec->minX += $x;
$vec->minY += $y;
$vec->minZ += $z;
$vec->maxX += $x;
$vec->maxY += $y;
$vec->maxZ += $z;
public function expand($x, $y, $z){
$this->minX -= $x;
$this->minY -= $y;
$this->minZ -= $z;
$this->maxX += $x;
$this->maxY += $y;
$this->maxZ += $z;
return $vec;
return $this;
}
public function contract($x, $y, $z){
public function offset($x, $y, $z){
$this->minX += $x;
$this->minY += $y;
$this->minZ += $z;
$this->maxX += $x;
$this->maxY += $y;
$this->maxZ += $z;
return $this;
}
public function shrink($x, $y, $z){
$vec = clone $this;
$vec->minX += $x;
$vec->minY += $y;
@ -111,6 +121,17 @@ class AxisAlignedBB{
return $vec;
}
public function contract($x, $y, $z){
$this->minX += $x;
$this->minY += $y;
$this->minZ += $z;
$this->maxX -= $x;
$this->maxY -= $y;
$this->maxZ -= $z;
return $this;
}
public function setBB(AxisAlignedBB $bb){
return new AxisAlignedBB(
min($this->minX, $bb->minX),
@ -123,7 +144,15 @@ class AxisAlignedBB{
}
public function getOffsetBoundingBox($x, $y, $z){
return new AxisAlignedBB($this->minX + $x, $this->minY + $y, $this->minZ + $z, $this->maxX + $x, $this->maxY + $y, $this->maxZ + $z);
$vec = clone $this;
$vec->minX += $x;
$vec->minY += $y;
$vec->minZ += $z;
$vec->maxX += $x;
$vec->maxY += $y;
$vec->maxZ += $z;
return $vec;
}
public function calculateXOffset(AxisAlignedBB $bb, $x){