[AnimComponent] Transition exit time fix (playcanvas#3153)

ellthompson · web-flow · commit 8539e7556385 · 2021-05-10T15:28:48.000+01:00
* use the user defined loop parameter when checking whether to use a transitions exit time

* lint warning fix
diff --git a/src/anim/binder/default-anim-binder.js b/src/anim/binder/default-anim-binder.js
@@ -56,23 +56,23 @@ class DefaultAnimBinder {
             'localPosition': function (node) {
                 var object = node.localPosition;
                 var func = function (value) {
-                    object.set.apply(object, value);
+                    object.set(...value);
                 };
                 return DefaultAnimBinder.createAnimTarget(func, 'vector', 3, node, 'localPosition');
             },
 
             'localRotation': function (node) {
                 var object = node.localRotation;
                 var func = function (value) {
-                    object.set.apply(object, value);
+                    object.set(...value);
                 };
                 return DefaultAnimBinder.createAnimTarget(func, 'quaternion', 4, node, 'localRotation');
             },
 
             'localScale': function (node) {
                 var object = node.localScale;
                 var func = function (value) {
-                    object.set.apply(object, value);
+                    object.set(...value);
                 };
                 return DefaultAnimBinder.createAnimTarget(func, 'vector', 3, node, 'localScale');
             },
diff --git a/src/anim/controller/anim-controller.js b/src/anim/controller/anim-controller.js
@@ -266,7 +266,7 @@ class AnimController {
                 var progressBefore = this._getActiveStateProgressForTime(this._timeInStateBefore);
                 var progress = this._getActiveStateProgressForTime(this._timeInState);
                 // when the exit time is smaller than 1 and the state is looping, we should check for an exit each loop
-                if (transition.exitTime < 1.0 && this.activeState.looping) {
+                if (transition.exitTime < 1.0 && this.activeState.loop) {
                     progressBefore -= Math.floor(progressBefore);
                     progress -= Math.floor(progress);
                 }

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ class AnimController {`
`266`	`266`	`var progressBefore = this._getActiveStateProgressForTime(this._timeInStateBefore);`
`267`	`267`	`var progress = this._getActiveStateProgressForTime(this._timeInState);`
`268`	`268`	`// when the exit time is smaller than 1 and the state is looping, we should check for an exit each loop`
`269`		`- if (transition.exitTime < 1.0 && this.activeState.looping) {`
	`269`	`+ if (transition.exitTime < 1.0 && this.activeState.loop) {`
`270`	`270`	`progressBefore -= Math.floor(progressBefore);`
`271`	`271`	`progress -= Math.floor(progress);`
`272`	`272`	`}`