This commit is contained in:
badlogic 2016-09-02 16:45:02 +02:00
commit c06d62bae8

View File

@ -106,18 +106,21 @@ var skinsDemo = function(loadingComplete, bgColor) {
start: function (trackIndex) { start: function (trackIndex) {
setupAnimations(state); setupAnimations(state);
}, },
end: function (trackIndex) { } end: function (trackIndex) {}
}; };
state.setAnimation(1, "empty", false, 0);
state.addAnimation(1, "meleeSwing1", false, 4); state.addAnimation(1, "meleeSwing1", false, 4);
state.setAnimation(2, "empty", false, 0);
state.addAnimation(2, "meleeSwing1", false, 7.5); state.addAnimation(2, "meleeSwing1", false, 7.5);
state.setAnimation(3, "empty", false, 0);
state.addAnimation(3, "meleeSwing2", false, 10.5); state.addAnimation(3, "meleeSwing2", false, 10.5);
state.addAnimation(3, "meleeSwing1", false, 0); state.addAnimation(3, "meleeSwing1", false, 0);
state.addAnimation(3, "meleeSwing2", false, 0); state.addAnimation(3, "meleeSwing2", false, 0);
state.addAnimation(4, "hideSword", false, 0); state.setAnimation(4, "hideSword", false, 0);
state.addAnimation(4, "hideSword", false, 19.15); state.addAnimation(4, "hideSword", false, 19.15);
} }
@ -148,6 +151,14 @@ var skinsDemo = function(loadingComplete, bgColor) {
randomizeSkins = document.getElementById("skinsdemo-randomizeskins"); randomizeSkins = document.getElementById("skinsdemo-randomizeskins");
} }
function setSkin (skin) {
var slot = skeleton.findSlot("item_near");
var weapon = slot.getAttachment();
skeleton.setSkin(skin);
skeleton.setSlotsToSetupPose();
slot.setAttachment(weapon);
}
function randomizeSkin() { function randomizeSkin() {
var result; var result;
var count = 0; var count = 0;
@ -157,8 +168,7 @@ var skinsDemo = function(loadingComplete, bgColor) {
result = skeleton.data.skins[skin]; result = skeleton.data.skins[skin];
} }
} }
skeleton.setSkin(result); setSkin(result);
skeleton.setSlotsToSetupPose();
$("#skinsdemo-active-skin option").filter(function() { $("#skinsdemo-active-skin option").filter(function() {
return ($(this).text() == result.name); return ($(this).text() == result.name);
}).prop("selected", true); }).prop("selected", true);
@ -180,8 +190,7 @@ var skinsDemo = function(loadingComplete, bgColor) {
newSkin.addAttachment(slot, attachmentName, attachments[attachmentName]); newSkin.addAttachment(slot, attachmentName, attachments[attachmentName]);
} }
} }
skeleton.setSkin(newSkin); setSkin(newSkin);
skeleton.setSlotsToSetupPose();
randomizeSkins.checked = false; randomizeSkins.checked = false;
} }