Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-17 06:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed math in Transform world scale and rotation calculations.

Browse source
This commit is contained in:
Richard Davey 2017-01-23 23:40:36 +00:00
parent 739561f1fb
commit 12ac4cc61c
2 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
v3/src/checksum.js
View file

@ -1,4 +1,4 @@
var CHECKSUM = {
build: 'eb6658f0-df5b-11e6-b901-e997f9a8c5e6'
build: '07360840-e1c4-11e6-a539-73ab52eda7a7'
};
module.exports = CHECKSUM;

44
v3/src/components/Transform.js
View file

@ -286,15 +286,19 @@ Transform.prototype = {
var parent = this.parent.world;
var tx = 0;
var ty = 0;
var a;
var b;
var c;
var d;
if (this.hasLocalRotation)
{
// console.log(this.name, 'Transform.updateFromParent', this.parent.name);
var a = this.cache.a;
var b = this.cache.b;
var c = this.cache.c;
var d = this.cache.d;
a = this.cache.a;
b = this.cache.b;
c = this.cache.c;
d = this.cache.d;
tx = this._posX - ((this._pivotX * a) + (this._pivotY * c));
ty = this._posY - ((this._pivotX * b) + (this._pivotY * d));
@ -317,13 +321,39 @@ Transform.prototype = {
world.d = this._scaleY * parent.d;
}
this._worldRotation = Math.atan2(-this.world.c, this.world.d);
// this._worldRotation = Math.atan2(-this.world.c, this.world.d);
world.tx = (tx * parent.a) + (ty * parent.c) + parent.tx;
world.ty = (tx * parent.b) + (ty * parent.d) + parent.ty;
this._worldScaleX = this._scaleX * Math.sqrt((world.a * world.a) + (world.c * world.c));
this._worldScaleY = this._scaleY * Math.sqrt((world.b * world.b) + (world.d * world.d));
a = world.a;
b = world.b;
c = world.c;
d = world.d;
var determ = (a * d) - (b * c);
if (a || b)
{
var r = Math.sqrt((a * a) + (b * b));
this._worldRotation = (b > 0) ? Math.acos(a / r) : -Math.acos(a / r);
this._worldScaleX = r;
this._worldScaleY = determ / r;
}
else if (c || d)
{
var s = Math.sqrt((c * c) + (d * d));
this._worldRotation = MATH_CONST.TAU - ((d > 0) ? Math.acos(-c / s) : -Math.acos(c / s));
this._worldScaleX = determ / s;
this._worldScaleY = s;
}
else
{
this._worldScaleX = 0;
this._worldScaleY = 0;
}
return this;
},