From 2bb33fd5333ce72d78552c7650143be16206607d Mon Sep 17 00:00:00 2001 From: Erimel Date: Wed, 30 Sep 2026 18:18:04 -0400 Subject: [PATCH] tracking pause always active bones instead of processors --- .../main/java/dev/slimevr/skeleton/behaviours.kt | 16 +++++++++++----- .../src/main/java/dev/slimevr/skeleton/module.kt | 7 ++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/server/core/src/main/java/dev/slimevr/skeleton/behaviours.kt b/server/core/src/main/java/dev/slimevr/skeleton/behaviours.kt index 94b4366d7..62037452a 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/behaviours.kt @@ -179,7 +179,6 @@ private class TickTimings(private val hz: Int, private val window: Duration, pri class ComputedSkeletonBehaviour( val hz: Int, - val alwaysActiveInputProcessors: List = emptyList(), val inputProcessors: List = emptyList(), val fkComputedProcessors: List = emptyList(), val fkProcessors: List = emptyList(), @@ -187,6 +186,8 @@ class ComputedSkeletonBehaviour( val ikComputedProcessors: List = emptyList(), val waiter: PreciseWaiter, ) : SkeletonBehaviour { + private val ALWAYS_ACTIVE_PARTS = arrayOf(BodyPart.HEAD, BodyPart.NECK) + private val intervalDuration = (1.0 / hz).seconds /** Shortest gap between two tick starts before the later one is pushed to the next slot */ @@ -252,13 +253,18 @@ class ComputedSkeletonBehaviour( receiver.context.dispatch(SkeletonActions.ProcessorResetsApplied(pendingResets.size)) } - val preProcessedBoneInputs = runInputProcessors(alwaysActiveInputProcessors, targetState.boneInputs, targetState.skeletonHeight) val boneInputs = if (targetState.pausedProcessedBoneInputs != null) { - // Use already-processed paused tracking data except for the head - targetState.pausedProcessedBoneInputs.mutateCopy { it[BodyPart.HEAD] = preProcessedBoneInputs[BodyPart.HEAD] } + // Use already-processed paused tracking data except for certain bones (head + neck) + val alwaysActiveInputs = BodyPartMap(targetState.boneInputs.filter { it.key in ALWAYS_ACTIVE_PARTS }) + val processedAlwaysActiveInputs = runInputProcessors(inputProcessors, alwaysActiveInputs, targetState.skeletonHeight) + targetState.pausedProcessedBoneInputs.mutateCopy { + for (bodyPart in ALWAYS_ACTIVE_PARTS) { + it[bodyPart] = processedAlwaysActiveInputs[bodyPart] + } + } } else { // Run pre-FK processors - val processedInputs = runInputProcessors(inputProcessors, preProcessedBoneInputs, targetState.skeletonHeight) + val processedInputs = runInputProcessors(inputProcessors, targetState.boneInputs, targetState.skeletonHeight) if (targetState.paused) { // We just paused tracking and this is the last frame before we rely on paused bone inputs // The buffer keeps being written after this, so state gets a copy 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 64e1ac788..c7b9a16fb 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/module.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/module.kt @@ -269,15 +269,12 @@ class Skeleton( ComputedSkeletonBehaviour( hz = hz, waiter = waiter, - // Like inputProcessors but run even when tracking is paused (since head isn't paused) - alwaysActiveInputProcessors = listOf( + // Run before FK on the inputs + inputProcessors = listOf( PredictionInputProcessor(settings), SmoothingInputProcessor(settings), TrackerOffsetInputProcessor(), HeadPositionFallbackProcessor(settings), - ), - // Run before FK on the inputs - inputProcessors = listOf( BoneYawFallbackInputProcessor(), SpineInputProcessor(settings), HipYawRollAlignInputProcessor(settings),