From 89e2ea610a33e2f0350307f527e8bf0ffc2b4251 Mon Sep 17 00:00:00 2001 From: ButterscotchVanilla Date: Mon, 16 Aug 2021 03:44:18 -0400 Subject: [PATCH] AutoBone: Automatically update node positions --- .../java/io/eiren/gui/autobone/AutoBone.java | 23 ++++---------- .../io/eiren/gui/autobone/SimpleSkeleton.java | 30 +++++++++++++++++++ 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/main/java/io/eiren/gui/autobone/AutoBone.java b/src/main/java/io/eiren/gui/autobone/AutoBone.java index eac995fa4..8d3dafc42 100644 --- a/src/main/java/io/eiren/gui/autobone/AutoBone.java +++ b/src/main/java/io/eiren/gui/autobone/AutoBone.java @@ -91,12 +91,6 @@ public class AutoBone { configs.put("Knee height", server.config.getFloat("body.kneeHeight", 0.42f)); } - public void setSkeletonLengths(SimpleSkeleton skeleton) { - for (Entry entry : configs.entrySet()) { - skeleton.setSkeletonConfig(entry.getKey(), entry.getValue()); - } - } - @ThreadSafe public void skeletonUpdated(HumanSkeleton newSkeleton) { if (newSkeleton instanceof HumanSkeletonWithLegs) { @@ -232,7 +226,7 @@ public class AutoBone { float adjustRate = epoch >= 0 ? (float)(initialAdjustRate / Math.pow(adjustRateDecay, epoch)) : 0f; - for (int cursorOffset = minDataDistance; cursorOffset <= maxDataDistance && cursorOffset < frames.length ; cursorOffset++) { + for (int cursorOffset = minDataDistance; cursorOffset <= maxDataDistance && cursorOffset < frames.length; cursorOffset++) { for (int frameCursor = 0; frameCursor < frames.length - cursorOffset; frameCursor += cursorIncrement) { PoseFrame frame1 = frames[frameCursor]; PoseFrame frame2 = frames[frameCursor + cursorOffset]; @@ -242,15 +236,13 @@ public class AutoBone { continue; } - setSkeletonLengths(skeleton1); - setSkeletonLengths(skeleton2); + configSet = configs.entrySet(); + skeleton1.setSkeletonConfigs(configSet); + skeleton2.setSkeletonConfigs(configSet); skeleton1.setPoseFromFrame(frame1); skeleton2.setPoseFromFrame(frame2); - skeleton1.updatePose(); - skeleton2.updatePose(); - float totalLength = getLengthSum(configs); float curHeight = getHeight(configs); float errorDeriv = getErrorDeriv(skeleton1, skeleton2, targetHeight - curHeight); @@ -362,10 +354,7 @@ public class AutoBone { } protected void updateSkeletonBoneLength(SimpleSkeleton skeleton1, SimpleSkeleton skeleton2, String joint, float newLength) { - skeleton1.setSkeletonConfig(joint, newLength); - skeleton2.setSkeletonConfig(joint, newLength); - - skeleton1.updatePose(); - skeleton2.updatePose(); + skeleton1.setSkeletonConfig(joint, newLength, true); + skeleton2.setSkeletonConfig(joint, newLength, true); } } diff --git a/src/main/java/io/eiren/gui/autobone/SimpleSkeleton.java b/src/main/java/io/eiren/gui/autobone/SimpleSkeleton.java index 7029eeb55..710fbf464 100644 --- a/src/main/java/io/eiren/gui/autobone/SimpleSkeleton.java +++ b/src/main/java/io/eiren/gui/autobone/SimpleSkeleton.java @@ -134,6 +134,8 @@ public class SimpleSkeleton { targetNode.localTransform.setRotation(rotation.getValue()); } } + + updatePose(); } public void setSkeletonConfigs(Iterable> configs) { @@ -143,28 +145,48 @@ public class SimpleSkeleton { } public void setSkeletonConfig(String joint, float newLength) { + setSkeletonConfig(joint, newLength, false); + } + + public void setSkeletonConfig(String joint, float newLength, boolean updatePose) { switch(joint) { case "Head": headShift = newLength; headNode.localTransform.setTranslation(0, 0, headShift); + if (updatePose) { + headNode.update(); + } break; case "Neck": neckLength = newLength; neckNode.localTransform.setTranslation(0, -neckLength, 0); + if (updatePose) { + neckNode.update(); + } break; case "Waist": waistDistance = newLength; waistNode.localTransform.setTranslation(0, -(waistDistance - chestDistance), 0); + if (updatePose) { + waistNode.update(); + } break; case "Chest": chestDistance = newLength; chestNode.localTransform.setTranslation(0, -chestDistance, 0); waistNode.localTransform.setTranslation(0, -(waistDistance - chestDistance), 0); + if (updatePose) { + chestNode.update(); + } break; case "Hips width": hipsWidth = newLength; leftHipNode.localTransform.setTranslation(-hipsWidth / 2, 0, 0); rightHipNode.localTransform.setTranslation(hipsWidth / 2, 0, 0); + if (updatePose) { + leftHipNode.update(); + rightHipNode.update(); + } break; case "Knee height": kneeHeight = newLength; @@ -172,11 +194,19 @@ public class SimpleSkeleton { rightAnkleNode.localTransform.setTranslation(0, -kneeHeight, 0); leftKneeNode.localTransform.setTranslation(0, -(legsLength - kneeHeight), 0); rightKneeNode.localTransform.setTranslation(0, -(legsLength - kneeHeight), 0); + if (updatePose) { + leftKneeNode.update(); + rightKneeNode.update(); + } break; case "Legs length": legsLength = newLength; leftKneeNode.localTransform.setTranslation(0, -(legsLength - kneeHeight), 0); rightKneeNode.localTransform.setTranslation(0, -(legsLength - kneeHeight), 0); + if (updatePose) { + leftKneeNode.update(); + rightKneeNode.update(); + } break; } }