UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[as3][ts] Moved mix duration fix to setTimelineData so we evaluate the boolean expression less.

Browse Source
This commit is contained in:
badlogic 2017-05-17 15:31:10 +02:00
parent 308261fceb
commit 18ebc9b447
18 changed files with 28 additions and 22 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.

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

@ -237,7 +237,7 @@ package spine.animation {
first = true; first = true;
alpha = alphaDip; alpha = alphaDip;
var dipMix : TrackEntry = timelineDipMix[i]; var dipMix : TrackEntry = timelineDipMix[i];
if (dipMix != null && dipMix.mixDuration > 0) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); if (dipMix != null) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break; break;
} }
if (timeline is RotateTimeline) if (timeline is RotateTimeline)

2
spine-as3/spine-as3/src/spine/animation/TrackEntry.as
View File

@ -106,7 +106,7 @@ package spine.animation {
for (var ii : int = mixingToLast; ii >= 0; ii--) { for (var ii : int = mixingToLast; ii >= 0; ii--) {
var entry : TrackEntry = mixingTo[ii]; var entry : TrackEntry = mixingTo[ii];
if (!entry.hasTimeline(intId)) { if (!entry.hasTimeline(intId)) {
timelineDipMix[i] = entry; if (entry.mixDuration > 0) timelineDipMix[i] = entry;
continue outer; continue outer;
} }
} }

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.

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

@ -1215,7 +1215,7 @@ var spine;
first = true; first = true;
alpha = alphaDip; alpha = alphaDip;
var dipMix = timelineDipMix[i]; var dipMix = timelineDipMix[i];
if (dipMix != null && dipMix.mixDuration > 0) if (dipMix != null)
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break; break;
} }
@ -1569,7 +1569,8 @@ var spine;
for (var ii = mixingToLast; ii >= 0; ii--) { for (var ii = mixingToLast; ii >= 0; ii--) {
var entry = mixingTo[ii]; var entry = mixingTo[ii];
if (!entry.hasTimeline(id)) { if (!entry.hasTimeline(id)) {
timelineDipMix[i] = entry; if (entry.mixDuration > 0)
timelineDipMix[i] = entry;
continue outer; continue outer;
} }
} }

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

File diff suppressed because one or more lines are too long

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

@ -1215,7 +1215,7 @@ var spine;
first = true; first = true;
alpha = alphaDip; alpha = alphaDip;
var dipMix = timelineDipMix[i]; var dipMix = timelineDipMix[i];
if (dipMix != null && dipMix.mixDuration > 0) if (dipMix != null)
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break; break;
} }
@ -1569,7 +1569,8 @@ var spine;
for (var ii = mixingToLast; ii >= 0; ii--) { for (var ii = mixingToLast; ii >= 0; ii--) {
var entry = mixingTo[ii]; var entry = mixingTo[ii];
if (!entry.hasTimeline(id)) { if (!entry.hasTimeline(id)) {
timelineDipMix[i] = entry; if (entry.mixDuration > 0)
timelineDipMix[i] = entry;
continue outer; continue outer;
} }
} }

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

File diff suppressed because one or more lines are too long

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

@ -1215,7 +1215,7 @@ var spine;
first = true; first = true;
alpha = alphaDip; alpha = alphaDip;
var dipMix = timelineDipMix[i]; var dipMix = timelineDipMix[i];
if (dipMix != null && dipMix.mixDuration > 0) if (dipMix != null)
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break; break;
} }
@ -1569,7 +1569,8 @@ var spine;
for (var ii = mixingToLast; ii >= 0; ii--) { for (var ii = mixingToLast; ii >= 0; ii--) {
var entry = mixingTo[ii]; var entry = mixingTo[ii];
if (!entry.hasTimeline(id)) { if (!entry.hasTimeline(id)) {
timelineDipMix[i] = entry; if (entry.mixDuration > 0)
timelineDipMix[i] = entry;
continue outer; continue outer;
} }
} }

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

File diff suppressed because one or more lines are too long

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

@ -1215,7 +1215,7 @@ var spine;
first = true; first = true;
alpha = alphaDip; alpha = alphaDip;
var dipMix = timelineDipMix[i]; var dipMix = timelineDipMix[i];
if (dipMix != null && dipMix.mixDuration > 0) if (dipMix != null)
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break; break;
} }
@ -1569,7 +1569,8 @@ var spine;
for (var ii = mixingToLast; ii >= 0; ii--) { for (var ii = mixingToLast; ii >= 0; ii--) {
var entry = mixingTo[ii]; var entry = mixingTo[ii];
if (!entry.hasTimeline(id)) { if (!entry.hasTimeline(id)) {
timelineDipMix[i] = entry; if (entry.mixDuration > 0)
timelineDipMix[i] = entry;
continue outer; continue outer;
} }
} }

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

File diff suppressed because one or more lines are too long

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

@ -1215,7 +1215,7 @@ var spine;
first = true; first = true;
alpha = alphaDip; alpha = alphaDip;
var dipMix = timelineDipMix[i]; var dipMix = timelineDipMix[i];
if (dipMix != null && dipMix.mixDuration > 0) if (dipMix != null)
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break; break;
} }
@ -1569,7 +1569,8 @@ var spine;
for (var ii = mixingToLast; ii >= 0; ii--) { for (var ii = mixingToLast; ii >= 0; ii--) {
var entry = mixingTo[ii]; var entry = mixingTo[ii];
if (!entry.hasTimeline(id)) { if (!entry.hasTimeline(id)) {
timelineDipMix[i] = entry; if (entry.mixDuration > 0)
timelineDipMix[i] = entry;
continue outer; continue outer;
} }
} }

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

File diff suppressed because one or more lines are too long

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

@ -1215,7 +1215,7 @@ var spine;
first = true; first = true;
alpha = alphaDip; alpha = alphaDip;
var dipMix = timelineDipMix[i]; var dipMix = timelineDipMix[i];
if (dipMix != null && dipMix.mixDuration > 0) if (dipMix != null)
alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break; break;
} }
@ -1569,7 +1569,8 @@ var spine;
for (var ii = mixingToLast; ii >= 0; ii--) { for (var ii = mixingToLast; ii >= 0; ii--) {
var entry = mixingTo[ii]; var entry = mixingTo[ii];
if (!entry.hasTimeline(id)) { if (!entry.hasTimeline(id)) {
timelineDipMix[i] = entry; if (entry.mixDuration > 0)
timelineDipMix[i] = entry;
continue outer; continue outer;
} }
} }

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

File diff suppressed because one or more lines are too long

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

@ -220,7 +220,7 @@ module spine {
first = true; first = true;
alpha = alphaDip; alpha = alphaDip;
let dipMix = timelineDipMix[i]; let dipMix = timelineDipMix[i];
if (dipMix != null && dipMix.mixDuration > 0) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); if (dipMix != null) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break; break;
} }
if (timeline instanceof RotateTimeline) if (timeline instanceof RotateTimeline)
@ -613,7 +613,7 @@ module spine {
for (var ii = mixingToLast; ii >= 0; ii--) { for (var ii = mixingToLast; ii >= 0; ii--) {
let entry = mixingTo[ii]; let entry = mixingTo[ii];
if (!entry.hasTimeline(id)) { if (!entry.hasTimeline(id)) {
timelineDipMix[i] = entry; if (entry.mixDuration > 0) timelineDipMix[i] = entry;
continue outer; continue outer;
} }
} }