Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize allocations with thisrc #13

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Optimize allocations with thisrc #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b95d31a
Adopt thisuniq() to reduce Vector3 clones
SOF3 Aug 16, 2020
abb1f33
Use thisrc() instead of thisuniq()
SOF3 Aug 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"license": "LGPL-3.0",
"require": {
"php": ">=7.2.0",
"php-64bit": "*"
"php-64bit": "*",
"ext-thisrc": "0.1.0"
},
"require-dev": {
"phpstan/phpstan": "^0.12.25",
Expand Down
164 changes: 125 additions & 39 deletions src/Vector3.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,19 @@ public function getFloorZ() : int{
* @param int|float $z
*/
public function add($x, $y, $z) : Vector3{
return new Vector3($this->x + $x, $this->y + $y, $this->z + $z);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x += $x;
$uniq->y += $y;
$uniq->z += $z;
return $uniq;
}

public function addVector(Vector3 $v) : Vector3{
return $this->add($v->x, $v->y, $v->z);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x += $v->x;
$uniq->y += $v->y;
$uniq->z += $v->z;
return $uniq;
}

/**
Expand All @@ -122,101 +130,154 @@ public function addVector(Vector3 $v) : Vector3{
* @param int|float $z
*/
public function subtract($x, $y, $z) : Vector3{
return $this->add(-$x, -$y, -$z);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x -= $x;
$uniq->y -= $y;
$uniq->z -= $z;
return $uniq;
}

public function subtractVector(Vector3 $v) : Vector3{
return $this->add(-$v->x, -$v->y, -$v->z);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x -= $v->x;
$uniq->y -= $v->y;
$uniq->z -= $v->z;
return $uniq;
}

public function multiply(float $number) : Vector3{
return new Vector3($this->x * $number, $this->y * $number, $this->z * $number);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x *= $x;
$uniq->y *= $y;
$uniq->z *= $z;
return $uniq;
}

public function divide(float $number) : Vector3{
return new Vector3($this->x / $number, $this->y / $number, $this->z / $number);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x /= $x;
$uniq->y /= $y;
$uniq->z /= $z;
return $uniq;
}

public function ceil() : Vector3{
return new Vector3((int) ceil($this->x), (int) ceil($this->y), (int) ceil($this->z));
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x = (int) ceil($uniq->x);
$uniq->y = (int) ceil($uniq->y);
$uniq->z = (int) ceil($uniq->z);
return $uniq;
}

public function floor() : Vector3{
return new Vector3((int) floor($this->x), (int) floor($this->y), (int) floor($this->z));
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x = (int) floor($uniq->x);
$uniq->y = (int) floor($uniq->y);
$uniq->z = (int) floor($uniq->z);
return $uniq;
}

public function round(int $precision = 0, int $mode = PHP_ROUND_HALF_UP) : Vector3{
return $precision > 0 ?
new Vector3(round($this->x, $precision, $mode), round($this->y, $precision, $mode), round($this->z, $precision, $mode)) :
new Vector3((int) round($this->x, $precision, $mode), (int) round($this->y, $precision, $mode), (int) round($this->z, $precision, $mode));
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x = round($uniq->x, $precision, $mode);
$uniq->y = round($uniq->y, $precision, $mode);
$uniq->z = round($uniq->z, $precision, $mode);
if($precision <= 0) {
$uniq->x = (int) $uniq->x;
$uniq->y = (int) $uniq->y;
$uniq->z = (int) $uniq->z;
}
return $uniq;
}

public function abs() : Vector3{
return new Vector3(abs($this->x), abs($this->y), abs($this->z));
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x = abs($uniq->x);
$uniq->y = abs($uniq->y);
$uniq->z = abs($uniq->z);
return $uniq;
}

/**
* @return Vector3
*/
public function getSide(int $side, int $step = 1){
$uniq = thisrc() === 1 ? $this : clone $this;
switch($side){
case Facing::DOWN:
return new Vector3($this->x, $this->y - $step, $this->z);
$uniq->y -= $step;
break;
case Facing::UP:
return new Vector3($this->x, $this->y + $step, $this->z);
$uniq->y += $step;
break;
case Facing::NORTH:
return new Vector3($this->x, $this->y, $this->z - $step);
$uniq->z -= $step;
break;
case Facing::SOUTH:
return new Vector3($this->x, $this->y, $this->z + $step);
$uniq->z += $step;
break;
case Facing::WEST:
return new Vector3($this->x - $step, $this->y, $this->z);
$uniq->x -= $step;
break;
case Facing::EAST:
return new Vector3($this->x + $step, $this->y, $this->z);
default:
return $this;
$uniq->x += $step;
break;
}
return $uniq;
}

/**
* @return Vector3
*/
public function down(int $step = 1){
return $this->getSide(Facing::DOWN, $step);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->y -= $step;
return $uniq;
}

/**
* @return Vector3
*/
public function up(int $step = 1){
return $this->getSide(Facing::UP, $step);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->y += $step;
return $uniq;
}

/**
* @return Vector3
*/
public function north(int $step = 1){
return $this->getSide(Facing::NORTH, $step);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->z -= $step;
return $uniq;
}

/**
* @return Vector3
*/
public function south(int $step = 1){
return $this->getSide(Facing::SOUTH, $step);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->z += $step;
return $uniq;
}

/**
* @return Vector3
*/
public function west(int $step = 1){
return $this->getSide(Facing::WEST, $step);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x -= $step;
return $uniq;
}

/**
* @return Vector3
*/
public function east(int $step = 1){
return $this->getSide(Facing::EAST, $step);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x += $step;
return $uniq;
}

/**
Expand Down Expand Up @@ -296,24 +357,37 @@ public function lengthSquared() : float{
}

public function normalize() : Vector3{
$len = $this->lengthSquared();
if($len > 0){
return $this->divide(sqrt($len));
$uniq = thisrc() === 1 ? $this : clone $this;
$len2 = $uniq->lengthSquared();
if($len2 === 0.0) { // return type hint of `lengthSquared` guarantees $len2 is float
$uniq->x = 0;
$uniq->y = 0;
$uniq->z = 0;
} else {
$len = sqrt($len2);
$uniq->x /= $len;
$uniq->y /= $len;
$uniq->z /= $len;
}

return new Vector3(0, 0, 0);
return $uniq;
}

public function dot(Vector3 $v) : float{
return $this->x * $v->x + $this->y * $v->y + $this->z * $v->z;
}

public function cross(Vector3 $v) : Vector3{
return new Vector3(
$this->y * $v->z - $this->z * $v->y,
$this->z * $v->x - $this->x * $v->z,
$this->x * $v->y - $this->y * $v->x
);
$uniq = thisrc() === 1 ? $this : clone $this;

// clone properties first, may be overwritten
$x = $uniq->x;
$y = $uniq->y;
$z = $uniq->z;

$uniq->x = $y * $v->z - $z * $v->y;
$uniq->y = $z * $v->x - $x * $v->z;
$uniq->z = $x * $v->y - $y * $v->x;
return $uniq;
}

public function equals(Vector3 $v) : bool{
Expand All @@ -335,7 +409,11 @@ public function getIntermediateWithXValue(Vector3 $v, float $x) : ?Vector3{
if($f < 0 or $f > 1){
return null;
}else{
return new Vector3($x, $this->y + ($v->y - $this->y) * $f, $this->z + ($v->z - $this->z) * $f);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x = $x;
$uniq->y += ($v->y - $uniq->y) * $f;
$uniq->z += ($v->z - $uniq->z) * $f;
return $uniq;
}
}

Expand All @@ -354,7 +432,11 @@ public function getIntermediateWithYValue(Vector3 $v, float $y) : ?Vector3{
if($f < 0 or $f > 1){
return null;
}else{
return new Vector3($this->x + ($v->x - $this->x) * $f, $y, $this->z + ($v->z - $this->z) * $f);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x += ($v->x - $uniq->x) * $f;
$uniq->y = $y;
$uniq->z += ($v->z - $uniq->z) * $f;
return $uniq;
}
}

Expand All @@ -373,7 +455,11 @@ public function getIntermediateWithZValue(Vector3 $v, float $z) : ?Vector3{
if($f < 0 or $f > 1){
return null;
}else{
return new Vector3($this->x + ($v->x - $this->x) * $f, $this->y + ($v->y - $this->y) * $f, $z);
$uniq = thisrc() === 1 ? $this : clone $this;
$uniq->x += ($v->x - $uniq->x) * $f;
$uniq->y += ($v->y - $uniq->y) * $f;
$uniq->z = $z;
return $uniq;
}
}

Expand Down