Testing rotation fix

Author: photonstorm

plugins/spine/dist/SpinePlugin.js

@@ -7628,6 +7628,11 @@ var CONST = __webpack_require__(/*! ../const */ "../../../src/math/const.js");
  */
 var CounterClockwise = function (angle)
 {
+    if (angle > Math.PI)
+    {
+        angle -= CONST.PI2;
+    }
+
     return Math.abs((((angle + CONST.TAU) % CONST.PI2) - CONST.PI2) % CONST.PI2);
 };
 
@@ -11061,7 +11066,8 @@ var SpineGameObjectWebGLRenderer = function (renderer, src, interpolationPercent
     var calcMatrix = renderer._tempMatrix3;
 
     //  - 90 degrees to account for the difference in Spine vs. Phaser rotation
-    spriteMatrix.applyITRS(src.x, src.y, src.rotation - 1.5707963267948966, src.scaleX, src.scaleY);
+    // spriteMatrix.applyITRS(src.x, src.y, src.rotation - 1.5707963267948966, src.scaleX, src.scaleY);
+    spriteMatrix.applyITRS(src.x, src.y, src.rotation, src.scaleX, src.scaleY);
 
     camMatrix.copyFrom(camera.matrix);
 
@@ -11103,15 +11109,23 @@ var SpineGameObjectWebGLRenderer = function (renderer, src, interpolationPercent
         skeleton.scaleY = calcMatrix.scaleY;
     }
 
-    src.root.rotation = RadToDeg(CounterClockwise(calcMatrix.rotation));
+    // src.root.rotation = RadToDeg(calcMatrix.rotation);
+
+    //  - 90 degrees to account for the difference in Spine vs. Phaser rotation
+
+    //  Correct method via angle:
+    // spineBoy.root.rotation = RadToDeg(CounterClockwise(DegToRad(arrow.angle))) + 90;
+
+    // src.root.rotation = RadToDeg(CounterClockwise(calcMatrix.rotation)) + 90;
+    // src.root.rotation = RadToDeg(calcMatrix.rotation);
 
     sceneRenderer.camera.position.x = viewportWidth / 2;
     sceneRenderer.camera.position.y = viewportHeight / 2;
 
     sceneRenderer.camera.viewportWidth = viewportWidth;
     sceneRenderer.camera.viewportHeight = viewportHeight;
 
-    sceneRenderer.camera.update();
+    // sceneRenderer.camera.update();
 
     //  Add autoUpdate option
     skeleton.updateWorldTransform();

plugins/spine/dist/SpinePlugin.js.map

@@ -43,7 +43,8 @@ var SpineGameObjectWebGLRenderer = function (renderer, src, interpolationPercent
     var calcMatrix = renderer._tempMatrix3;
 
     //  - 90 degrees to account for the difference in Spine vs. Phaser rotation
-    spriteMatrix.applyITRS(src.x, src.y, src.rotation - 1.5707963267948966, src.scaleX, src.scaleY);
+    // spriteMatrix.applyITRS(src.x, src.y, src.rotation - 1.5707963267948966, src.scaleX, src.scaleY);
+    spriteMatrix.applyITRS(src.x, src.y, src.rotation, src.scaleX, src.scaleY);
 
     camMatrix.copyFrom(camera.matrix);
 
@@ -85,15 +86,23 @@ var SpineGameObjectWebGLRenderer = function (renderer, src, interpolationPercent
         skeleton.scaleY = calcMatrix.scaleY;
     }
 
-    src.root.rotation = RadToDeg(CounterClockwise(calcMatrix.rotation));
+    // src.root.rotation = RadToDeg(calcMatrix.rotation);
+
+    //  - 90 degrees to account for the difference in Spine vs. Phaser rotation
+
+    //  Correct method via angle:
+    // spineBoy.root.rotation = RadToDeg(CounterClockwise(DegToRad(arrow.angle))) + 90;
+
+    // src.root.rotation = RadToDeg(CounterClockwise(calcMatrix.rotation)) + 90;
+    // src.root.rotation = RadToDeg(calcMatrix.rotation);
 
     sceneRenderer.camera.position.x = viewportWidth / 2;
     sceneRenderer.camera.position.y = viewportHeight / 2;
 
     sceneRenderer.camera.viewportWidth = viewportWidth;
     sceneRenderer.camera.viewportHeight = viewportHeight;
 
-    sceneRenderer.camera.update();
+    // sceneRenderer.camera.update();
 
     //  Add autoUpdate option
     skeleton.updateWorldTransform();

plugins/spine/src/gameobject/SpineGameObjectWebGLRenderer.js

@@ -28,6 +28,11 @@ var CONST = require('../const');
  */
 var CounterClockwise = function (angle)
 {
+    if (angle > Math.PI)
+    {
+        angle -= CONST.PI2;
+    }
+
     return Math.abs((((angle + CONST.TAU) % CONST.PI2) - CONST.PI2) % CONST.PI2);
 };