From e19cec4d3e58878aad66e29b99beca91c21097a1 Mon Sep 17 00:00:00 2001 From: Louka Date: Sat, 20 Nov 2021 00:04:33 -0500 Subject: [PATCH 1/6] Initial commit added hip tracking support. Independent from waist. Has a hip length value going from waist to hip. Legs depend on hip instead of waist should work normally without hip tracker. Should work just fine with a virtual waist offset. --- .../java/dev/slimevr/gui/SkeletonConfig.java | 7 +++ .../vr/processor/HumanSkeletonWithLegs.java | 6 +-- .../vr/processor/HumanSkeletonWithWaist.java | 46 ++++++++++++++++--- .../io/eiren/vr/trackers/TrackerPosition.java | 1 + 4 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/main/java/dev/slimevr/gui/SkeletonConfig.java b/src/main/java/dev/slimevr/gui/SkeletonConfig.java index 7632d1c24..75170241f 100644 --- a/src/main/java/dev/slimevr/gui/SkeletonConfig.java +++ b/src/main/java/dev/slimevr/gui/SkeletonConfig.java @@ -117,6 +117,13 @@ public class SkeletonConfig extends EJBagNoStretch { add(new TimedResetButton("Reset", "Waist"), c(4, row, 2)); row++; + add(new JLabel("Hip"), c(0, row, 2)); + add(new AdjButton("+", "Hip", 0.01f), c(1, row, 2)); + add(new SkeletonLabel("Hip"), c(2, row, 2)); + add(new AdjButton("-", "Hip", -0.01f), c(3, row, 2)); + add(new ResetButton("Reset", "Hip"), c(4, row, 2)); + row++; + add(new JLabel("Hips width"), c(0, row, 2)); add(new AdjButton("+", "Hips width", 0.01f), c(1, row, 2)); add(new SkeletonLabel("Hips width"), c(2, row, 2)); diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java index bc251dfd4..99607eca8 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java @@ -111,10 +111,10 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist { //extendedPelvisModel = server.config.getBoolean("body.model.extendedPelvis", extendedPelvisModel); extendedKneeModel = server.config.getBoolean("body.model.extendedKnee", extendedKneeModel); - waistNode.attachChild(leftHipNode); + hipNode.attachChild(leftHipNode); leftHipNode.localTransform.setTranslation(-hipsWidth / 2, 0, 0); - waistNode.attachChild(rightHipNode); + hipNode.attachChild(rightHipNode); rightHipNode.localTransform.setTranslation(hipsWidth / 2, 0, 0); leftHipNode.attachChild(leftKneeNode); @@ -290,7 +290,7 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist { kneeBuf.nlerp(hipBuf, 0.5f); chestNode.localTransform.getRotation(hipBuf); kneeBuf.nlerp(hipBuf, 0.3333333f); - waistNode.localTransform.setRotation(kneeBuf); + hipNode.localTransform.setRotation(kneeBuf); // TODO : Use vectors to add like 50% of wasit tracker yaw to waist node to reduce drift and let user take weird poses // TODO Set virtual waist node yaw to that of waist node } diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java index e1ea128c8..976a13625 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java @@ -29,6 +29,7 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { protected final Tracker waistTracker; protected final Tracker chestTracker; + protected final Tracker hipTracker; protected final HMDTracker hmdTracker; protected final ComputedHumanPoseTracker computedWaistTracker; protected final ComputedHumanPoseTracker computedChestTracker; @@ -38,12 +39,17 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { protected final TransformNode waistNode = new TransformNode("Waist", false); protected final TransformNode chestNode = new TransformNode("Chest", false); protected final TransformNode trackerWaistNode = new TransformNode("Waist-Tracker", false); + protected final TransformNode hipNode = new TransformNode("Hip", false); protected float chestDistance = 0.42f; /** * Distance from eyes to waist */ protected float waistDistance = 0.85f; + /** + * Distance from waist to hip + */ + protected float hipDistance = 0f; /** * Distance from eyes to waist, defines reported * tracker position, if you want to move resulting @@ -63,6 +69,7 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { List allTracekrs = server.getAllTrackers(); this.waistTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.WAIST, TrackerPosition.CHEST); this.chestTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.CHEST, TrackerPosition.WAIST); + this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.HIP, TrackerPosition.WAIST); this.hmdTracker = server.hmdTracker; this.server = server; ComputedHumanPoseTracker cwt = null; @@ -81,6 +88,7 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { neckLength = server.config.getFloat("body.neckLength", neckLength); chestDistance = server.config.getFloat("body.chestDistance", chestDistance); waistDistance = server.config.getFloat("body.waistDistance", waistDistance); + hipDistance = server.config.getFloat("body.hipDistance", hipDistance); trackerWaistDistance = server.config.getFloat("body.trackerWaistDistance", trackerWaistDistance); // Build skeleton hmdNode.attachChild(headNode); @@ -94,15 +102,19 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { chestNode.attachChild(waistNode); waistNode.localTransform.setTranslation(0, -(waistDistance - chestDistance), 0); - - chestNode.attachChild(trackerWaistNode); - trackerWaistNode.localTransform.setTranslation(0, -(waistDistance + trackerWaistDistance - chestDistance), 0); + + waistNode.attachChild(hipNode); + hipNode.localTransform.setTranslation(0, -hipDistance, 0); + + hipNode.attachChild(trackerWaistNode); + trackerWaistNode.localTransform.setTranslation(0, trackerWaistDistance, 0); configMap.put("Head", headShift); configMap.put("Neck", neckLength); configMap.put("Chest", chestDistance); configMap.put("Waist", waistDistance); configMap.put("Virtual waist", trackerWaistDistance); + configMap.put("Hip", hipDistance); } @Override @@ -114,6 +126,7 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { resetSkeletonConfig("Virtual waist"); resetSkeletonConfig("Waist"); resetSkeletonConfig("Chest"); + resetSkeletonConfig("Hip"); break; case "Head": setSkeletonConfig(joint, HEAD_SHIFT_DEFAULT); @@ -127,6 +140,9 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { case "Chest": setSkeletonConfig(joint, waistDistance / 2.0f); break; + case "Hip": + setSkeletonConfig(joint, 0.0f); + break; case "Waist": // Puts Waist in the middle of the height Vector3f vec = new Vector3f(); hmdTracker.getPosition(vec); @@ -161,19 +177,24 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { waistDistance = newLength; server.config.setProperty("body.waistDistance", waistDistance); waistNode.localTransform.setTranslation(0, -(waistDistance - chestDistance), 0); - trackerWaistNode.localTransform.setTranslation(0, -(waistDistance + trackerWaistDistance - chestDistance), 0); break; case "Chest": chestDistance = newLength; server.config.setProperty("body.chestDistance", chestDistance); chestNode.localTransform.setTranslation(0, -chestDistance, 0); waistNode.localTransform.setTranslation(0, -(waistDistance - chestDistance), 0); - trackerWaistNode.localTransform.setTranslation(0, -(waistDistance + trackerWaistDistance - chestDistance), 0); + trackerWaistNode.localTransform.setTranslation(0, trackerWaistDistance, 0); + break; + case "Hip": + hipDistance = newLength; + server.config.setProperty("body.hipDistance", hipDistance); + hipNode.localTransform.setTranslation(0, -hipDistance, 0); + trackerWaistNode.localTransform.setTranslation(0, trackerWaistDistance, 0); break; case "Virtual waist": trackerWaistDistance = newLength; server.config.setProperty("body.trackerWaistDistance", trackerWaistDistance); - trackerWaistNode.localTransform.setTranslation(0, -(waistDistance + trackerWaistDistance - chestDistance), 0); + trackerWaistNode.localTransform.setTranslation(0, trackerWaistDistance, 0); break; } } @@ -211,9 +232,16 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { neckNode.localTransform.setRotation(qBuf); if(waistTracker.getRotation(qBuf)) { - trackerWaistNode.localTransform.setRotation(qBuf); chestNode.localTransform.setRotation(qBuf); + } + if(hipTracker.getRotation(qBuf)) { waistNode.localTransform.setRotation(qBuf); + trackerWaistNode.localTransform.setRotation(qBuf); + hipNode.localTransform.setRotation(qBuf); + } + else if(waistTracker.getRotation(qBuf)){ + waistNode.localTransform.setRotation(qBuf); + trackerWaistNode.localTransform.setRotation(qBuf); } } @@ -243,6 +271,8 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { this.chestTracker.getRotation(referenceRotation); this.waistTracker.resetFull(referenceRotation); + + this.hipTracker.resetFull(referenceRotation); } @Override @@ -257,5 +287,7 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { this.chestTracker.getRotation(referenceRotation); this.waistTracker.resetYaw(referenceRotation); + + this.hipTracker.resetYaw(referenceRotation); } } diff --git a/src/main/java/io/eiren/vr/trackers/TrackerPosition.java b/src/main/java/io/eiren/vr/trackers/TrackerPosition.java index b03c60ebf..b2be77088 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerPosition.java +++ b/src/main/java/io/eiren/vr/trackers/TrackerPosition.java @@ -10,6 +10,7 @@ public enum TrackerPosition { HMD("HMD", TrackerRole.HMD), 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_ANKLE("body:left_ankle", null), From 350fdbce9dd45eff43e2312cf2bf33ba9fb809b1 Mon Sep 17 00:00:00 2001 From: Louka Date: Sat, 20 Nov 2021 15:03:33 -0500 Subject: [PATCH 2/6] Can use chest tracker alone hip tracker will default to the waist tracker's position (waist or chest) if no hip tracker is found --- src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java index 976a13625..1b4f1576b 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java @@ -69,7 +69,7 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { List allTracekrs = server.getAllTrackers(); this.waistTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.WAIST, TrackerPosition.CHEST); this.chestTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.CHEST, TrackerPosition.WAIST); - this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.HIP, TrackerPosition.WAIST); + this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.HIP, this.waistTracker.getBodyPosition()); this.hmdTracker = server.hmdTracker; this.server = server; ComputedHumanPoseTracker cwt = null; From 77d37ab2a73b84ceaaf26fae054d1f09622fb6c9 Mon Sep 17 00:00:00 2001 From: Louka Date: Sat, 20 Nov 2021 16:35:22 -0500 Subject: [PATCH 3/6] Cleanup and support for hip tracker alone/ why would you want hip alone instead of waist? idk --- .../eiren/vr/processor/HumanSkeletonWithLegs.java | 12 ++++++------ .../eiren/vr/processor/HumanSkeletonWithWaist.java | 14 ++++++-------- .../java/io/eiren/vr/trackers/TrackerUtils.java | 5 ++++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java index 99607eca8..840053147 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java @@ -72,11 +72,11 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist { public HumanSkeletonWithLegs(VRServer server, List computedTrackers) { super(server, computedTrackers); List allTracekrs = server.getAllTrackers(); - this.leftLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.LEFT_LEG, TrackerPosition.LEFT_ANKLE); - this.leftAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.LEFT_ANKLE, TrackerPosition.LEFT_LEG); + this.leftLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.LEFT_LEG, TrackerPosition.LEFT_ANKLE, null); + this.leftAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.LEFT_ANKLE, TrackerPosition.LEFT_LEG, null); this.leftFootTracker = TrackerUtils.findTrackerForBodyPosition(allTracekrs, TrackerPosition.LEFT_FOOT); - this.rightLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.RIGHT_LEG, TrackerPosition.RIGHT_ANKLE); - this.rightAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.RIGHT_ANKLE, TrackerPosition.RIGHT_LEG); + this.rightLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.RIGHT_LEG, TrackerPosition.RIGHT_ANKLE, null); + this.rightAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.RIGHT_ANKLE, TrackerPosition.RIGHT_LEG, null); this.rightFootTracker = TrackerUtils.findTrackerForBodyPosition(allTracekrs, TrackerPosition.RIGHT_FOOT); ComputedHumanPoseTracker lat = null; ComputedHumanPoseTracker rat = null; @@ -370,7 +370,7 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist { super.resetTrackersFull(); // Start with waist, it was reset in the parent Quaternion referenceRotation = new Quaternion(); - this.waistTracker.getRotation(referenceRotation); + this.hipTracker.getRotation(referenceRotation); this.leftLegTracker.resetFull(referenceRotation); this.rightLegTracker.resetFull(referenceRotation); @@ -401,7 +401,7 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist { super.resetTrackersYaw(); // Start with waist, it was reset in the parent Quaternion referenceRotation = new Quaternion(); - this.waistTracker.getRotation(referenceRotation); + this.hipTracker.getRotation(referenceRotation); this.leftLegTracker.resetYaw(referenceRotation); this.rightLegTracker.resetYaw(referenceRotation); diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java index 1b4f1576b..0dde965c3 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java @@ -67,9 +67,9 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { public HumanSkeletonWithWaist(VRServer server, List computedTrackers) { List allTracekrs = server.getAllTrackers(); - this.waistTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.WAIST, TrackerPosition.CHEST); - this.chestTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.CHEST, TrackerPosition.WAIST); - this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.HIP, this.waistTracker.getBodyPosition()); + this.waistTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.WAIST, TrackerPosition.CHEST, TrackerPosition.HIP); + this.chestTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.CHEST, TrackerPosition.WAIST, TrackerPosition.HIP); + this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.HIP, TrackerPosition.WAIST, TrackerPosition.CHEST); this.hmdTracker = server.hmdTracker; this.server = server; ComputedHumanPoseTracker cwt = null; @@ -239,10 +239,6 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { trackerWaistNode.localTransform.setRotation(qBuf); hipNode.localTransform.setRotation(qBuf); } - else if(waistTracker.getRotation(qBuf)){ - waistNode.localTransform.setRotation(qBuf); - trackerWaistNode.localTransform.setRotation(qBuf); - } } protected void updateComputedTrackers() { @@ -271,7 +267,8 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { this.chestTracker.getRotation(referenceRotation); this.waistTracker.resetFull(referenceRotation); - + this.waistTracker.getRotation(referenceRotation); + this.hipTracker.resetFull(referenceRotation); } @@ -287,6 +284,7 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { this.chestTracker.getRotation(referenceRotation); this.waistTracker.resetYaw(referenceRotation); + this.waistTracker.getRotation(referenceRotation); this.hipTracker.resetYaw(referenceRotation); } diff --git a/src/main/java/io/eiren/vr/trackers/TrackerUtils.java b/src/main/java/io/eiren/vr/trackers/TrackerUtils.java index e02e382e1..8154e1cb3 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerUtils.java +++ b/src/main/java/io/eiren/vr/trackers/TrackerUtils.java @@ -39,11 +39,14 @@ public class TrackerUtils { return findTrackerForBodyPosition(allTrackers, altPosition); } - public static Tracker findTrackerForBodyPositionOrEmpty(List allTrackers, TrackerPosition position, TrackerPosition altPosition) { + public static Tracker findTrackerForBodyPositionOrEmpty(List allTrackers, TrackerPosition position, TrackerPosition altPosition, TrackerPosition secondAltPosition) { Tracker t = findTrackerForBodyPosition(allTrackers, position); if(t != null) return t; t = findTrackerForBodyPosition(allTrackers, altPosition); + if(t != null) + return t; + t = findTrackerForBodyPosition(allTrackers, secondAltPosition); if(t != null) return t; return new ComputedTracker(Tracker.getNextLocalTrackerId(), "Empty tracker", false, false); From 34174b442f31437e256e30dae8108d5bbadfe7bf Mon Sep 17 00:00:00 2001 From: Louka Date: Sat, 20 Nov 2021 20:49:32 -0500 Subject: [PATCH 4/6] Virtual waist affected by kneebuf --- .../java/io/eiren/vr/processor/HumanSkeletonWithLegs.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java index 840053147..ba4dde5d9 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java @@ -291,8 +291,8 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist { chestNode.localTransform.getRotation(hipBuf); kneeBuf.nlerp(hipBuf, 0.3333333f); hipNode.localTransform.setRotation(kneeBuf); - // TODO : Use vectors to add like 50% of wasit tracker yaw to waist node to reduce drift and let user take weird poses - // TODO Set virtual waist node yaw to that of waist node + trackerWaistNode.localTransform.setRotation(kneeBuf); + // TODO : Use vectors to add like 50% of waist tracker yaw to waist node to reduce drift and let user take weird poses } } From 21eff5e1ba73112f8006b4ebe8a30d62c73f3653 Mon Sep 17 00:00:00 2001 From: Louka Date: Sat, 20 Nov 2021 21:32:47 -0500 Subject: [PATCH 5/6] Better reset and initial values owo --- src/main/java/dev/slimevr/autobone/AutoBone.java | 6 +++--- .../java/dev/slimevr/autobone/SimpleSkeleton.java | 9 +++++++-- .../eiren/vr/processor/HumanSkeletonWithLegs.java | 2 +- .../eiren/vr/processor/HumanSkeletonWithWaist.java | 14 +++++++------- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/dev/slimevr/autobone/AutoBone.java b/src/main/java/dev/slimevr/autobone/AutoBone.java index dfed39e9e..c75971345 100644 --- a/src/main/java/dev/slimevr/autobone/AutoBone.java +++ b/src/main/java/dev/slimevr/autobone/AutoBone.java @@ -91,15 +91,15 @@ public class AutoBone { // Load waist configs staticConfigs.put("Head", server.config.getFloat("body.headShift", HumanSkeletonWithWaist.HEAD_SHIFT_DEFAULT)); staticConfigs.put("Neck", server.config.getFloat("body.neckLength", HumanSkeletonWithWaist.NECK_LENGTH_DEFAULT)); - configs.put("Waist", server.config.getFloat("body.waistDistance", 0.85f)); + configs.put("Waist", server.config.getFloat("body.waistDistance", 0.64f)); if(server.config.getBoolean("autobone.forceChestTracker", false) || (frame != null && TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.CHEST) != null) || TrackerUtils.findTrackerForBodyPosition(server.getAllTrackers(), TrackerPosition.CHEST) != null) { // If force enabled or has a chest tracker - configs.put("Chest", server.config.getFloat("body.chestDistance", 0.42f)); + configs.put("Chest", server.config.getFloat("body.chestDistance", 0.32f)); } else { // Otherwise, make sure it's not used configs.remove("Chest"); - staticConfigs.put("Chest", server.config.getFloat("body.chestDistance", 0.42f)); + staticConfigs.put("Chest", server.config.getFloat("body.chestDistance", 0.32f)); } // Load leg configs diff --git a/src/main/java/dev/slimevr/autobone/SimpleSkeleton.java b/src/main/java/dev/slimevr/autobone/SimpleSkeleton.java index cf34c7db6..7e5ee7f07 100644 --- a/src/main/java/dev/slimevr/autobone/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/autobone/SimpleSkeleton.java @@ -23,12 +23,17 @@ public class SimpleSkeleton { protected final TransformNode neckNode = new TransformNode("Neck", false); protected final TransformNode waistNode = new TransformNode("Waist", false); protected final TransformNode chestNode = new TransformNode("Chest", false); + protected final TransformNode hipNode = new TransformNode("Hip", false); - protected float chestDistance = 0.42f; + protected float chestDistance = 0.32f; /** * Distance from eyes to waist */ - protected float waistDistance = 0.85f; + protected float waistDistance = 0.64f; + /** + * Distance from waist to hip + */ + protected float hipDistance = 0.05f; /** * Distance from eyes to the base of the neck */ diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java index ba4dde5d9..9666ccd90 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java @@ -167,7 +167,7 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist { hmdTracker.getPosition(vec); float height = vec.y; if(height > 0.5f) { // Reset only if floor level is right, todo: read floor level from SteamVR if it's not 0 - setSkeletonConfig(joint, height - neckLength - waistDistance - DEFAULT_FLOOR_OFFSET); + setSkeletonConfig(joint, height - neckLength - waistDistance - hipDistance - DEFAULT_FLOOR_OFFSET); } resetSkeletonConfig("Knee height"); break; diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java index 0dde965c3..39e8d7acd 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java @@ -41,15 +41,15 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { protected final TransformNode trackerWaistNode = new TransformNode("Waist-Tracker", false); protected final TransformNode hipNode = new TransformNode("Hip", false); - protected float chestDistance = 0.42f; + protected float chestDistance = 0.32f; /** * Distance from eyes to waist */ - protected float waistDistance = 0.85f; + protected float waistDistance = 0.64f; /** * Distance from waist to hip */ - protected float hipDistance = 0f; + protected float hipDistance = 0.05f; /** * Distance from eyes to waist, defines reported * tracker position, if you want to move resulting @@ -124,9 +124,9 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { resetSkeletonConfig("Head"); resetSkeletonConfig("Neck"); resetSkeletonConfig("Virtual waist"); + resetSkeletonConfig("Hip"); resetSkeletonConfig("Waist"); resetSkeletonConfig("Chest"); - resetSkeletonConfig("Hip"); break; case "Head": setSkeletonConfig(joint, HEAD_SHIFT_DEFAULT); @@ -138,17 +138,17 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { setSkeletonConfig(joint, 0.0f); break; case "Chest": - setSkeletonConfig(joint, waistDistance / 2.0f); + setSkeletonConfig(joint, (waistDistance / 2.0f) - hipDistance); break; case "Hip": - setSkeletonConfig(joint, 0.0f); + setSkeletonConfig(joint, 0.05f); break; case "Waist": // Puts Waist in the middle of the height Vector3f vec = new Vector3f(); hmdTracker.getPosition(vec); float height = vec.y; if(height > 0.5f) { // Reset only if floor level is right, todo: read floor level from SteamVR if it's not 0 - setSkeletonConfig(joint, (height) / 2.0f); + setSkeletonConfig(joint, ((height) / 2.0f) - hipDistance); } break; } From 4055d517587dc63b68ce34ce1af22306fe977ac3 Mon Sep 17 00:00:00 2001 From: Louka Date: Sun, 21 Nov 2021 18:14:19 -0500 Subject: [PATCH 6/6] Autobone support Added basic autobone support for the hip tracker, fixed "allTracekrs" and changed initial values of upper body. --- .../java/dev/slimevr/autobone/AutoBone.java | 19 +++++--- .../dev/slimevr/autobone/SimpleSkeleton.java | 47 ++++++++++++------- .../java/dev/slimevr/gui/AutoBoneWindow.java | 1 + .../vr/processor/HumanSkeletonWithLegs.java | 17 +++---- .../vr/processor/HumanSkeletonWithWaist.java | 28 +++++------ .../io/eiren/vr/trackers/TrackerUtils.java | 7 ++- 6 files changed, 72 insertions(+), 47 deletions(-) diff --git a/src/main/java/dev/slimevr/autobone/AutoBone.java b/src/main/java/dev/slimevr/autobone/AutoBone.java index c75971345..501677f22 100644 --- a/src/main/java/dev/slimevr/autobone/AutoBone.java +++ b/src/main/java/dev/slimevr/autobone/AutoBone.java @@ -72,8 +72,7 @@ public class AutoBone { public final HashMap configs = new HashMap(); public final HashMap staticConfigs = new HashMap(); - public final FastList heightConfigs = new FastList(new String[]{"Neck", "Waist", "Legs length" - }); + public final FastList heightConfigs = new FastList(new String[]{"Neck", "Waist", "Hip", "Legs length"}); public AutoBone(VRServer server) { this.server = server; @@ -91,15 +90,22 @@ public class AutoBone { // Load waist configs staticConfigs.put("Head", server.config.getFloat("body.headShift", HumanSkeletonWithWaist.HEAD_SHIFT_DEFAULT)); staticConfigs.put("Neck", server.config.getFloat("body.neckLength", HumanSkeletonWithWaist.NECK_LENGTH_DEFAULT)); - configs.put("Waist", server.config.getFloat("body.waistDistance", 0.64f)); - + configs.put("Waist", server.config.getFloat("body.waistDistance", 0.6f)); if(server.config.getBoolean("autobone.forceChestTracker", false) || (frame != null && TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.CHEST) != null) || TrackerUtils.findTrackerForBodyPosition(server.getAllTrackers(), TrackerPosition.CHEST) != null) { // If force enabled or has a chest tracker - configs.put("Chest", server.config.getFloat("body.chestDistance", 0.32f)); + configs.put("Chest", server.config.getFloat("body.chestDistance", 0.35f)); } else { // Otherwise, make sure it's not used configs.remove("Chest"); - staticConfigs.put("Chest", server.config.getFloat("body.chestDistance", 0.32f)); + staticConfigs.put("Chest", server.config.getFloat("body.chestDistance", 0.35f)); + } + if(server.config.getBoolean("autobone.forceHipTracker", false) || (frame != null && TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.HIP) != null) || TrackerUtils.findTrackerForBodyPosition(server.getAllTrackers(), TrackerPosition.HIP) != null) { + // If force enabled or has a hip tracker + configs.put("Hip", server.config.getFloat("body.hipDistance", 0.1f)); + } else { + // Otherwise, make sure it's not used + configs.remove("Hip"); + staticConfigs.put("Hip", server.config.getFloat("body.hipDistance", 0.1f)); } // Load leg configs @@ -150,6 +156,7 @@ public class AutoBone { setConfig("Neck", "body.neckLength"); setConfig("Waist", "body.waistDistance"); setConfig("Chest", "body.chestDistance"); + setConfig("Hip", "body.hipDistance"); setConfig("Hips width", "body.hipsWidth"); setConfig("Legs length", "body.legsLength"); setConfig("Knee height", "body.kneeHeight"); diff --git a/src/main/java/dev/slimevr/autobone/SimpleSkeleton.java b/src/main/java/dev/slimevr/autobone/SimpleSkeleton.java index 7e5ee7f07..c15585c8f 100644 --- a/src/main/java/dev/slimevr/autobone/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/autobone/SimpleSkeleton.java @@ -25,15 +25,15 @@ public class SimpleSkeleton { protected final TransformNode chestNode = new TransformNode("Chest", false); protected final TransformNode hipNode = new TransformNode("Hip", false); - protected float chestDistance = 0.32f; + protected float chestDistance = 0.35f; /** * Distance from eyes to waist */ - protected float waistDistance = 0.64f; + protected float waistDistance = 0.6f; /** * Distance from waist to hip */ - protected float hipDistance = 0.05f; + protected float hipDistance = 0.1f; /** * Distance from eyes to the base of the neck */ @@ -82,12 +82,15 @@ public class SimpleSkeleton { chestNode.attachChild(waistNode); waistNode.localTransform.setTranslation(0, -(waistDistance - chestDistance), 0); + + waistNode.attachChild(hipNode); + hipNode.localTransform.setTranslation(0, -hipDistance, 0); // Assemble skeleton to feet - waistNode.attachChild(leftHipNode); + hipNode.attachChild(leftHipNode); leftHipNode.localTransform.setTranslation(-hipsWidth / 2, 0, 0); - waistNode.attachChild(rightHipNode); + hipNode.attachChild(rightHipNode); rightHipNode.localTransform.setTranslation(hipsWidth / 2, 0, 0); leftHipNode.attachChild(leftKneeNode); @@ -138,17 +141,17 @@ public class SimpleSkeleton { hmdNode.localTransform.setTranslation(hmd.position); } } - - TrackerFrame chest = TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.CHEST, TrackerPosition.WAIST); + TrackerFrame chest = TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.CHEST, TrackerPosition.WAIST, TrackerPosition.HIP); setRotation(chest, neckNode); - TrackerFrame waist = TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.WAIST, TrackerPosition.CHEST); + TrackerFrame waist = TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.WAIST, TrackerPosition.CHEST, TrackerPosition.HIP); setRotation(waist, chestNode); TrackerFrame leftLeg = TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.LEFT_LEG); TrackerFrame rightLeg = TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.RIGHT_LEG); - averagePelvis(waist, leftLeg, rightLeg); + TrackerFrame hip = TrackerUtils.findTrackerForBodyPosition(frame, TrackerPosition.HIP, TrackerPosition.WAIST, TrackerPosition.CHEST); + averagePelvis(hip, leftLeg, rightLeg); setRotation(leftLeg, leftHipNode); setRotation(rightLeg, rightHipNode); @@ -168,19 +171,18 @@ public class SimpleSkeleton { } } - public void averagePelvis(TrackerFrame waist, TrackerFrame leftLeg, TrackerFrame rightLeg) { + public void averagePelvis(TrackerFrame hip, TrackerFrame leftLeg, TrackerFrame rightLeg) { if((leftLeg == null || rightLeg == null) || (!leftLeg.hasData(TrackerFrameData.ROTATION) || !rightLeg.hasData(TrackerFrameData.ROTATION))) { - setRotation(waist, waistNode); + setRotation(hip, waistNode); return; } - - if(waist == null || !waist.hasData(TrackerFrameData.ROTATION)) { + if(hip == null || !hip.hasData(TrackerFrameData.ROTATION)) { if(leftLeg.hasData(TrackerFrameData.ROTATION) && rightLeg.hasData(TrackerFrameData.ROTATION)) { leftLeg.getRotation(rotBuf1); rightLeg.getRotation(rotBuf2); rotBuf1.nlerp(rotBuf2, 0.5f); - waistNode.localTransform.setRotation(rotBuf1); + hipNode.localTransform.setRotation(rotBuf1); } return; @@ -190,11 +192,10 @@ public class SimpleSkeleton { leftLeg.getRotation(rotBuf1); rightLeg.getRotation(rotBuf2); rotBuf1.nlerp(rotBuf2, 0.5f); - - waist.getRotation(rotBuf2); + hip.getRotation(rotBuf2); rotBuf1.nlerp(rotBuf2, 0.3333333f); - waistNode.localTransform.setRotation(rotBuf1); + hipNode.localTransform.setRotation(rotBuf1); } public void setSkeletonConfigs(Map configs) { @@ -236,6 +237,13 @@ public class SimpleSkeleton { chestNode.update(); } break; + case "Hip": + hipDistance = newLength; + hipNode.localTransform.setTranslation(0, -hipDistance, 0); + if(updatePose) { + hipNode.update(); + } + break; case "Hips width": hipsWidth = newLength; leftHipNode.localTransform.setTranslation(-hipsWidth / 2, 0, 0); @@ -278,6 +286,8 @@ public class SimpleSkeleton { return waistDistance; case "Chest": return chestDistance; + case "Hip": + return hipDistance; case "Hips width": return hipsWidth; case "Knee height": @@ -313,6 +323,8 @@ public class SimpleSkeleton { return rotationNode ? neckNode : chestNode; case WAIST: return rotationNode ? chestNode : waistNode; + case HIP: + return rotationNode ? hipNode : waistNode; //TODO check, need 3? case LEFT_LEG: return rotationNode ? leftHipNode : leftKneeNode; @@ -348,6 +360,7 @@ public class SimpleSkeleton { config.setProperty("body.neckLength", neckLength); config.setProperty("body.waistDistance", waistDistance); config.setProperty("body.chestDistance", chestDistance); + config.setProperty("body.hipDistance", hipDistance); // Save leg configs config.setProperty("body.hipsWidth", hipsWidth); diff --git a/src/main/java/dev/slimevr/gui/AutoBoneWindow.java b/src/main/java/dev/slimevr/gui/AutoBoneWindow.java index 41aea4752..d5a18f694 100644 --- a/src/main/java/dev/slimevr/gui/AutoBoneWindow.java +++ b/src/main/java/dev/slimevr/gui/AutoBoneWindow.java @@ -342,6 +342,7 @@ public class AutoBoneWindow extends JFrame { Float neckLength = autoBone.getConfig("Neck"); Float chestLength = autoBone.getConfig("Chest"); Float waistLength = autoBone.getConfig("Waist"); + Float hipLength = autoBone.getConfig("Hip"); Float hipWidth = autoBone.getConfig("Hips width"); Float legsLength = autoBone.getConfig("Legs length"); Float kneeHeight = autoBone.getConfig("Knee height"); diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java index 9666ccd90..c612dbc82 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithLegs.java @@ -71,13 +71,13 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist { public HumanSkeletonWithLegs(VRServer server, List computedTrackers) { super(server, computedTrackers); - List allTracekrs = server.getAllTrackers(); - this.leftLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.LEFT_LEG, TrackerPosition.LEFT_ANKLE, null); - this.leftAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.LEFT_ANKLE, TrackerPosition.LEFT_LEG, null); - this.leftFootTracker = TrackerUtils.findTrackerForBodyPosition(allTracekrs, TrackerPosition.LEFT_FOOT); - this.rightLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.RIGHT_LEG, TrackerPosition.RIGHT_ANKLE, null); - this.rightAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.RIGHT_ANKLE, TrackerPosition.RIGHT_LEG, null); - this.rightFootTracker = TrackerUtils.findTrackerForBodyPosition(allTracekrs, TrackerPosition.RIGHT_FOOT); + List allTrackers = server.getAllTrackers(); + this.leftLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTrackers, TrackerPosition.LEFT_LEG, TrackerPosition.LEFT_ANKLE, null); + this.leftAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTrackers, TrackerPosition.LEFT_ANKLE, TrackerPosition.LEFT_LEG, null); + this.leftFootTracker = TrackerUtils.findTrackerForBodyPosition(allTrackers, TrackerPosition.LEFT_FOOT); + this.rightLegTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTrackers, TrackerPosition.RIGHT_LEG, TrackerPosition.RIGHT_ANKLE, null); + this.rightAnkleTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTrackers, TrackerPosition.RIGHT_ANKLE, TrackerPosition.RIGHT_LEG, null); + this.rightFootTracker = TrackerUtils.findTrackerForBodyPosition(allTrackers, TrackerPosition.RIGHT_FOOT); ComputedHumanPoseTracker lat = null; ComputedHumanPoseTracker rat = null; ComputedHumanPoseTracker rkt = null; @@ -291,7 +291,8 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist { chestNode.localTransform.getRotation(hipBuf); kneeBuf.nlerp(hipBuf, 0.3333333f); hipNode.localTransform.setRotation(kneeBuf); - trackerWaistNode.localTransform.setRotation(kneeBuf); + //trackerWaistNode.localTransform.setRotation(kneeBuf); // <== Provides cursed results from my test in VRChat when sitting or laying down -Erimel + // TODO : Correct the trackerWaistNode without getting cursed results (only correct yaw?) // TODO : Use vectors to add like 50% of waist tracker yaw to waist node to reduce drift and let user take weird poses } } diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java index 39e8d7acd..a90204287 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java @@ -41,15 +41,15 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { protected final TransformNode trackerWaistNode = new TransformNode("Waist-Tracker", false); protected final TransformNode hipNode = new TransformNode("Hip", false); - protected float chestDistance = 0.32f; + protected float chestDistance = 0.35f; /** * Distance from eyes to waist */ - protected float waistDistance = 0.64f; + protected float waistDistance = 0.6f; /** * Distance from waist to hip */ - protected float hipDistance = 0.05f; + protected float hipDistance = 0.1f; /** * Distance from eyes to waist, defines reported * tracker position, if you want to move resulting @@ -66,10 +66,10 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { protected float headShift = HEAD_SHIFT_DEFAULT; public HumanSkeletonWithWaist(VRServer server, List computedTrackers) { - List allTracekrs = server.getAllTrackers(); - this.waistTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.WAIST, TrackerPosition.CHEST, TrackerPosition.HIP); - this.chestTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.CHEST, TrackerPosition.WAIST, TrackerPosition.HIP); - this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTracekrs, TrackerPosition.HIP, TrackerPosition.WAIST, TrackerPosition.CHEST); + List allTrackers = server.getAllTrackers(); + this.waistTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTrackers, TrackerPosition.WAIST, TrackerPosition.CHEST, TrackerPosition.HIP); + this.chestTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTrackers, TrackerPosition.CHEST, TrackerPosition.WAIST, TrackerPosition.HIP); + this.hipTracker = TrackerUtils.findTrackerForBodyPositionOrEmpty(allTrackers, TrackerPosition.HIP, TrackerPosition.WAIST, TrackerPosition.CHEST); this.hmdTracker = server.hmdTracker; this.server = server; ComputedHumanPoseTracker cwt = null; @@ -137,18 +137,18 @@ public class HumanSkeletonWithWaist extends HumanSkeleton { case "Virtual waist": setSkeletonConfig(joint, 0.0f); break; - case "Chest": - setSkeletonConfig(joint, (waistDistance / 2.0f) - hipDistance); + case "Chest": //Chest is half of the upper body (half of the waist with the hip) + setSkeletonConfig(joint, (waistDistance + hipDistance) / 2.0f); break; - case "Hip": - setSkeletonConfig(joint, 0.05f); + case "Hip": // Distance between waist and hip + setSkeletonConfig(joint, 0.1f); break; - case "Waist": // Puts Waist in the middle of the height + case "Waist": // waist length is from shoulders (bottom of neck) to waist (right above the hip) Vector3f vec = new Vector3f(); hmdTracker.getPosition(vec); float height = vec.y; - if(height > 0.5f) { // Reset only if floor level is right, todo: read floor level from SteamVR if it's not 0 - setSkeletonConfig(joint, ((height) / 2.0f) - hipDistance); + if(height > 0.5f) { // Reset only if floor level is right, TODO: read floor level from SteamVR if it's not 0 + setSkeletonConfig(joint, ((height) / 2.0f) - hipDistance - neckLength); } break; } diff --git a/src/main/java/io/eiren/vr/trackers/TrackerUtils.java b/src/main/java/io/eiren/vr/trackers/TrackerUtils.java index 8154e1cb3..944ccb24e 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerUtils.java +++ b/src/main/java/io/eiren/vr/trackers/TrackerUtils.java @@ -32,11 +32,14 @@ public class TrackerUtils { return findTrackerForBodyPosition(allTrackers, altPosition); } - public static T findTrackerForBodyPosition(T[] allTrackers, TrackerPosition position, TrackerPosition altPosition) { + public static T findTrackerForBodyPosition(T[] allTrackers, TrackerPosition position, TrackerPosition altPosition, TrackerPosition secondAltPosition) { T t = findTrackerForBodyPosition(allTrackers, position); if(t != null) return t; - return findTrackerForBodyPosition(allTrackers, altPosition); + t = findTrackerForBodyPosition(allTrackers, altPosition); + if(t != null) + return t; + return findTrackerForBodyPosition(allTrackers, secondAltPosition); } public static Tracker findTrackerForBodyPositionOrEmpty(List allTrackers, TrackerPosition position, TrackerPosition altPosition, TrackerPosition secondAltPosition) {