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

[lua] Clipping fix, see #1219

Browse Source
This commit is contained in:
badlogic 2018-12-05 16:24:06 +01:00
parent 54bb7b7e5f
commit 183973cfd6
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-corona/main.lua
View File

@ -66,9 +66,9 @@ function loadSkeleton(atlasFile, jsonFile, x, y, scale, animation, skin)
if atlasFile == "spineboy.atlas" then if atlasFile == "spineboy.atlas" then
animationStateData:setMix("walk", "jump", 0.4) animationStateData:setMix("walk", "jump", 0.4)
animationStateData:setMix("jump", "run", 0.4); animationStateData:setMix("jump", "run", 0.4);
animationState:setAnimationByName(0, "portal", true) animationState:setAnimationByName(0, "walk", true)
-- local jumpEntry = animationState:addAnimationByName(0, "jump", false, 3) local jumpEntry = animationState:addAnimationByName(0, "jump", false, 3)
-- animationState:addAnimationByName(0, "run", true, 0) animationState:addAnimationByName(0, "run", true, 0)
elseif atlasFile == "raptor.atlas" then elseif atlasFile == "raptor.atlas" then
--skeleton.vertexEffect = spine.JitterEffect.new(5, 5) --skeleton.vertexEffect = spine.JitterEffect.new(5, 5)
skeleton.vertexEffect = swirl skeleton.vertexEffect = swirl
@ -81,7 +81,7 @@ function loadSkeleton(atlasFile, jsonFile, x, y, scale, animation, skin)
return { skeleton = skeleton, state = animationState } return { skeleton = skeleton, state = animationState }
end end
table.insert(skeletons, loadSkeleton("spineboy.atlas", "spineboy-pro.json", 240, 300, 0.4, "portal")) table.insert(skeletons, loadSkeleton("spineboy.atlas", "spineboy-pro.json", 240, 300, 0.4, "walk"))
table.insert(skeletons, loadSkeleton("stretchyman.atlas", "stretchyman-stretchy-ik-pro.json", 40, 300, 0.5, "sneak")) table.insert(skeletons, loadSkeleton("stretchyman.atlas", "stretchyman-stretchy-ik-pro.json", 40, 300, 0.5, "sneak"))
table.insert(skeletons, loadSkeleton("coin.atlas", "coin-pro.json", 240, 160, 0.4, "animation")) table.insert(skeletons, loadSkeleton("coin.atlas", "coin-pro.json", 240, 160, 0.4, "animation"))
table.insert(skeletons, loadSkeleton("raptor.atlas", "raptor-pro.json", 200, 300, 0.25, "walk")) table.insert(skeletons, loadSkeleton("raptor.atlas", "raptor-pro.json", 200, 300, 0.25, "walk"))

25
spine-lua/SkeletonClipping.lua
View File

@ -34,6 +34,7 @@ local Triangulator = require "spine-lua.Triangulator"
local setmetatable = setmetatable local setmetatable = setmetatable
local math_min = math.min local math_min = math.min
local math_max = math.max local math_max = math.max
local math_abs = math.abs
local ipairs = ipairs local ipairs = ipairs
local table_insert = table.insert local table_insert = table.insert
local table_remove = table.remove local table_remove = table.remove
@ -256,16 +257,28 @@ function SkeletonClipping:clip(x1, y1, x2, y2, x3, y3, clippingArea, output)
-- v1 inside, v2 outside -- v1 inside, v2 outside
local c0 = inputY2 - inputY local c0 = inputY2 - inputY
local c2 = inputX2 - inputX local c2 = inputX2 - inputX
local ua = (c2 * (edgeY - inputY) - c0 * (edgeX - inputX)) / (c0 * (edgeX2 - edgeX) - c2 * (edgeY2 - edgeY)) local s = c0 * (edgeX2 - edgeX) - c2 * (edgeY2 - edgeY)
table_insert(output, edgeX + (edgeX2 - edgeX) * ua) if math_abs(s) > 0.000001 then
table_insert(output, edgeY + (edgeY2 - edgeY) * ua) local ua = (c2 * (edgeY - inputY) - c0 * (edgeX - inputX)) / s
table_insert(output, edgeX + (edgeX2 - edgeX) * ua)
table_insert(output, edgeY + (edgeY2 - edgeY) * ua)
else
table_insert(output, edgeX)
table_insert(output, edgeY)
end
end end
elseif side2 then -- v1 outside, v2 inside elseif side2 then -- v1 outside, v2 inside
local c0 = inputY2 - inputY local c0 = inputY2 - inputY
local c2 = inputX2 - inputX local c2 = inputX2 - inputX
local ua = (c2 * (edgeY - inputY) - c0 * (edgeX - inputX)) / (c0 * (edgeX2 - edgeX) - c2 * (edgeY2 - edgeY)) local s = c0 * (edgeX2 - edgeX) - c2 * (edgeY2 - edgeY)
table_insert(output, edgeX + (edgeX2 - edgeX) * ua) if math_abs(s) > 0.000001 then
table_insert(output, edgeY + (edgeY2 - edgeY) * ua) local ua = (c2 * (edgeY - inputY) - c0 * (edgeX - inputX)) / s
table_insert(output, edgeX + (edgeX2 - edgeX) * ua)
table_insert(output, edgeY + (edgeY2 - edgeY) * ua)
else
table_insert(output, edgeX)
table_insert(output, edgeY)
end
table_insert(output, inputX2) table_insert(output, inputX2)
table_insert(output, inputY2) table_insert(output, inputY2)
end end