Only store tracker index in driver bridge

This commit is contained in:
Sapphire committed 2026-05-11 15:53:21 -05:00
1 parent 57c39c78b0
commit ddae53ab42
2 files changed
+11 -9

No files matched your search

@@ -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<DriverBridgeInbound.TrackerPosition> { 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<DriverBridgeInbound.TrackerBattery> { 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 {
@@ -15,7 +15,8 @@ import solarxr_protocol.datatypes.TrackerStatus
data class DriverBridgeState(
val protocolVersion: Int,
val trackers: Map<Int, Tracker>,
// SteamVR device index -> Tracker ID
val trackers: Map<Int, Int>,
)
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))
}
}
}