UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-20 17:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' into 3.7-beta

Browse Source
This commit is contained in:
badlogic 2017-10-28 09:46:52 +02:00
commit aba0348d06
20 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
spine-as3/spine-as3-example/lib/spine-as3.swc
View File

Binary file not shown.

5
spine-as3/spine-as3/src/spine/animation/AnimationState.as
View File

@ -207,9 +207,10 @@ package spine.animation {
if (from.mixingFrom != null) applyMixingFrom(from, skeleton, currentPose);
var mix : Number = 0;
if (to.mixDuration == 0) // Single frame mix to undo mixingFrom changes.
if (to.mixDuration == 0) { // Single frame mix to undo mixingFrom changes.
mix = 1;
else {
currentPose = MixPose.setup;
} else {
mix = to.mixTime / to.mixDuration;
if (mix > 1) mix = 1;
}

5
spine-c/spine-c/src/spine/AnimationState.c
View File

@ -419,9 +419,10 @@ float _spAnimationState_applyMixingFrom (spAnimationState* self, spTrackEntry* t
spTrackEntry* from = to->mixingFrom;
if (from->mixingFrom) _spAnimationState_applyMixingFrom(self, from, skeleton, currentPose);
if (to->mixDuration == 0) /* Single frame mix to undo mixingFrom changes. */
if (to->mixDuration == 0) { /* Single frame mix to undo mixingFrom changes. */
mix = 1;
else {
currentPose = SP_MIX_POSE_SETUP;
} else {
mix = to->mixTime / to->mixDuration;
if (mix > 1) mix = 1;
}

5
spine-csharp/src/AnimationState.cs
View File

@ -220,9 +220,10 @@ namespace Spine {
if (from.mixingFrom != null) ApplyMixingFrom(from, skeleton, currentPose);
float mix;
if (to.mixDuration == 0) // Single frame mix to undo mixingFrom changes.
if (to.mixDuration == 0) { // Single frame mix to undo mixingFrom changes.
mix = 1;
else {
currentPose = MixPose.Setup;
} else {
mix = to.mixTime / to.mixDuration;
if (mix > 1) mix = 1;
}

1
spine-lua/AnimationState.lua
View File

@ -428,6 +428,7 @@ function AnimationState:applyMixingFrom (to, skeleton, currentPose)
local mix = 0
if to.mixDuration == 0 then -- Single frame mix to undo mixingFrom changes.
mix = 1
currentPose = MixPose.setup
else
mix = to.mixTime / to.mixDuration
if mix > 1 then mix = 1 end

BIN
spine-starling/spine-starling-example/lib/spine-as3.swc
View File

Binary file not shown.

BIN
spine-starling/spine-starling/lib/spine-as3.swc
View File

Binary file not shown.

4
spine-ts/build/spine-all.js
View File

@ -1715,8 +1715,10 @@ var spine;
if (from.mixingFrom != null)
this.applyMixingFrom(from, skeleton, currentPose);
var mix = 0;
if (to.mixDuration == 0)
if (to.mixDuration == 0) {
mix = 1;
currentPose = spine.MixPose.setup;
}
else {
mix = to.mixTime / to.mixDuration;
if (mix > 1)

2
spine-ts/build/spine-all.js.map
View File

File diff suppressed because one or more lines are too long

4
spine-ts/build/spine-canvas.js
View File

@ -1715,8 +1715,10 @@ var spine;
if (from.mixingFrom != null)
this.applyMixingFrom(from, skeleton, currentPose);
var mix = 0;
if (to.mixDuration == 0)
if (to.mixDuration == 0) {
mix = 1;
currentPose = spine.MixPose.setup;
}
else {
mix = to.mixTime / to.mixDuration;
if (mix > 1)

2
spine-ts/build/spine-canvas.js.map
View File

File diff suppressed because one or more lines are too long

4
spine-ts/build/spine-core.js
View File

@ -1266,8 +1266,10 @@ var spine;
if (from.mixingFrom != null)
this.applyMixingFrom(from, skeleton, currentPose);
var mix = 0;
if (to.mixDuration == 0)
if (to.mixDuration == 0) {
mix = 1;
currentPose = spine.MixPose.setup;
}
else {
mix = to.mixTime / to.mixDuration;
if (mix > 1)

2
spine-ts/build/spine-core.js.map
View File

File diff suppressed because one or more lines are too long

4
spine-ts/build/spine-threejs.js
View File

@ -1266,8 +1266,10 @@ var spine;
if (from.mixingFrom != null)
this.applyMixingFrom(from, skeleton, currentPose);
var mix = 0;
if (to.mixDuration == 0)
if (to.mixDuration == 0) {
mix = 1;
currentPose = spine.MixPose.setup;
}
else {
mix = to.mixTime / to.mixDuration;
if (mix > 1)

2
spine-ts/build/spine-threejs.js.map
View File

File diff suppressed because one or more lines are too long

4
spine-ts/build/spine-webgl.js
View File

@ -1266,8 +1266,10 @@ var spine;
if (from.mixingFrom != null)
this.applyMixingFrom(from, skeleton, currentPose);
var mix = 0;
if (to.mixDuration == 0)
if (to.mixDuration == 0) {
mix = 1;
currentPose = spine.MixPose.setup;
}
else {
mix = to.mixTime / to.mixDuration;
if (mix > 1)

2
spine-ts/build/spine-webgl.js.map
View File

File diff suppressed because one or more lines are too long

4
spine-ts/build/spine-widget.js
View File

@ -1266,8 +1266,10 @@ var spine;
if (from.mixingFrom != null)
this.applyMixingFrom(from, skeleton, currentPose);
var mix = 0;
if (to.mixDuration == 0)
if (to.mixDuration == 0) {
mix = 1;
currentPose = spine.MixPose.setup;
}
else {
mix = to.mixTime / to.mixDuration;
if (mix > 1)

2
spine-ts/build/spine-widget.js.map
View File

File diff suppressed because one or more lines are too long

5
spine-ts/core/src/AnimationState.ts
View File

@ -191,9 +191,10 @@ module spine {
if (from.mixingFrom != null) this.applyMixingFrom(from, skeleton, currentPose);
let mix = 0;
if (to.mixDuration == 0) // Single frame mix to undo mixingFrom changes.
if (to.mixDuration == 0) { // Single frame mix to undo mixingFrom changes.
mix = 1;
else {
currentPose = MixPose.setup;
} else {
mix = to.mixTime / to.mixDuration;
if (mix > 1) mix = 1;
}