From 21eff5e1ba73112f8006b4ebe8a30d62c73f3653 Mon Sep 17 00:00:00 2001 From: Louka Date: Sat, 20 Nov 2021 21:32:47 -0500 Subject: [PATCH] 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; }