From 609a8d9dc6dfb3b5114ea01d31ad77dfeece2f64 Mon Sep 17 00:00:00 2001 From: Erimel Date: Tue, 21 Jul 2026 18:11:30 -0400 Subject: [PATCH] BonePriorityLinkProcessor -> BoneActiveLinkProcessor --- server/core/src/main/java/dev/slimevr/skeleton/module.kt | 4 ++-- .../processors/{bone-priority-link.kt => bone-active-link.kt} | 4 +++- .../java/dev/slimevr/skeleton/processors/bone-direct-link.kt | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) rename server/core/src/main/java/dev/slimevr/skeleton/processors/{bone-priority-link.kt => bone-active-link.kt} (93%) diff --git a/server/core/src/main/java/dev/slimevr/skeleton/module.kt b/server/core/src/main/java/dev/slimevr/skeleton/module.kt index bb7a78926..1fbadd98c 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/module.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/module.kt @@ -6,7 +6,7 @@ import dev.slimevr.context.Context import dev.slimevr.skeleton.processors.BoneDirectLinkProcessor import dev.slimevr.skeleton.processors.BoneFallbackProcessor import dev.slimevr.skeleton.processors.BonePredictionProcessor -import dev.slimevr.skeleton.processors.BonePriorityLinkProcessor +import dev.slimevr.skeleton.processors.BoneActiveLinkProcessor import dev.slimevr.skeleton.processors.BoneSmoothingProcessor import dev.slimevr.skeleton.processors.BoneYawRollAlignProcessor import dev.slimevr.skeleton.processors.FingerImputeProcessor @@ -128,7 +128,7 @@ class Skeleton( ComputedSkeletonBehaviour( processors = listOf( BoneFallbackProcessor(), - BonePriorityLinkProcessor(), + BoneActiveLinkProcessor(), SpineImputeProcessor(ctx.config.settings), BoneYawRollAlignProcessor(ctx.config.settings), BoneDirectLinkProcessor(), diff --git a/server/core/src/main/java/dev/slimevr/skeleton/processors/bone-priority-link.kt b/server/core/src/main/java/dev/slimevr/skeleton/processors/bone-active-link.kt similarity index 93% rename from server/core/src/main/java/dev/slimevr/skeleton/processors/bone-priority-link.kt rename to server/core/src/main/java/dev/slimevr/skeleton/processors/bone-active-link.kt index a74f1a397..e1b168fad 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/processors/bone-priority-link.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/processors/bone-active-link.kt @@ -8,10 +8,12 @@ import solarxr_protocol.datatypes.BodyPart * Handles setting the rotation of an inactive bone with the first active bone in its sources, or keeps * the old rotation if none of them are active. */ -class BonePriorityLinkProcessor : SkeletonProcessor { +class BoneActiveLinkProcessor : SkeletonProcessor { /** * First element is the BodyPart whose rawBone is not actively receiving data. + * * Second element contains a set of BodyParts whose rotation should be used as a fallback prioritized from first to last. + * Only active bones will be used. */ private val linkedToSources = mapOf( BodyPart.UPPER_CHEST to setOf(BodyPart.CHEST, BodyPart.WAIST, BodyPart.HIP), diff --git a/server/core/src/main/java/dev/slimevr/skeleton/processors/bone-direct-link.kt b/server/core/src/main/java/dev/slimevr/skeleton/processors/bone-direct-link.kt index bf00a4e40..e3e9c53a6 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/processors/bone-direct-link.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/processors/bone-direct-link.kt @@ -30,8 +30,8 @@ class BoneDirectLinkProcessor : SkeletonProcessor { BodyPart.LEFT_SHOULDER to BodyPart.UPPER_CHEST, BodyPart.RIGHT_SHOULDER to BodyPart.UPPER_CHEST, - BodyPart.LEFT_UPPER_ARM to BodyPart.LEFT_LOWER_ARM, - BodyPart.RIGHT_UPPER_ARM to BodyPart.RIGHT_LOWER_ARM, + BodyPart.LEFT_UPPER_ARM to BodyPart.LEFT_SHOULDER, + BodyPart.RIGHT_UPPER_ARM to BodyPart.RIGHT_SHOULDER, BodyPart.LEFT_LOWER_ARM to BodyPart.LEFT_UPPER_ARM, BodyPart.RIGHT_LOWER_ARM to BodyPart.RIGHT_UPPER_ARM,