Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-24 21:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Vec3 and Vec4 can now take a Vec2, 3 or 4 as a valid type of the add, sub, mult and divide methods

Browse source
This commit is contained in:
Richard Davey 2017-09-19 00:45:03 +01:00
parent d6fe678966
commit 809593ea34
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
v3/src/math/Vector3.js
View file

@ -32,7 +32,7 @@ var Vector3 = new Class({
{
this.x = src.x;
this.y = src.y;
this.z = src.z;
this.z = src.z || 0;
return this;
},
@ -59,7 +59,7 @@ var Vector3 = new Class({
{
this.x += v.x;
this.y += v.y;
this.z += v.z;
this.z += v.z || 0;
return this;
},
@ -68,7 +68,7 @@ var Vector3 = new Class({
{
this.x -= v.x;
this.y -= v.y;
this.z -= v.z;
this.z -= v.z || 0;
return this;
},
@ -77,7 +77,7 @@ var Vector3 = new Class({
{
this.x *= v.x;
this.y *= v.y;
this.z *= v.z;
this.z *= v.z || 1;
return this;
},
@ -95,7 +95,7 @@ var Vector3 = new Class({
{
this.x /= v.x;
this.y /= v.y;
this.z /= v.z;
this.z /= v.z || 1;
return this;
},
@ -113,7 +113,7 @@ var Vector3 = new Class({
{
var dx = v.x - this.x;
var dy = v.y - this.y;
var dz = v.z - this.z;
var dz = v.z - this.z || 0;
return Math.sqrt(dx * dx + dy * dy + dz * dz);
},
@ -122,7 +122,7 @@ var Vector3 = new Class({
{
var dx = v.x - this.x;
var dy = v.y - this.y;
var dz = v.z - this.z;
var dz = v.z - this.z || 0;
return dx * dx + dy * dy + dz * dz;
},

28
v3/src/math/Vector4.js
View file

@ -34,8 +34,8 @@ var Vector4 = new Class({
{
this.x = src.x;
this.y = src.y;
this.z = src.z;
this.w = src.w;
this.z = src.z || 0;
this.w = src.w || 0;
return this;
},
@ -64,8 +64,8 @@ var Vector4 = new Class({
{
this.x += v.x;
this.y += v.y;
this.z += v.z;
this.w += v.w;
this.z += v.z || 0;
this.w += v.w || 0;
return this;
},
@ -74,8 +74,8 @@ var Vector4 = new Class({
{
this.x -= v.x;
this.y -= v.y;
this.z -= v.z;
this.w -= v.w;
this.z -= v.z || 0;
this.w -= v.w || 0;
return this;
},
@ -157,8 +157,8 @@ var Vector4 = new Class({
{
this.x *= v.x;
this.y *= v.y;
this.z *= v.z;
this.w *= v.w;
this.z *= v.z || 1;
this.w *= v.w || 1;
return this;
},
@ -167,8 +167,8 @@ var Vector4 = new Class({
{
this.x /= v.x;
this.y /= v.y;
this.z /= v.z;
this.w /= v.w;
this.z /= v.z || 1;
this.w /= v.w || 1;
return this;
},
@ -177,8 +177,8 @@ var Vector4 = new Class({
{
var dx = v.x - this.x;
var dy = v.y - this.y;
var dz = v.z - this.z;
var dw = v.w - this.w;
var dz = v.z - this.z || 0;
var dw = v.w - this.w || 0;
return Math.sqrt(dx * dx + dy * dy + dz * dz + dw * dw);
},
@ -187,8 +187,8 @@ var Vector4 = new Class({
{
var dx = v.x - this.x;
var dy = v.y - this.y;
var dz = v.z - this.z;
var dw = v.w - this.w;
var dz = v.z - this.z || 0;
var dw = v.w - this.w || 0;
return dx * dx + dy * dy + dz * dz + dw * dw;
},