From b98eafb66feece9ffdba87f004faeda620a69205 Mon Sep 17 00:00:00 2001 From: Louka Date: Fri, 7 Jan 2022 09:12:06 -0500 Subject: [PATCH] Remove vertical foot offset Only keep skeleton offset --- src/main/java/dev/slimevr/autobone/AutoBone.java | 4 +--- .../vr/processor/skeleton/SimpleSkeleton.java | 14 +++----------- .../vr/processor/skeleton/SkeletonConfig.java | 4 ++-- .../vr/processor/skeleton/SkeletonConfigValue.java | 3 +-- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/main/java/dev/slimevr/autobone/AutoBone.java b/src/main/java/dev/slimevr/autobone/AutoBone.java index cebc696a0..d10809eb9 100644 --- a/src/main/java/dev/slimevr/autobone/AutoBone.java +++ b/src/main/java/dev/slimevr/autobone/AutoBone.java @@ -135,9 +135,7 @@ public class AutoBone { // Keep "feet" at ankles staticConfigs.put(SkeletonConfigValue.FOOT_LENGTH, 0f); - staticConfigs.put(SkeletonConfigValue.FOOT_OFFSET_Y, 0f); - staticConfigs.put(SkeletonConfigValue.FOOT_OFFSET_Z, 0f); - + staticConfigs.put(SkeletonConfigValue.FOOT_OFFSET, 0f); staticConfigs.put(SkeletonConfigValue.SKELETON_OFFSET, 0f); } diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java index 73d22ebd0..6a9eae2a4 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -624,12 +624,7 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb rightFootNode.update(); updateComputedTrackers(); break; - case FOOT_OFFSET_Y: - trackerLeftFootNode.update(); - trackerRightFootNode.update(); - updateComputedTrackers(); - break; - case FOOT_OFFSET_Z: + case FOOT_OFFSET: leftAnkleNode.update(); rightAnkleNode.update(); updateComputedTrackers(); @@ -698,11 +693,8 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb case FOOT_LENGTH: skeletonConfig.setConfig(SkeletonConfigValue.FOOT_LENGTH, null); break; - case FOOT_OFFSET_Y: - skeletonConfig.setConfig(SkeletonConfigValue.FOOT_OFFSET_Y, null); - break; - case FOOT_OFFSET_Z: - skeletonConfig.setConfig(SkeletonConfigValue.FOOT_OFFSET_Z, null); + case FOOT_OFFSET: + skeletonConfig.setConfig(SkeletonConfigValue.FOOT_OFFSET, null); break; case SKELETON_OFFSET: skeletonConfig.setConfig(SkeletonConfigValue.SKELETON_OFFSET, null); diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java index 2eedf0f2b..98fe4f160 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java @@ -243,13 +243,13 @@ public class SkeletonConfig { setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.SKELETON_OFFSET)); break; case ANKLE: - setNodeOffset(nodeOffset, 0, -getConfig(SkeletonConfigValue.KNEE_HEIGHT), -getConfig(SkeletonConfigValue.FOOT_OFFSET_Z)); + setNodeOffset(nodeOffset, 0, -getConfig(SkeletonConfigValue.KNEE_HEIGHT), -getConfig(SkeletonConfigValue.FOOT_OFFSET)); break; case FOOT: setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.FOOT_LENGTH)); break; case FOOT_TRACKER: - setNodeOffset(nodeOffset, 0, getConfig(SkeletonConfigValue.FOOT_OFFSET_Y), -getConfig(SkeletonConfigValue.SKELETON_OFFSET)); + setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.SKELETON_OFFSET)); break; } } diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java index 8dc3c439b..120fbf7e3 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java @@ -15,8 +15,7 @@ public enum SkeletonConfigValue { LEGS_LENGTH("Legs length", "legsLength", "Legs length", 0.86f, new SkeletonNodeOffset[]{SkeletonNodeOffset.KNEE}), KNEE_HEIGHT("Knee height", "kneeHeight", "Knee height", 0.43f, new SkeletonNodeOffset[]{SkeletonNodeOffset.KNEE, SkeletonNodeOffset.ANKLE}), FOOT_LENGTH("Foot length", "footLength", "Foot length", 0.05f, new SkeletonNodeOffset[]{SkeletonNodeOffset.FOOT}), - FOOT_OFFSET_Y("Foot offset y", "footOffsetY", "Foot offset y", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.FOOT_TRACKER}), - FOOT_OFFSET_Z("Foot offset z", "footOffsetZ", "Foot offset z", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.ANKLE}), + FOOT_OFFSET("Foot offset", "footOffset", "Foot offset", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.ANKLE}), SKELETON_OFFSET("Skeleton offset", "skeletonOffset", "Skeleton offset", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.CHEST_TRACKER, SkeletonNodeOffset.HIP_TRACKER, SkeletonNodeOffset.KNEE_TRACKER, SkeletonNodeOffset.FOOT_TRACKER}), ;