From fef21906f52ba621fc825f4838ac0a4d5d9571de Mon Sep 17 00:00:00 2001 From: Louka Date: Sun, 3 Apr 2022 11:18:44 -0400 Subject: [PATCH 1/2] Fix ambiguous usage of "Legs" - Leg in tracker roles is now knee - Legs in SteamVR trackers to enable is now Feet --- src/main/java/dev/slimevr/gui/VRServerGUI.java | 2 +- .../platform/windows/WindowsSteamVRPipeInputBridge.java | 4 ++-- .../dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java | 8 ++++---- .../java/dev/slimevr/vr/trackers/TrackerPosition.java | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/dev/slimevr/gui/VRServerGUI.java b/src/main/java/dev/slimevr/gui/VRServerGUI.java index 92dd51475..aba762c51 100644 --- a/src/main/java/dev/slimevr/gui/VRServerGUI.java +++ b/src/main/java/dev/slimevr/gui/VRServerGUI.java @@ -300,7 +300,7 @@ public class VRServerGUI extends JFrame { }); JCheckBox legsCb; - add(legsCb = new JCheckBox("Legs"), c(2, 1)); + add(legsCb = new JCheckBox("Feet"), c(2, 1)); legsCb.setSelected(br.getShareSetting(TrackerRole.LEFT_FOOT) && br.getShareSetting(TrackerRole.RIGHT_FOOT)); legsCb.addActionListener(new ActionListener() { @Override diff --git a/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java index 25498eb65..ea65f2427 100644 --- a/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java @@ -273,8 +273,8 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { RIGHT_SHOULDER(TrackerPosition.NONE), LEFT_ELBOW(TrackerPosition.LEFT_FOREARM), RIGHT_ELBOW(TrackerPosition.RIGHT_FOREARM), - LEFT_KNEE(TrackerPosition.LEFT_LEG), - RIGHT_KNEE(TrackerPosition.RIGHT_LEG), + LEFT_KNEE(TrackerPosition.LEFT_KNEE), + RIGHT_KNEE(TrackerPosition.RIGHT_KNEE), WAIST(TrackerPosition.WAIST), CHEST(TrackerPosition.CHEST), ; 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 6ca98ec9c..a2d8ca99f 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -220,12 +220,12 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb this.waistTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.WAIST, TrackerPosition.HIP, TrackerPosition.CHEST); this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.HIP, TrackerPosition.WAIST, TrackerPosition.CHEST); - this.leftLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_LEG, TrackerPosition.LEFT_ANKLE, null); - this.leftAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_ANKLE, TrackerPosition.LEFT_LEG, null); + this.leftLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_KNEE, TrackerPosition.LEFT_ANKLE, null); + this.leftAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_ANKLE, TrackerPosition.LEFT_KNEE, null); this.leftFootTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.LEFT_FOOT); - this.rightLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_LEG, TrackerPosition.RIGHT_ANKLE, null); - this.rightAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_ANKLE, TrackerPosition.RIGHT_LEG, null); + this.rightLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_KNEE, TrackerPosition.RIGHT_ANKLE, null); + this.rightAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_ANKLE, TrackerPosition.RIGHT_KNEE, null); this.rightFootTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.RIGHT_FOOT); this.leftHandTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.LEFT_CONTROLLER); diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java index f99730ae5..4b56c997c 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java @@ -11,8 +11,8 @@ public enum TrackerPosition { CHEST("body:chest", TrackerRole.CHEST), WAIST("body:waist", TrackerRole.WAIST), HIP("body:hip", null), - LEFT_LEG("body:left_leg", TrackerRole.LEFT_KNEE), - RIGHT_LEG("body:right_leg", TrackerRole.RIGHT_KNEE), + LEFT_KNEE("body:left_knee", TrackerRole.LEFT_KNEE), + RIGHT_KNEE("body:right_knee", TrackerRole.RIGHT_KNEE), LEFT_ANKLE("body:left_ankle", null), RIGHT_ANKLE("body:right_ankle", null), LEFT_FOOT("body:left_foot", TrackerRole.LEFT_FOOT), From 758f9e8f2ff20c6e6558dbb907917b3bcceee4d7 Mon Sep 17 00:00:00 2001 From: Louka Date: Sun, 3 Apr 2022 11:44:40 -0400 Subject: [PATCH 2/2] support old configs + rename in skeleton --- .../vr/processor/skeleton/SimpleSkeleton.java | 24 +++++++++---------- .../slimevr/vr/trackers/TrackerPosition.java | 8 +++++++ 2 files changed, 20 insertions(+), 12 deletions(-) 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 a2d8ca99f..8dcdb3bff 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -72,11 +72,11 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb protected Tracker waistTracker; protected Tracker hipTracker; - protected Tracker leftLegTracker; + protected Tracker leftKneeTracker; protected Tracker leftAnkleTracker; protected Tracker leftFootTracker; - protected Tracker rightLegTracker; + protected Tracker rightKneeTracker; protected Tracker rightAnkleTracker; protected Tracker rightFootTracker; @@ -220,11 +220,11 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb this.waistTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.WAIST, TrackerPosition.HIP, TrackerPosition.CHEST); this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.HIP, TrackerPosition.WAIST, TrackerPosition.CHEST); - this.leftLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_KNEE, TrackerPosition.LEFT_ANKLE, null); + this.leftKneeTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_KNEE, TrackerPosition.LEFT_ANKLE, null); this.leftAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.LEFT_ANKLE, TrackerPosition.LEFT_KNEE, null); this.leftFootTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.LEFT_FOOT); - this.rightLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_KNEE, TrackerPosition.RIGHT_ANKLE, null); + this.rightKneeTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_KNEE, TrackerPosition.RIGHT_ANKLE, null); this.rightAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(trackers, TrackerPosition.RIGHT_ANKLE, TrackerPosition.RIGHT_KNEE, null); this.rightFootTracker = TrackerUtils.findTrackerForBodyPosition(trackers, TrackerPosition.RIGHT_FOOT); @@ -388,11 +388,11 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb Tracker waistTracker = trackerPreUpdate(this.waistTracker); Tracker hipTracker = trackerPreUpdate(this.hipTracker); - Tracker leftLegTracker = trackerPreUpdate(this.leftLegTracker); + Tracker leftKneeTracker = trackerPreUpdate(this.leftKneeTracker); Tracker leftAnkleTracker = trackerPreUpdate(this.leftAnkleTracker); Tracker leftFootTracker = trackerPreUpdate(this.leftFootTracker); - Tracker rightLegTracker = trackerPreUpdate(this.rightLegTracker); + Tracker rightKneeTracker = trackerPreUpdate(this.rightKneeTracker); Tracker rightAnkleTracker = trackerPreUpdate(this.rightAnkleTracker); Tracker rightFootTracker = trackerPreUpdate(this.rightFootTracker); @@ -447,11 +447,11 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb } // Left Leg - leftLegTracker.getRotation(rotBuf1); + leftKneeTracker.getRotation(rotBuf1); leftAnkleTracker.getRotation(rotBuf2); if(extendedKneeModel) - calculateKneeLimits(rotBuf1, rotBuf2, leftLegTracker.getConfidenceLevel(), leftAnkleTracker.getConfidenceLevel()); + calculateKneeLimits(rotBuf1, rotBuf2, leftKneeTracker.getConfidenceLevel(), leftAnkleTracker.getConfidenceLevel()); leftHipNode.localTransform.setRotation(rotBuf1); leftKneeNode.localTransform.setRotation(rotBuf2); @@ -469,11 +469,11 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb } // Right Leg - rightLegTracker.getRotation(rotBuf1); + rightKneeTracker.getRotation(rotBuf1); rightAnkleTracker.getRotation(rotBuf2); if(extendedKneeModel) - calculateKneeLimits(rotBuf1, rotBuf2, rightLegTracker.getConfidenceLevel(), rightAnkleTracker.getConfidenceLevel()); + calculateKneeLimits(rotBuf1, rotBuf2, rightKneeTracker.getConfidenceLevel(), rightAnkleTracker.getConfidenceLevel()); rightHipNode.localTransform.setRotation(rotBuf1); rightKneeNode.localTransform.setRotation(rotBuf2); @@ -924,9 +924,9 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb Tracker[] getTrackerToReset(){ return new Tracker[] {trackerPreUpdate(this.chestTracker), trackerPreUpdate(this.waistTracker), - trackerPreUpdate(this.hipTracker), trackerPreUpdate(this.leftLegTracker), + trackerPreUpdate(this.hipTracker), trackerPreUpdate(this.leftKneeTracker), trackerPreUpdate(this.leftAnkleTracker), trackerPreUpdate(this.leftFootTracker), - trackerPreUpdate(this.rightLegTracker), trackerPreUpdate(this.rightAnkleTracker), + trackerPreUpdate(this.rightKneeTracker), trackerPreUpdate(this.rightAnkleTracker), trackerPreUpdate(this.rightFootTracker), trackerPreUpdate(this.rightForearmTracker), trackerPreUpdate(this.leftForearmTracker), trackerPreUpdate(this.rightUpperArmTracker), trackerPreUpdate(this.leftUpperArmTracker)}; diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java index 4b56c997c..ac53b064e 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java @@ -4,6 +4,8 @@ import java.util.EnumMap; import java.util.HashMap; import java.util.Map; +import io.eiren.util.logging.LogManager; + public enum TrackerPosition { NONE("", TrackerRole.NONE), @@ -38,6 +40,12 @@ public enum TrackerPosition { } public static TrackerPosition getByDesignation(String designation) { + // Support old configs. leg was renamed to knee. + if(designation.equals("body:left_leg")) + designation = "body:left_knee"; + if(designation.equals("body:right_leg")) + designation = "body:right_knee"; + return designation == null ? null : byDesignation.get(designation.toLowerCase()); }