From 0cd65c825ca81bee029d30381ebecf7df6bce5dc Mon Sep 17 00:00:00 2001 From: Louka Date: Wed, 23 Mar 2022 18:04:09 -0400 Subject: [PATCH] Align spine yaw with HMD when no spine tracker issue https://github.com/SlimeVR/SlimeVR-Server/issues/61 --- .../vr/processor/skeleton/SimpleSkeleton.java | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 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 e9aa84288..0279ec6d3 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -113,6 +113,8 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb protected final Vector3f ankleVector = new Vector3f(); protected final Quaternion kneeRotation = new Quaternion(); + + private boolean hasSpineTracker; //#endregion //#region Constructors @@ -392,6 +394,8 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb Tracker leftElbowTracker = trackerPreUpdate(this.leftElbowTracker); //#endregion + hasSpineTracker = chestTracker.hasRotation() || waistTracker.hasRotation() || hipTracker.hasRotation(); + if(hmdTracker != null) { if(hmdTracker.getPosition(posBuf)) { hmdNode.localTransform.setTranslation(posBuf); @@ -407,17 +411,29 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb headNode.localTransform.setRotation(Quaternion.IDENTITY); } - if(chestTracker.getRotation(rotBuf1)) { - neckNode.localTransform.setRotation(rotBuf1); + // Spine + if(hasSpineTracker){ + if(chestTracker.getRotation(rotBuf1)) { + neckNode.localTransform.setRotation(rotBuf1); + } + if(waistTracker.getRotation(rotBuf1)) { + chestNode.localTransform.setRotation(rotBuf1); + trackerChestNode.localTransform.setRotation(rotBuf1); + } + if(hipTracker.getRotation(rotBuf1)) { + waistNode.localTransform.setRotation(rotBuf1); + hipNode.localTransform.setRotation(rotBuf1); + trackerWaistNode.localTransform.setRotation(rotBuf1); + } } - if(waistTracker.getRotation(rotBuf1)) { + else if(hmdTracker != null){ // If no spine tracker, allign spine yaw with HMD + rotBuf1 = new Quaternion().fromAngles(0, (FastMath.atan2(rotBuf1.getY(), rotBuf1.getW())/2f)*4, 0); + neckNode.localTransform.setRotation(rotBuf1); chestNode.localTransform.setRotation(rotBuf1); trackerChestNode.localTransform.setRotation(rotBuf1); - } - if(hipTracker.getRotation(rotBuf1)) { waistNode.localTransform.setRotation(rotBuf1); - trackerWaistNode.localTransform.setRotation(rotBuf1); hipNode.localTransform.setRotation(rotBuf1); + trackerWaistNode.localTransform.setRotation(rotBuf1); } // Left Leg