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

[LUA] AnimationState trackCount bugfixes (#466)

Browse Source 
* resolved conflict

* made trackCount keep count, not maximum track index.
This commit is contained in:
Matthew 2016-06-17 20:11:41 +02:00 committed by Nathan Sweet
parent 8239b2f905
commit db2190e7db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-lua/AnimationState.lua
View File

@ -65,7 +65,7 @@ function AnimationState.new (data)
end end
self.tracks[index] = entry self.tracks[index] = entry
self.trackCount = math.max(self.trackCount, index) self.trackCount = math.max(self.trackCount, index + 1)
if entry.onStart then entry.onStart(index) end if entry.onStart then entry.onStart(index) end
if self.onStart then self.onStart(index) end if self.onStart then self.onStart(index) end
@ -73,7 +73,7 @@ function AnimationState.new (data)
function self:update (delta) function self:update (delta)
delta = delta * self.timeScale delta = delta * self.timeScale
for i = 0, self.trackCount do for i = 0, self.trackCount - 1 do
local current = self.tracks[i] local current = self.tracks[i]
if current then if current then
current.time = current.time + delta * current.timeScale current.time = current.time + delta * current.timeScale
@ -96,7 +96,7 @@ function AnimationState.new (data)
end end
function self:apply(skeleton) function self:apply(skeleton)
for i = 0, self.trackCount do for i = 0, self.trackCount - 1 do
local current = self.tracks[i] local current = self.tracks[i]
if current then if current then
local time = current.time local time = current.time
@ -211,7 +211,7 @@ function AnimationState.new (data)
end end
last.next = entry last.next = entry
else else
self.tracks[trackIndex] = entry setCurrent(trackIndex, entry)
end end
delay = delay or 0 delay = delay or 0