diff --git a/server/core/src/main/java/dev/slimevr/solarxr/module.kt b/server/core/src/main/java/dev/slimevr/solarxr/module.kt index afdc95745..7e32f2beb 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/module.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/module.kt @@ -203,7 +203,7 @@ class SolarXRBridge( add(ProfilesBehaviour(appContext.config)) add(SettingsResetBehaviour(appContext)) add(SettingsDefaultsBehaviour()) - add(SkeletonSettingsBehaviour(appContext.config.settings)) + add(SkeletonSettingsBehaviour(appContext.skeleton, appContext.config.settings)) add(SkeletonProportionsBehaviour(appContext.config.userConfig, appContext.skeleton, appContext.errorReporting)) add(TrackingChecklistBehaviour(appContext.trackingChecklist, appContext.config.settings, appContext.errorReporting)) add(UpdateTrackerBehaviour(appContext.server, appContext.errorReporting)) diff --git a/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-settings.kt b/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-settings.kt index b5e98f1de..73458eaed 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-settings.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-settings.kt @@ -5,6 +5,7 @@ import dev.slimevr.config.SettingsActions import dev.slimevr.config.SkeletonConfig import dev.slimevr.config.SkeletonRatiosConfig import dev.slimevr.config.SkeletonTogglesConfig +import dev.slimevr.skeleton.Skeleton import dev.slimevr.skeleton.SkeletonActions import dev.slimevr.solarxr.SolarXRBridge import dev.slimevr.solarxr.SolarXRBridgeBehaviour @@ -45,6 +46,7 @@ internal fun buildSkeletonSettingsResponse(config: SkeletonConfig) = SkeletonSet ) class SkeletonSettingsBehaviour( + private val skeleton: Skeleton, private val settings: Settings, ) : SolarXRBridgeBehaviour { override fun observe(receiver: SolarXRBridge) { @@ -94,19 +96,16 @@ class SkeletonSettingsBehaviour( ) }.launchIn(receiver.context.scope) - receiver.onRpc { req, txId -> + receiver.rpcDispatcher.on { req -> receiver.appContext.skeleton.context.dispatch( SkeletonActions.PauseTracking( req.pauseTracking, ), ) + }.launchIn(receiver.context.scope) - receiver.sendRpc( - TrackingPauseStateResponse( - trackingPaused = req.pauseTracking, - ), - txId, - ) + skeleton.context.state.map { it.paused }.distinctUntilChanged().drop(1).onEach { paused -> + receiver.sendRpc(TrackingPauseStateResponse(trackingPaused = paused)) }.launchIn(receiver.context.scope) receiver.onRpc { _, txId -> diff --git a/server/core/src/test/java/dev/slimevr/solarxr/SkeletonSettingsTest.kt b/server/core/src/test/java/dev/slimevr/solarxr/SkeletonSettingsTest.kt index cc9a18e8c..926ed43b7 100644 --- a/server/core/src/test/java/dev/slimevr/solarxr/SkeletonSettingsTest.kt +++ b/server/core/src/test/java/dev/slimevr/solarxr/SkeletonSettingsTest.kt @@ -29,7 +29,7 @@ private fun TestScope.testConn(): Pair { initialState = SolarXRBridgeState(dataFeedConfigs = listOf()), scope = backgroundScope, reducer = ::reduce, - behaviours = listOf(SkeletonSettingsBehaviour(settings)), + behaviours = listOf(SkeletonSettingsBehaviour(skeleton, settings)), name = "SolarXRSkeletonSettingsTest", ) val bridge = SolarXRBridge(