From b11492c3f387974ccb73cebd62f04ee3bccd3d0f Mon Sep 17 00:00:00 2001 From: Louka Date: Thu, 10 Mar 2022 01:07:35 -0500 Subject: [PATCH] minor cleanup removed skeleton offset for arms; useless --- .../vr/processor/skeleton/SimpleSkeleton.java | 16 ++++++---------- .../vr/processor/skeleton/SkeletonConfig.java | 2 +- .../processor/skeleton/SkeletonConfigValue.java | 2 +- 3 files changed, 8 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 b6961105e..d388235d1 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -877,8 +877,6 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb Tracker rightAnkleTracker = trackerPreUpdate(this.rightAnkleTracker); Tracker rightFootTracker = trackerPreUpdate(this.rightFootTracker); - Tracker leftHandTracker = trackerPreUpdate(this.leftHandTracker); - Tracker rightHandTracker = trackerPreUpdate(this.rightHandTracker); Tracker rightElbowTracker = trackerPreUpdate(this.rightElbowTracker); Tracker leftElbowTracker = trackerPreUpdate(this.leftElbowTracker); //#endregion @@ -887,9 +885,6 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb // so trackers that don't need adjustments could be used too Quaternion referenceRotation = new Quaternion(); hmdTracker.getRotation(referenceRotation); - - leftElbowTracker.resetFull(referenceRotation); - rightElbowTracker.resetFull(referenceRotation); chestTracker.resetFull(referenceRotation); chestTracker.getRotation(referenceRotation); @@ -920,6 +915,9 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb rightFootTracker.resetFull(referenceRotation); } + leftElbowTracker.resetFull(referenceRotation); + rightElbowTracker.resetFull(referenceRotation); + } @Override @@ -940,8 +938,6 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb Tracker rightAnkleTracker = trackerPreUpdate(this.rightAnkleTracker); Tracker rightFootTracker = trackerPreUpdate(this.rightFootTracker); - Tracker leftHandTracker = trackerPreUpdate(this.leftHandTracker); - Tracker rightHandTracker = trackerPreUpdate(this.rightHandTracker); Tracker rightElbowTracker = trackerPreUpdate(this.rightElbowTracker); Tracker leftElbowTracker = trackerPreUpdate(this.leftElbowTracker); //#endregion @@ -950,9 +946,6 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb // so trackers that don't need adjustments could be used too Quaternion referenceRotation = new Quaternion(); hmdTracker.getRotation(referenceRotation); - - leftElbowTracker.resetYaw(referenceRotation); - rightElbowTracker.resetYaw(referenceRotation); chestTracker.resetYaw(referenceRotation); chestTracker.getRotation(referenceRotation); @@ -983,5 +976,8 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb rightFootTracker.resetYaw(referenceRotation); } + leftElbowTracker.resetYaw(referenceRotation); + rightElbowTracker.resetYaw(referenceRotation); + } } 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 9efb67d28..18fbc34f3 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java @@ -259,7 +259,7 @@ public class SkeletonConfig { setNodeOffset(nodeOffset, 0, getConfig(SkeletonConfigValue.ELBOW_DISTANCE), 0); break; case ELBOW_TRACKER: - setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.SKELETON_OFFSET)); + setNodeOffset(nodeOffset, 0, 0, 0); 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 31b64190f..1a6d55e91 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java @@ -16,7 +16,7 @@ public enum SkeletonConfigValue { KNEE_HEIGHT("Knee height", "kneeHeight", "Knee height", 0.44f, new SkeletonNodeOffset[]{SkeletonNodeOffset.KNEE, SkeletonNodeOffset.ANKLE}), FOOT_LENGTH("Foot length", "footLength", "Foot length", 0.05f, new SkeletonNodeOffset[]{SkeletonNodeOffset.FOOT}), 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, SkeletonNodeOffset.ELBOW_TRACKER}), + SKELETON_OFFSET("Skeleton offset", "skeletonOffset", "Skeleton offset", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.CHEST_TRACKER, SkeletonNodeOffset.HIP_TRACKER, SkeletonNodeOffset.KNEE_TRACKER, SkeletonNodeOffset.FOOT_TRACKER}), CONTROLLER_DISTANCE("Controller distance", "controllerDistance", "Controller distance", 0.15f, new SkeletonNodeOffset[]{SkeletonNodeOffset.HAND}), ELBOW_DISTANCE("Elbow distance", "elbowDistance", "Elbow distance", 0.3f, new SkeletonNodeOffset[]{SkeletonNodeOffset.ELBOW}), ;