UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-10 17:18:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.7' into 3.8-beta

Browse Source
This commit is contained in:
badlogic 2019-03-04 17:07:46 +01:00
commit 4da1cc35d8
22 changed files with 27 additions and 21 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

@ -90,7 +90,7 @@ package spine.animation {
var nextTime : Number = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
setCurrent(i, next, true);
while (next.mixingFrom != null) {

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

@ -280,7 +280,7 @@ void spAnimationState_update (spAnimationState* self, float delta) {
float nextTime = current->trackLast - next->delay;
if (nextTime >= 0) {
next->delay = 0;
next->trackTime = (nextTime / current->timeScale + delta) * next->timeScale;
next->trackTime = current->timeScale == 0 ? 0 : (nextTime / current->timeScale + delta) * next->timeScale;
current->trackTime += currentDelta;
_spAnimationState_setCurrent(self, i, next, 1);
while (next->mixingFrom) {

2
spine-cpp/spine-cpp/src/spine/AnimationState.cpp
View File

@ -334,7 +334,7 @@ void AnimationState::update(float delta) {
float nextTime = current._trackLast - next->_delay;
if (nextTime >= 0) {
next->_delay = 0;
next->_trackTime = (nextTime / current._timeScale + delta) * next->_timeScale;
next->_trackTime = current._timeScale == 0 ? 0 : (nextTime / current._timeScale + delta) * next->_timeScale;
current._trackTime += currentDelta;
setCurrent(i, next, true);
while (next->_mixingFrom != NULL) {

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

@ -98,7 +98,7 @@ namespace Spine {
float nextTime = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
SetCurrent(i, next, true);
while (next.mixingFrom != null) {

8
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
View File

@ -30,7 +30,10 @@
package com.esotericsoftware.spine;
import static com.esotericsoftware.spine.Animation.RotateTimeline.*;
import static com.esotericsoftware.spine.Animation.RotateTimeline.ENTRIES;
import static com.esotericsoftware.spine.Animation.RotateTimeline.PREV_ROTATION;
import static com.esotericsoftware.spine.Animation.RotateTimeline.PREV_TIME;
import static com.esotericsoftware.spine.Animation.RotateTimeline.ROTATION;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.FloatArray;
@ -38,7 +41,6 @@ import com.badlogic.gdx.utils.IntArray;
import com.badlogic.gdx.utils.IntSet;
import com.badlogic.gdx.utils.Pool;
import com.badlogic.gdx.utils.Pool.Poolable;
import com.esotericsoftware.spine.Animation.AttachmentTimeline;
import com.esotericsoftware.spine.Animation.DrawOrderTimeline;
import com.esotericsoftware.spine.Animation.MixBlend;
@ -127,7 +129,7 @@ public class AnimationState {
float nextTime = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
setCurrent(i, next, true);
while (next.mixingFrom != null) {

6
spine-lua/AnimationState.lua
View File

@ -249,7 +249,11 @@ function AnimationState:update (delta)
local nextTime = current.trackLast - _next.delay
if nextTime >= 0 then
_next.delay = 0
_next.trackTime = (nextTime / current.timeScale + delta) * _next.timeScale
if current.timeScale == 0 then
_next.trackTime = 0
else
_next.trackTime = (nextTime / current.timeScale + delta) * _next.timeScale
end
current.trackTime = current.trackTime + currentDelta
self:setCurrent(i, _next, true)
while _next.mixingFrom do

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.

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

@ -1330,7 +1330,7 @@ var spine;
var nextTime = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
this.setCurrent(i, next, true);
while (next.mixingFrom != null) {

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

File diff suppressed because one or more lines are too long

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

@ -1330,7 +1330,7 @@ var spine;
var nextTime = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
this.setCurrent(i, next, true);
while (next.mixingFrom != null) {

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

File diff suppressed because one or more lines are too long

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

@ -1330,7 +1330,7 @@ var spine;
var nextTime = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
this.setCurrent(i, next, true);
while (next.mixingFrom != null) {

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

File diff suppressed because one or more lines are too long

2
spine-ts/build/spine-player.js
View File

@ -1330,7 +1330,7 @@ var spine;
var nextTime = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
this.setCurrent(i, next, true);
while (next.mixingFrom != null) {

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

File diff suppressed because one or more lines are too long

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

@ -1330,7 +1330,7 @@ var spine;
var nextTime = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
this.setCurrent(i, next, true);
while (next.mixingFrom != null) {

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

File diff suppressed because one or more lines are too long

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

@ -1330,7 +1330,7 @@ var spine;
var nextTime = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
this.setCurrent(i, next, true);
while (next.mixingFrom != null) {

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

File diff suppressed because one or more lines are too long

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

@ -76,7 +76,7 @@ module spine {
let nextTime = current.trackLast - next.delay;
if (nextTime >= 0) {
next.delay = 0;
next.trackTime = (nextTime / current.timeScale + delta) * next.timeScale;
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
current.trackTime += currentDelta;
this.setCurrent(i, next, true);
while (next.mixingFrom != null) {