Implement skeleton constraint toggles (#1290)

SlimeVR · Jan 29, 2025 · d389b5a · d389b5a
1 parent eb08cb5
commit d389b5a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/server/core/src/main/java/dev/slimevr/tracking/processor/Bone.kt b/server/core/src/main/java/dev/slimevr/tracking/processor/Bone.kt
@@ -67,7 +67,7 @@ class Bone(val boneType: BoneType, val rotationConstraint: Constraint) {
 	 * this bone and all of its children while
 	 * enforcing rotation constraints.
 	 */
-	fun updateWithConstraints() {
+	fun updateWithConstraints(correctConstraints: Boolean) {
 		val initialRot = getGlobalRotation()
 		val newRot = rotationConstraint.applyConstraint(initialRot, this)
 		setRotationRaw(newRot)
@@ -82,7 +82,8 @@ class Bone(val boneType: BoneType, val rotationConstraint: Constraint) {
 			val deltaRot = newRot * initialRot.inv()
 			val angle = deltaRot.angleR()
 
-			if (angle > Constraint.ANGLE_THRESHOLD &&
+			if (correctConstraints &&
+				angle > Constraint.ANGLE_THRESHOLD &&
 				(attachedTracker?.filteringHandler?.getFilteringImpact() ?: 1f) < Constraint.FILTER_IMPACT_THRESHOLD &&
 				(parent?.attachedTracker?.filteringHandler?.getFilteringImpact() ?: 0f) < Constraint.FILTER_IMPACT_THRESHOLD
 			) {
@@ -92,7 +93,7 @@ class Bone(val boneType: BoneType, val rotationConstraint: Constraint) {
 
 		// Recursively apply constraints and update children.
 		for (child in children) {
-			child.updateWithConstraints()
+			child.updateWithConstraints(correctConstraints)
 		}
 	}
 

diff --git a/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt b/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt
@@ -511,7 +511,9 @@ class HumanSkeleton(
 
 		updateTransforms()
 		updateBones()
-		headBone.updateWithConstraints()
+		if (enforceConstraints) {
+			headBone.updateWithConstraints(correctConstraints)
+		}
 		updateComputedTrackers()
 
 		// Don't run post-processing if the tracking is paused