UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-09 16:48:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Ported AnimationState changes

Browse Source
This commit is contained in:
badlogic 2016-11-24 13:00:46 +01:00
parent a7fe570148
commit aca4060fad
4 changed files with 8637 additions and 8629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spine-corona/main.lua
View File

@ -61,7 +61,15 @@ function loadSkeleton(atlasFile, jsonFile, x, y, scale, animation, skin)
print(entry.trackIndex.." event: "..entry.animation.name..", "..event.data.name..", "..event.intValue..", "..event.floatValue..", '"..(event.stringValue or "").."'") print(entry.trackIndex.." event: "..entry.animation.name..", "..event.data.name..", "..event.intValue..", "..event.floatValue..", '"..(event.stringValue or "").."'")
end end
animationState:setAnimationByName(0, animation, true) if atlasFile == "spineboy.atlas" then
animationStateData:setMix("walk", "jump", 0.4)
animationStateData:setMix("jump", "run", 0.4);
animationState:setAnimationByName(0, "walk", true)
local jumpEntry = animationState:addAnimationByName(0, "jump", false, 3)
animationState:addAnimationByName(0, "run", true, 0)
else
animationState:setAnimationByName(0, animation, true)
end
-- return the skeleton an animation state -- return the skeleton an animation state
return { skeleton = skeleton, state = animationState } return { skeleton = skeleton, state = animationState }

2666
spine-ts/build/spine-webgl.d.ts vendored
View File

File diff suppressed because it is too large Load Diff

14588
spine-ts/build/spine-webgl.js
View File

File diff suppressed because it is too large Load Diff

2
spine-ts/webgl/example/index.html
View File

@ -123,7 +123,7 @@ function loadSkeleton (name, initialAnimation, premultipliedAlpha, skin) {
animationStateData.setMix("jump", "run", 0.4); animationStateData.setMix("jump", "run", 0.4);
animationState.setAnimation(0, "walk", true); animationState.setAnimation(0, "walk", true);
var jumpEntry = animationState.addAnimation(0, "jump", false, 3); var jumpEntry = animationState.addAnimation(0, "jump", false, 3);
animationState.addAnimation(0, "run", true); animationState.addAnimation(0, "run", true, 0);
} else { } else {
animationState.setAnimation(0, initialAnimation, true); animationState.setAnimation(0, initialAnimation, true);
} }