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

Merge pull request #152 from scapix/master

Browse Source 
Lua runtime - Slot and animation - color/alpha out of range fix.
This commit is contained in:
Nathan Sweet 2013-11-04 12:57:39 -08:00
commit fc16a47c1a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spine-lua/SkeletonJson.lua Normal file → Executable file
View File

@ -111,10 +111,10 @@ function SkeletonJson.new (attachmentLoader)
local color = slotMap["color"] local color = slotMap["color"]
if color then if color then
slotData:setColor( slotData:setColor(
tonumber(color:sub(1, 2), 16), tonumber(color:sub(1, 2), 16)/255,
tonumber(color:sub(3, 4), 16), tonumber(color:sub(3, 4), 16)/255,
tonumber(color:sub(5, 6), 16), tonumber(color:sub(5, 6), 16)/255,
tonumber(color:sub(7, 8), 16) tonumber(color:sub(7, 8), 16)/255
) )
end end
@ -264,10 +264,10 @@ function SkeletonJson.new (attachmentLoader)
local color = valueMap["color"] local color = valueMap["color"]
timeline:setFrame( timeline:setFrame(
keyframeIndex, time, keyframeIndex, time,
tonumber(color:sub(1, 2), 16), tonumber(color:sub(1, 2), 16)/255,
tonumber(color:sub(3, 4), 16), tonumber(color:sub(3, 4), 16)/255,
tonumber(color:sub(5, 6), 16), tonumber(color:sub(5, 6), 16)/255,
tonumber(color:sub(7, 8), 16) tonumber(color:sub(7, 8), 16)/255
) )
readCurve(timeline, keyframeIndex, valueMap) readCurve(timeline, keyframeIndex, valueMap)
keyframeIndex = keyframeIndex + 1 keyframeIndex = keyframeIndex + 1