UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-07 19:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

[corona] Fixed clipping, closes #1522.

Browse Source
This commit is contained in:
badlogic 2019-10-15 16:27:26 +02:00
parent d31cbcc091
commit 691c795fa0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spine-corona/spine-corona/spine.lua
View File

@ -163,7 +163,7 @@ function spine.Skeleton:updateWorldTransform()
local indices = nil local indices = nil
if slot.bone.active then if slot.bone.active then
local isClippingAttachment = false
if attachment then if attachment then
if attachment.type == spine.AttachmentType.region then if attachment.type == spine.AttachmentType.region then
numVertices = 4 numVertices = 4
@ -183,6 +183,7 @@ function spine.Skeleton:updateWorldTransform()
blendMode = toCoronaBlendMode(slot.data.blendMode) blendMode = toCoronaBlendMode(slot.data.blendMode)
elseif attachment.type == spine.AttachmentType.clipping then elseif attachment.type == spine.AttachmentType.clipping then
self.clipper:clipStart(slot, attachment) self.clipper:clipStart(slot, attachment)
isClippingAttachment = true
end end
if texture and vertices and indices then if texture and vertices and indices then
@ -195,9 +196,9 @@ function spine.Skeleton:updateWorldTransform()
if premultipliedAlpha then multiplier = alpha end if premultipliedAlpha then multiplier = alpha end
color:set(skeletonColor.r * slotColor.r * attachmentColor.r * multiplier, color:set(skeletonColor.r * slotColor.r * attachmentColor.r * multiplier,
skeletonColor.g * slotColor.g * attachmentColor.g * multiplier, skeletonColor.g * slotColor.g * attachmentColor.g * multiplier,
skeletonColor.b * slotColor.b * attachmentColor.b * multiplier, skeletonColor.b * slotColor.b * attachmentColor.b * multiplier,
alpha) alpha)
if not lastTexture then lastTexture = texture end if not lastTexture then lastTexture = texture end
if lastColor.r == -1 then lastColor:setFrom(color) end if lastColor.r == -1 then lastColor:setFrom(color) end
@ -222,9 +223,9 @@ function spine.Skeleton:updateWorldTransform()
end end
self:batch(vertices, uvs, numVertices, indices, groupVertices, groupUvs, groupIndices) self:batch(vertices, uvs, numVertices, indices, groupVertices, groupUvs, groupIndices)
end
self.clipper:clipEnd(slot) end
if not isClippingAttachment then self.clipper:clipEnd(slot) end
end end
end end
end end