Browse Source

Slot and animation - color/alpha out of range fix. Normalizing color and alpha during load as both need to be in 0-1 range in the main loop.

scape 12 years ago
parent
commit
70193d6e39
1 changed files with 8 additions and 8 deletions
  1. 8 8
      spine-lua/SkeletonJson.lua

+ 8 - 8
spine-lua/SkeletonJson.lua

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