mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-20 09:01:20 -08:00
Fix tracking paused state not being broadcast to all connections
This commit is contained in:
3 files changed
+8
-9
No files matched your search
@@ -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))
|
||||
|
||||
@@ -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<SetPauseTrackingRequest> { req, txId ->
|
||||
receiver.rpcDispatcher.on<SetPauseTrackingRequest> { 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<TrackingPauseStateRequest> { _, txId ->
|
||||
|
||||
@@ -29,7 +29,7 @@ private fun TestScope.testConn(): Pair<SolarXRBridge, Skeleton> {
|
||||
initialState = SolarXRBridgeState(dataFeedConfigs = listOf()),
|
||||
scope = backgroundScope,
|
||||
reducer = ::reduce,
|
||||
behaviours = listOf(SkeletonSettingsBehaviour(settings)),
|
||||
behaviours = listOf(SkeletonSettingsBehaviour(skeleton, settings)),
|
||||
name = "SolarXRSkeletonSettingsTest",
|
||||
)
|
||||
val bridge = SolarXRBridge(
|
||||
|
||||
Reference in new issue
Block a user