mirror of
https://github.com/photonstorm/phaser
synced 2025-02-17 06:28:30 +00:00
Merge branch 'master' of https://github.com/photonstorm/phaser
This commit is contained in:
Richard Davey
commit
603483ee69
32 changed files with 168 additions and 162 deletions
|
|
@ -11,16 +11,17 @@ var Class = require('../utils/Class');
|
|||
|
||||
/**
|
||||
* @classdesc
|
||||
* [description]
|
||||
* A three-dimensional matrix.
|
||||
*
|
||||
* Defaults to the identity matrix when instantiated.
|
||||
*
|
||||
* @class Matrix3
|
||||
* @memberOf Phaser.Math
|
||||
* @constructor
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Matrix3} [m] - [description]
|
||||
* @param {Phaser.Math.Matrix3} [m] - Optional Matrix3 to copy values from.
|
||||
*/
|
||||
|
||||
var Matrix3 = new Class({
|
||||
|
||||
initialize:
|
||||
|
|
@ -28,7 +29,7 @@ var Matrix3 = new Class({
|
|||
function Matrix3 (m)
|
||||
{
|
||||
/**
|
||||
* [description]
|
||||
* The matrix values.
|
||||
*
|
||||
* @name Phaser.Math.Matrix3#val
|
||||
* @type {Float32Array}
|
||||
|
|
@ -49,12 +50,12 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Make a clone of this Matrix3.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#clone
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} A new Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} A clone of this Matrix3.
|
||||
*/
|
||||
clone: function ()
|
||||
{
|
||||
|
|
@ -62,14 +63,14 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* This method is an alias for `Matrix3.copy`.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#set
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Matrix3} src - [description]
|
||||
* @param {Phaser.Math.Matrix3} src - The Matrix to set the values of this Matrix's from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
set: function (src)
|
||||
{
|
||||
|
|
@ -77,14 +78,14 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Copy the values of a given Matrix into this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#copy
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Matrix3} src - [description]
|
||||
* @param {Phaser.Math.Matrix3} src - The Matrix to copy the values from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
copy: function (src)
|
||||
{
|
||||
|
|
@ -105,14 +106,14 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Copy the values of a given Matrix4 into this Matrix3.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#fromMat4
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Matrix4} m - [description]
|
||||
* @param {Phaser.Math.Matrix4} m - The Matrix4 to copy the values from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
fromMat4: function (m)
|
||||
{
|
||||
|
|
@ -133,14 +134,14 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Set the values of this Matrix from the given array.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#fromArray
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {array} a - [description]
|
||||
* @param {array} a - The array to copy the values from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
fromArray: function (a)
|
||||
{
|
||||
|
|
@ -160,12 +161,12 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Reset this Matrix to an identity (default) matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#identity
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
identity: function ()
|
||||
{
|
||||
|
|
@ -185,12 +186,12 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Transpose this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#transpose
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
transpose: function ()
|
||||
{
|
||||
|
|
@ -210,12 +211,12 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Invert this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#invert
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
invert: function ()
|
||||
{
|
||||
|
|
@ -264,7 +265,7 @@ var Matrix3 = new Class({
|
|||
* @method Phaser.Math.Matrix3#adjoint
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
adjoint: function ()
|
||||
{
|
||||
|
|
@ -294,12 +295,12 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Calculate the determinant of this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#determinant
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {number} [description]
|
||||
* @return {number} The determinant of this Matrix.
|
||||
*/
|
||||
determinant: function ()
|
||||
{
|
||||
|
|
@ -319,14 +320,14 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Multiply this Matrix by the given Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#multiply
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Matrix3} src - [description]
|
||||
* @param {Phaser.Math.Matrix3} src - The Matrix to multiply this Matrix by.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
multiply: function (src)
|
||||
{
|
||||
|
|
@ -370,14 +371,14 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Translate this Matrix using the given Vector.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#translate
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {(Phaser.Math.Vector2|Phaser.Math.Vector3|Phaser.Math.Vector4)} v - [description]
|
||||
* @param {(Phaser.Math.Vector2|Phaser.Math.Vector3|Phaser.Math.Vector4)} v - The Vector to translate this Matrix with.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
translate: function (v)
|
||||
{
|
||||
|
|
@ -393,14 +394,14 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Apply a rotation transformation to this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#rotate
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {number} rad - [description]
|
||||
* @param {number} rad - The angle in radians to rotate by.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
rotate: function (rad)
|
||||
{
|
||||
|
|
@ -428,14 +429,16 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Apply a scale transformation to this Matrix.
|
||||
*
|
||||
* Uses the `x` and `y` components of the given Vector to scale the Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#scale
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {(Phaser.Math.Vector2|Phaser.Math.Vector3|Phaser.Math.Vector4)} v - [description]
|
||||
* @param {(Phaser.Math.Vector2|Phaser.Math.Vector3|Phaser.Math.Vector4)} v - The Vector to scale this Matrix with.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
scale: function (v)
|
||||
{
|
||||
|
|
@ -455,14 +458,14 @@ var Matrix3 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Set the values of this Matrix from the given Quaternion.
|
||||
*
|
||||
* @method Phaser.Math.Matrix3#fromQuat
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Quaternion} q - [description]
|
||||
* @param {Phaser.Math.Quaternion} q - The Quaternion to set the values of this Matrix from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
fromQuat: function (q)
|
||||
{
|
||||
|
|
@ -512,7 +515,7 @@ var Matrix3 = new Class({
|
|||
*
|
||||
* @param {Phaser.Math.Matrix4} m - [description]
|
||||
*
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3 object.
|
||||
* @return {Phaser.Math.Matrix3} This Matrix3.
|
||||
*/
|
||||
normalFromMat4: function (m)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@ var EPSILON = 0.000001;
|
|||
|
||||
/**
|
||||
* @classdesc
|
||||
* [description]
|
||||
* A four-dimensional matrix.
|
||||
*
|
||||
* @class Matrix4
|
||||
* @memberOf Phaser.Math
|
||||
* @constructor
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Matrix4} [m] - [description]
|
||||
* @param {Phaser.Math.Matrix4} [m] - Optional Matrix4 to copy values from.
|
||||
*/
|
||||
var Matrix4 = new Class({
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ var Matrix4 = new Class({
|
|||
function Matrix4 (m)
|
||||
{
|
||||
/**
|
||||
* [description]
|
||||
* The matrix values.
|
||||
*
|
||||
* @name Phaser.Math.Matrix4#val
|
||||
* @type {Float32Array}
|
||||
|
|
@ -50,12 +50,12 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Make a clone of this Matrix4.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#clone
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} A new Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} A clone of this Matrix4.
|
||||
*/
|
||||
clone: function ()
|
||||
{
|
||||
|
|
@ -65,14 +65,14 @@ var Matrix4 = new Class({
|
|||
// TODO - Should work with basic values
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* This method is an alias for `Matrix4.copy`.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#set
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Matrix4} src - [description]
|
||||
* @param {Phaser.Math.Matrix4} src - The Matrix to set the values of this Matrix's from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
set: function (src)
|
||||
{
|
||||
|
|
@ -80,14 +80,14 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Copy the values of a given Matrix into this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#copy
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Matrix4} src - [description]
|
||||
* @param {Phaser.Math.Matrix4} src - The Matrix to copy the values from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
copy: function (src)
|
||||
{
|
||||
|
|
@ -115,14 +115,14 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Set the values of this Matrix from the given array.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#fromArray
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {array} a - [description]
|
||||
* @param {array} a - The array to copy the values from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
fromArray: function (a)
|
||||
{
|
||||
|
|
@ -149,12 +149,14 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Reset this Matrix.
|
||||
*
|
||||
* Sets all values to `0`.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#zero
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
zero: function ()
|
||||
{
|
||||
|
|
@ -181,16 +183,16 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Set the `x`, `y` and `z` values of this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#xyz
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {number} x - [description]
|
||||
* @param {number} y - [description]
|
||||
* @param {number} z - [description]
|
||||
* @param {number} x - The x value.
|
||||
* @param {number} y - The y value.
|
||||
* @param {number} z - The z value.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
xyz: function (x, y, z)
|
||||
{
|
||||
|
|
@ -206,16 +208,16 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Set the scaling values of this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#scaling
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {number} x - [description]
|
||||
* @param {number} y - [description]
|
||||
* @param {number} z - [description]
|
||||
* @param {number} x - The x scaling value.
|
||||
* @param {number} y - The y scaling value.
|
||||
* @param {number} z - The z scaling value.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
scaling: function (x, y, z)
|
||||
{
|
||||
|
|
@ -232,12 +234,12 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Reset this Matrix to an identity (default) matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#identity
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
identity: function ()
|
||||
{
|
||||
|
|
@ -264,12 +266,12 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Transpose this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#transpose
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
transpose: function ()
|
||||
{
|
||||
|
|
@ -299,12 +301,12 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Invert this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#invert
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
invert: function ()
|
||||
{
|
||||
|
|
@ -381,7 +383,7 @@ var Matrix4 = new Class({
|
|||
* @method Phaser.Math.Matrix4#adjoint
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
adjoint: function ()
|
||||
{
|
||||
|
|
@ -428,12 +430,12 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Calculate the determinant of this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#determinant
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @return {number} [description]
|
||||
* @return {number} The determinant of this Matrix.
|
||||
*/
|
||||
determinant: function ()
|
||||
{
|
||||
|
|
@ -477,14 +479,14 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Multiply this Matrix by the given Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#multiply
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Matrix4} src - [description]
|
||||
* @param {Phaser.Math.Matrix4} src - The Matrix to multiply this Matrix by.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
multiply: function (src)
|
||||
{
|
||||
|
|
@ -564,7 +566,7 @@ var Matrix4 = new Class({
|
|||
*
|
||||
* @param {Phaser.Math.Matrix4} src - [description]
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
multiplyLocal: function (src)
|
||||
{
|
||||
|
|
@ -596,14 +598,14 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Translate this Matrix using the given Vector.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#translate
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {(Phaser.Math.Vector3|Phaser.Math.Vector4)} v - [description]
|
||||
* @param {(Phaser.Math.Vector3|Phaser.Math.Vector4)} v - The Vector to translate this Matrix with.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
translate: function (v)
|
||||
{
|
||||
|
|
@ -621,14 +623,16 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Apply a scale transformation to this Matrix.
|
||||
*
|
||||
* Uses the `x`, `y` and `z` components of the given Vector to scale the Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#scale
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {(Phaser.Math.Vector3|Phaser.Math.Vector4)} v - [description]
|
||||
* @param {(Phaser.Math.Vector3|Phaser.Math.Vector4)} v - The Vector to scale this Matrix with.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
scale: function (v)
|
||||
{
|
||||
|
|
@ -664,7 +668,7 @@ var Matrix4 = new Class({
|
|||
* @param {(Phaser.Math.Vector3|Phaser.Math.Vector4)} axis - [description]
|
||||
* @param {float} angle - The angle of rotation in radians.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
makeRotationAxis: function (axis, angle)
|
||||
{
|
||||
|
|
@ -679,6 +683,7 @@ var Matrix4 = new Class({
|
|||
var tx = t * x;
|
||||
var ty = t * y;
|
||||
|
||||
// TODO: Fix by using fromArray(), or change set() to accept individual values
|
||||
this.set(
|
||||
tx * x + c, tx * y - s * z, tx * z + s * y, 0,
|
||||
tx * y + s * z, ty * y + c, ty * z - s * x, 0,
|
||||
|
|
@ -689,17 +694,16 @@ var Matrix4 = new Class({
|
|||
return this;
|
||||
},
|
||||
|
||||
// aka rotationAxis
|
||||
/**
|
||||
* [description]
|
||||
* Apply a rotation transformation to this Matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#rotate
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {float} rad - [description]
|
||||
* @param {Phaser.Math.Vector3} axis - [description]
|
||||
* @param {float} rad - The angle in radians to rotate by.
|
||||
* @param {Phaser.Math.Vector3} axis - The axis to rotate upon.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
rotate: function (rad, axis)
|
||||
{
|
||||
|
|
@ -769,14 +773,14 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Rotate this matrix on its X axis.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#rotateX
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {float} rad - [description]
|
||||
* @param {float} rad - The angle in radians to rotate by.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
rotateX: function (rad)
|
||||
{
|
||||
|
|
@ -808,14 +812,14 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Rotate this matrix on its Y axis.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#rotateY
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {float} rad - [description]
|
||||
* @param {float} rad - The angle to rotate by, in radians.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
rotateY: function (rad)
|
||||
{
|
||||
|
|
@ -847,14 +851,14 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Rotate this matrix on its Z axis.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#rotateZ
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {float} rad - [description]
|
||||
* @param {float} rad - The angle to rotate by, in radians.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
rotateZ: function (rad)
|
||||
{
|
||||
|
|
@ -886,15 +890,15 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Set the values of this Matrix from the given rotation Quaternion and translation Vector.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#fromRotationTranslation
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Quaternion} q - [description]
|
||||
* @param {Phaser.Math.Vector3} v - [description]
|
||||
* @param {Phaser.Math.Quaternion} q - The Quaternion to set rotation from.
|
||||
* @param {Phaser.Math.Vector3} v - The Vector to set translation from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
fromRotationTranslation: function (q, v)
|
||||
{
|
||||
|
|
@ -946,14 +950,14 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Set the values of this Matrix from the given Quaternion.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#fromQuat
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Quaternion} q - [description]
|
||||
* @param {Phaser.Math.Quaternion} q - The Quaternion to set the values of this Matrix from.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
fromQuat: function (q)
|
||||
{
|
||||
|
|
@ -1004,7 +1008,7 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* Generates a frustum matrix with the given bounds.
|
||||
* Generate a frustum matrix with the given bounds.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#frustum
|
||||
* @since 3.0.0
|
||||
|
|
@ -1016,7 +1020,7 @@ var Matrix4 = new Class({
|
|||
* @param {number} near - The near bound of the frustum.
|
||||
* @param {number} far - The far bound of the frustum.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
frustum: function (left, right, bottom, top, near, far)
|
||||
{
|
||||
|
|
@ -1050,8 +1054,7 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* Generates a perspective projection matrix with the given bounds.
|
||||
* perspective fov lh
|
||||
* Generate a perspective projection matrix with the given bounds.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#perspective
|
||||
* @since 3.0.0
|
||||
|
|
@ -1061,7 +1064,7 @@ var Matrix4 = new Class({
|
|||
* @param {number} near - Near bound of the frustum.
|
||||
* @param {number} far - Far bound of the frustum.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
perspective: function (fovy, aspect, near, far)
|
||||
{
|
||||
|
|
@ -1093,17 +1096,17 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Generate a perspective projection matrix with the given bounds.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#perspectiveLH
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {number} width - [description]
|
||||
* @param {number} height - [description]
|
||||
* @param {number} width - The width of the frustum.
|
||||
* @param {number} height - The height of the frustum.
|
||||
* @param {number} near - Near bound of the frustum.
|
||||
* @param {number} far - Far bound of the frustum.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
perspectiveLH: function (width, height, near, far)
|
||||
{
|
||||
|
|
@ -1133,7 +1136,7 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* Generates a orthogonal projection matrix with the given bounds.
|
||||
* Generate an orthogonal projection matrix with the given bounds.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#ortho
|
||||
* @since 3.0.0
|
||||
|
|
@ -1145,7 +1148,7 @@ var Matrix4 = new Class({
|
|||
* @param {number} near - The near bound of the frustum.
|
||||
* @param {number} far - The far bound of the frustum.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
ortho: function (left, right, bottom, top, near, far)
|
||||
{
|
||||
|
|
@ -1183,7 +1186,7 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* Generates a look-at matrix with the given eye position, focal point, and up axis.
|
||||
* Generate a look-at matrix with the given eye position, focal point, and up axis.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#lookAt
|
||||
* @since 3.0.0
|
||||
|
|
@ -1192,7 +1195,7 @@ var Matrix4 = new Class({
|
|||
* @param {Phaser.Math.Vector3} center - Point the viewer is looking at
|
||||
* @param {Phaser.Math.Vector3} up - vec3 pointing up.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
lookAt: function (eye, center, up)
|
||||
{
|
||||
|
|
@ -1291,7 +1294,7 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Set the values of this matrix from the given `yaw`, `pitch` and `roll` values.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#yawPitchRoll
|
||||
* @since 3.0.0
|
||||
|
|
@ -1300,7 +1303,7 @@ var Matrix4 = new Class({
|
|||
* @param {number} pitch - [description]
|
||||
* @param {number} roll - [description]
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
yawPitchRoll: function (yaw, pitch, roll)
|
||||
{
|
||||
|
|
@ -1352,18 +1355,18 @@ var Matrix4 = new Class({
|
|||
},
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Generate a world matrix from the given rotation, position, scale, view matrix and projection matrix.
|
||||
*
|
||||
* @method Phaser.Math.Matrix4#setWorldMatrix
|
||||
* @since 3.0.0
|
||||
*
|
||||
* @param {Phaser.Math.Vector3} rotation - [description]
|
||||
* @param {Phaser.Math.Vector3} position - [description]
|
||||
* @param {Phaser.Math.Vector3} scale - [description]
|
||||
* @param {Phaser.Math.Matrix4} [viewMatrix] - [description]
|
||||
* @param {Phaser.Math.Matrix4} [projectionMatrix] - [description]
|
||||
* @param {Phaser.Math.Vector3} rotation - The rotation of the world matrix.
|
||||
* @param {Phaser.Math.Vector3} position - The position of the world matrix.
|
||||
* @param {Phaser.Math.Vector3} scale - The scale of the world matrix.
|
||||
* @param {Phaser.Math.Matrix4} [viewMatrix] - The view matrix.
|
||||
* @param {Phaser.Math.Matrix4} [projectionMatrix] - The projection matrix.
|
||||
*
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4 object.
|
||||
* @return {Phaser.Math.Matrix4} This Matrix4.
|
||||
*/
|
||||
setWorldMatrix: function (rotation, position, scale, viewMatrix, projectionMatrix)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Back ease-in.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Back.In
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Back ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Back.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Back ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Back.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Bounce ease-in.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Bounce.In
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Bounce ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Bounce.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Bounce ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Bounce.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Circular ease-in.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Circular.In
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Circular ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Circular.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Circular ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Circular.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Cubic ease-in.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Cubic.In
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Cubic ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Cubic.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Cubic ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Cubic.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Elastic ease-in.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Elastic.In
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Elastic ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Elastic.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Elastic ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Elastic.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Exponential ease-in.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Expo.In
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Exponential ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Expo.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Exponential ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Expo.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Quadratic ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Quadratic.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Quadratic ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Quadratic.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Quartic ease-in.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Quartic.In
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Quartic ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Quartic.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Quartic ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Quartic.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Quintic ease-in.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Quintic.In
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Quintic ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Quintic.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Quintic ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Quintic.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Sinusoidal ease-in.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Sine.In
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Sinusoidal ease-in/out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Sine.InOut
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Sinusoidal ease-out.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Sine.Out
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* [description]
|
||||
* Stepped easing.
|
||||
*
|
||||
* @function Phaser.Math.Easing.Stepped.Stepped
|
||||
* @since 3.0.0
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue