From d270c5e8daffd744177a91c45727d48551ce19b7 Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 13 Jun 2013 14:04:47 +0300 Subject: [PATCH] change name of nameIndices to slotNameIndices to reflect the contents better --- spine-lua/Skeleton.lua | 2 +- spine-lua/SkeletonData.lua | 2 +- spine-lua/SkeletonJson.lua | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spine-lua/Skeleton.lua b/spine-lua/Skeleton.lua index 63e05b968..843aea829 100644 --- a/spine-lua/Skeleton.lua +++ b/spine-lua/Skeleton.lua @@ -99,7 +99,7 @@ function Skeleton.new (skeletonData) function self:getAttachment (slotName, attachmentName) if not slotName then error("slotName cannot be nil.", 2) end if not attachmentName then error("attachmentName cannot be nil.", 2) end - local slotIndex = skeletonData.nameIndices[slotName] + local slotIndex = skeletonData.slotNameIndices[slotName] if slotIndex == -1 then error("Slot not found: " .. slotName, 2) end if self.skin then local attachment = self.skin:getAttachment(slotIndex, attachmentName) diff --git a/spine-lua/SkeletonData.lua b/spine-lua/SkeletonData.lua index a9e70c29e..00045cdcb 100644 --- a/spine-lua/SkeletonData.lua +++ b/spine-lua/SkeletonData.lua @@ -28,7 +28,7 @@ function SkeletonData.new () local self = { bones = {}, slots = {}, - nameIndices = {}, + slotNameIndices = {}, skins = {}, animations = {} } diff --git a/spine-lua/SkeletonJson.lua b/spine-lua/SkeletonJson.lua index 4fd745629..823869b1a 100644 --- a/spine-lua/SkeletonJson.lua +++ b/spine-lua/SkeletonJson.lua @@ -103,7 +103,7 @@ function SkeletonJson.new (attachmentLoader) slotData.attachmentName = slotMap["attachment"] table.insert(skeletonData.slots, slotData) - skeletonData.nameIndices[slotData.name] = #skeletonData.slots + skeletonData.slotNameIndices[slotData.name] = #skeletonData.slots end end @@ -113,7 +113,7 @@ function SkeletonJson.new (attachmentLoader) for skinName,skinMap in pairs(map) do local skin = Skin.new(skinName) for slotName,slotMap in pairs(skinMap) do - local slotIndex = skeletonData.nameIndices[slotName] + local slotIndex = skeletonData.slotNameIndices[slotName] for attachmentName,attachmentMap in pairs(slotMap) do local attachment = readAttachment(attachmentName, attachmentMap, self.scale) if attachment then @@ -213,7 +213,7 @@ function SkeletonJson.new (attachmentLoader) local slotsMap = map["slots"] if slotsMap then for slotName,timelineMap in pairs(slotsMap) do - local slotIndex = skeletonData.nameIndices[slotName] + local slotIndex = skeletonData.slotNameIndices[slotName] for timelineName,values in pairs(timelineMap) do if timelineName == TIMELINE_COLOR then