Skip to content

Commit 14a651e

Browse files
committed
Fixed inverted rotation on TransformMatrix
1 parent 1fa9090 commit 14a651e

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/gameobjects/components/TransformMatrix.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -558,18 +558,18 @@ var TransformMatrix = new Class({
558558
{
559559
var matrix = this.matrix;
560560

561-
var sr = Math.sin(rotation);
562-
var cr = Math.cos(rotation);
561+
var radianSin = Math.sin(rotation);
562+
var radianCos = Math.cos(rotation);
563563

564564
// Translate
565565
matrix[4] = x;
566566
matrix[5] = y;
567567

568568
// Rotate and Scale
569-
matrix[0] = cr * scaleX;
570-
matrix[1] = -sr * scaleX;
571-
matrix[2] = sr * scaleY;
572-
matrix[3] = cr * scaleY;
569+
matrix[0] = radianCos * scaleX;
570+
matrix[1] = radianSin * scaleX;
571+
matrix[2] = -radianSin * scaleY;
572+
matrix[3] = radianCos * scaleY;
573573

574574
return this;
575575
},

src/gameobjects/container/ContainerCanvasRenderer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ var ContainerCanvasRenderer = function (renderer, container, interpolationPercen
3434

3535
if (parentMatrix === undefined)
3636
{
37-
transformMatrix.applyITRS(container.x, container.y, -container.rotation, container.scaleX, container.scaleY);
37+
transformMatrix.applyITRS(container.x, container.y, container.rotation, container.scaleX, container.scaleY);
3838
}
3939
else
4040
{
4141
transformMatrix.loadIdentity();
4242
transformMatrix.multiply(parentMatrix);
4343
transformMatrix.translate(container.x, container.y);
44-
transformMatrix.rotate(-container.rotation);
44+
transformMatrix.rotate(container.rotation);
4545
transformMatrix.scale(container.scaleX, container.scaleY);
4646
}
4747

src/gameobjects/container/ContainerWebGLRenderer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ var ContainerWebGLRenderer = function (renderer, container, interpolationPercent
3434

3535
if (parentMatrix === undefined)
3636
{
37-
transformMatrix.applyITRS(container.x, container.y, -container.rotation, container.scaleX, container.scaleY);
37+
transformMatrix.applyITRS(container.x, container.y, container.rotation, container.scaleX, container.scaleY);
3838
}
3939
else
4040
{
4141
transformMatrix.loadIdentity();
4242
transformMatrix.multiply(parentMatrix);
4343
transformMatrix.translate(container.x, container.y);
44-
transformMatrix.rotate(-container.rotation);
44+
transformMatrix.rotate(container.rotation);
4545
transformMatrix.scale(container.scaleX, container.scaleY);
4646
}
4747

0 commit comments

Comments
 (0)