From c346ffa18ac0ffa26bb5d3f699cba2bc15308889 Mon Sep 17 00:00:00 2001 From: JannisX11 Date: Tue, 10 Jan 2023 19:40:02 +0100 Subject: [PATCH] Fix #1686 skin poses inconsistent when cubes invisible --- js/io/formats/skin.js | 14 +++++++------- js/preview/screenshot.js | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/js/io/formats/skin.js b/js/io/formats/skin.js index b912b809..7b8ef2cd 100644 --- a/js/io/formats/skin.js +++ b/js/io/formats/skin.js @@ -457,11 +457,6 @@ Interface.definePanels(function() { Group.all.forEach(group => { if (!group.skin_original_origin) return; let offset = group.origin.slice().V3_subtract(group.skin_original_origin); - group.forEachChild(cube => { - cube.from.V3_add(offset); - cube.to.V3_add(offset); - cube.origin.V3_add(offset); - }, Cube) group.origin.V3_set(group.skin_original_origin); }) this.pose = pose; @@ -471,10 +466,15 @@ Interface.definePanels(function() { let group = Group.all.find(g => g.name == name); if (group) { group.extend({rotation: angles[name].rotation || angles[name]}); - if (angles[name].offset) group.origin.V3_add(angles[name].offset); + if (angles[name].offset) { + group.origin.V3_add(angles[name].offset); + } } } - Canvas.updateAllBones(); + Canvas.updateView({ + groups: Group.all, + group_aspects: {transform: true} + }) } }, template: ` diff --git a/js/preview/screenshot.js b/js/preview/screenshot.js index 34dcad90..89e32feb 100644 --- a/js/preview/screenshot.js +++ b/js/preview/screenshot.js @@ -355,7 +355,6 @@ const Screencam = { Blockbench.setProgress(getProgress()); frame_label.textContent = frames + ' - ' + (interval*frames/1000).toFixed(2) + 's'; - console.log(getProgress()) if (getProgress() >= 1) { endRecording(true); return;