From ddae53ab426a5fec98fa9d8847d2c010ae0cd86c Mon Sep 17 00:00:00 2001 From: Sapphire Date: Mon, 11 May 2026 15:53:21 -0500 Subject: [PATCH] Only store tracker index in driver bridge --- .../src/main/java/dev/slimevr/driver/behaviours.kt | 11 +++++------ .../core/src/main/java/dev/slimevr/driver/module.kt | 9 ++++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/server/core/src/main/java/dev/slimevr/driver/behaviours.kt b/server/core/src/main/java/dev/slimevr/driver/behaviours.kt index b0e61a381..c7a6486f2 100644 --- a/server/core/src/main/java/dev/slimevr/driver/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/driver/behaviours.kt @@ -14,7 +14,7 @@ import solarxr_protocol.datatypes.hardware_info.ImuType object DriverBaseBehaviour : DriverBridgeBehaviour { override fun reduce(state: DriverBridgeState, action: DriverBridgeActions): DriverBridgeState = when (action) { - is DriverBridgeActions.AddTracker -> state.copy(trackers = state.trackers + (action.id to action.tracker)) + is DriverBridgeActions.AddTracker -> state.copy(trackers = state.trackers + (action.id to action.tracker.context.state.value.id)) is DriverBridgeActions.UpdateProtocolVersion -> state.copy(protocolVersion = action.version) } @@ -28,18 +28,17 @@ object DriverBaseBehaviour : DriverBridgeBehaviour { } receiver.inbound.on { event -> - val tracker = receiver.context.state.value.trackers[event.trackerId] - if (tracker != null) { + val trackerId = receiver.context.state.value.trackers[event.trackerId] ?: return@on + receiver.appContext.server.getTracker(trackerId)?.let { tracker -> tracker.context.dispatch(TrackerActions.Update { copy(rawRotation = event.rotation, position = event.position) }) - } else { - AppLogger.steamvr.warn("Failed to find tracker ${event.trackerId}") } } receiver.inbound.on { event -> - receiver.context.state.value.trackers[event.id]?.let { tracker -> + val trackerId = receiver.context.state.value.trackers[event.id] ?: return@on + receiver.appContext.server.getTracker(trackerId)?.let { tracker -> val device = tracker.server.getDevice(tracker.context.state.value.deviceId) ?: error("could not find device") device.context.dispatch( DeviceActions.Update { diff --git a/server/core/src/main/java/dev/slimevr/driver/module.kt b/server/core/src/main/java/dev/slimevr/driver/module.kt index 1c3c68157..2d573e665 100644 --- a/server/core/src/main/java/dev/slimevr/driver/module.kt +++ b/server/core/src/main/java/dev/slimevr/driver/module.kt @@ -15,7 +15,8 @@ import solarxr_protocol.datatypes.TrackerStatus data class DriverBridgeState( val protocolVersion: Int, - val trackers: Map, + // SteamVR device index -> Tracker ID + val trackers: Map, ) sealed interface DriverBridgeActions { @@ -53,8 +54,10 @@ class DriverBridge( fun disconnect() { dispose() appContext.server.context.dispatch(VRServerActions.DriverDisconnected(id)) - context.state.value.trackers.forEach { (_, tracker) -> - tracker.context.dispatch(TrackerActions.SetStatus(TrackerStatus.DISCONNECTED)) + context.state.value.trackers.forEach { (_, id) -> + appContext.server.getTracker(id)?.let { + it.context.dispatch(TrackerActions.SetStatus(TrackerStatus.DISCONNECTED)) + } } }