Improve Autobone upperChest and fix VMC upperChest (#754)

SlimeVR · Jul 4, 2023 · 3defd47 · 3defd47
1 parent 3068fad
commit 3defd47
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/server/src/main/java/dev/slimevr/autobone/AutoBone.kt b/server/src/main/java/dev/slimevr/autobone/AutoBone.kt
@@ -44,6 +44,7 @@ class AutoBone(server: VRServer) {
 	val heightOffsets = FastList(
 		arrayOf(
 			BoneType.NECK,
+			BoneType.UPPER_CHEST,
 			BoneType.CHEST,
 			BoneType.WAIST,
 			BoneType.HIP,

diff --git a/server/src/main/java/dev/slimevr/autobone/errors/BodyProportionError.kt b/server/src/main/java/dev/slimevr/autobone/errors/BodyProportionError.kt
@@ -69,14 +69,14 @@ class BodyProportionError : IAutoBoneError {
 			RangeProportionLimiter(
 				0.0945f,
 				{ config: HumanPoseManager -> config.getOffset(SkeletonConfigOffsets.UPPER_CHEST) },
-				0.02f
+				0.01f
 			),
 			// Chest
 			// Experimental: 0.0945
 			RangeProportionLimiter(
 				0.0945f,
 				{ config: HumanPoseManager -> config.getOffset(SkeletonConfigOffsets.CHEST) },
-				0.02f
+				0.01f
 			),
 			// Waist
 			// Experimental: 0.118

diff --git a/server/src/main/java/dev/slimevr/osc/UnityArmature.kt b/server/src/main/java/dev/slimevr/osc/UnityArmature.kt
@@ -74,6 +74,8 @@ class UnityArmature(localRot: Boolean) {
 	}
 
 	fun updateNodes() {
+		// Set the upper chest node's rotation to the chest's
+		upperChestNode.localTransform.rotation = chestNode.localTransform.rotation
 		// Update the root node
 		hipNode.update()
 	}

diff --git a/server/src/main/java/dev/slimevr/tracking/processor/BoneType.java b/server/src/main/java/dev/slimevr/tracking/processor/BoneType.java
@@ -11,7 +11,7 @@ public enum BoneType {
 	HEAD(BodyPart.HEAD),
 	HEAD_TRACKER(),
 	NECK(BodyPart.NECK),
-	UPPER_CHEST(BodyPart.CHEST),
+	UPPER_CHEST(BodyPart.UPPER_CHEST),
 	CHEST_TRACKER,
 	CHEST(BodyPart.CHEST),
 	WAIST(BodyPart.WAIST),