UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 09:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed animations without bone keys.

Browse Source
This commit is contained in:
NathanSweet 2013-08-16 17:45:16 +02:00
parent fd73ec64fa
commit 2e88c59280
1 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
spine-lua/SkeletonJson.lua
View File

@ -162,50 +162,52 @@ function SkeletonJson.new (attachmentLoader)
local duration = 0 local duration = 0
local bonesMap = map["bones"] local bonesMap = map["bones"]
for boneName,timelineMap in pairs(bonesMap) do if bonesMap then
local boneIndex = skeletonData:findBoneIndex(boneName) for boneName,timelineMap in pairs(bonesMap) do
if boneIndex == -1 then error("Bone not found: " .. boneName) end local boneIndex = skeletonData:findBoneIndex(boneName)
if boneIndex == -1 then error("Bone not found: " .. boneName) end
for timelineName,values in pairs(timelineMap) do for timelineName,values in pairs(timelineMap) do
if timelineName == TIMELINE_ROTATE then if timelineName == TIMELINE_ROTATE then
local timeline = Animation.RotateTimeline.new() local timeline = Animation.RotateTimeline.new()
timeline.boneIndex = boneIndex timeline.boneIndex = boneIndex
local keyframeIndex = 0 local keyframeIndex = 0
for i,valueMap in ipairs(values) do for i,valueMap in ipairs(values) do
local time = valueMap["time"] local time = valueMap["time"]
timeline:setKeyframe(keyframeIndex, time, valueMap["angle"]) timeline:setKeyframe(keyframeIndex, time, valueMap["angle"])
readCurve(timeline, keyframeIndex, valueMap) readCurve(timeline, keyframeIndex, valueMap)
keyframeIndex = keyframeIndex + 1 keyframeIndex = keyframeIndex + 1
end end
table.insert(timelines, timeline) table.insert(timelines, timeline)
duration = math.max(duration, timeline:getDuration()) duration = math.max(duration, timeline:getDuration())
elseif timelineName == TIMELINE_TRANSLATE or timelineName == TIMELINE_SCALE then
local timeline
local timelineScale = 1
if timelineName == TIMELINE_SCALE then
timeline = Animation.ScaleTimeline.new()
else
timeline = Animation.TranslateTimeline.new()
timelineScale = self.scale
end
timeline.boneIndex = boneIndex
local keyframeIndex = 0
for i,valueMap in ipairs(values) do
local time = valueMap["time"]
local x = (valueMap["x"] or 0) * timelineScale
local y = (valueMap["y"] or 0) * timelineScale
timeline:setKeyframe(keyframeIndex, time, x, y)
readCurve(timeline, keyframeIndex, valueMap)
keyframeIndex = keyframeIndex + 1
end
table.insert(timelines, timeline)
duration = math.max(duration, timeline:getDuration())
elseif timelineName == TIMELINE_TRANSLATE or timelineName == TIMELINE_SCALE then
local timeline
local timelineScale = 1
if timelineName == TIMELINE_SCALE then
timeline = Animation.ScaleTimeline.new()
else else
timeline = Animation.TranslateTimeline.new() error("Invalid timeline type for a bone: " .. timelineName .. " (" .. boneName .. ")")
timelineScale = self.scale
end end
timeline.boneIndex = boneIndex
local keyframeIndex = 0
for i,valueMap in ipairs(values) do
local time = valueMap["time"]
local x = (valueMap["x"] or 0) * timelineScale
local y = (valueMap["y"] or 0) * timelineScale
timeline:setKeyframe(keyframeIndex, time, x, y)
readCurve(timeline, keyframeIndex, valueMap)
keyframeIndex = keyframeIndex + 1
end
table.insert(timelines, timeline)
duration = math.max(duration, timeline:getDuration())
else
error("Invalid timeline type for a bone: " .. timelineName .. " (" .. boneName .. ")")
end end
end end
end end