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 8cd10c166..ab97b876f 100644 --- a/server/core/src/main/java/dev/slimevr/driver/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/driver/behaviours.kt @@ -17,7 +17,7 @@ object DriverBaseBehaviour : DriverBridgeBehaviour { receiver.inbound.on { event -> receiver.appContext.server.getTracker(event.trackerId)?.context?.dispatch( - TrackerActions.Update { copy(rawRotation = event.rotation) }, + TrackerActions.SetRotation(rotation = event.rotation), ) } diff --git a/server/core/src/main/java/dev/slimevr/feeder/behaviours.kt b/server/core/src/main/java/dev/slimevr/feeder/behaviours.kt index 8bb95cfe2..52284de61 100644 --- a/server/core/src/main/java/dev/slimevr/feeder/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/feeder/behaviours.kt @@ -24,7 +24,7 @@ object FeederBaseBehaviour : FeederBridgeBehaviour { receiver.inbound.on { event -> receiver.appContext.server.getTracker(event.trackerId)?.context?.dispatch( - TrackerActions.Update { copy(rawRotation = event.rotation) }, + TrackerActions.SetRotation(rotation = event.rotation), ) } } diff --git a/server/core/src/main/java/dev/slimevr/hid/behaviours.kt b/server/core/src/main/java/dev/slimevr/hid/behaviours.kt index e35363e78..33f24cad0 100644 --- a/server/core/src/main/java/dev/slimevr/hid/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/hid/behaviours.kt @@ -125,22 +125,22 @@ object HIDRotationBehaviour : HIDReceiverBehaviour { override fun observe(receiver: HIDReceiver) { receiver.packetEvents.onPacket { packet -> val tracker = receiver.getTracker(packet.hidId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.Update { copy(rawRotation = packet.rotation) }) + tracker.context.dispatch(TrackerActions.SetRotation(rotation = packet.rotation, acceleration = packet.acceleration)) } receiver.packetEvents.onPacket { packet -> val tracker = receiver.getTracker(packet.hidId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.Update { copy(rawRotation = packet.rotation) }) + tracker.context.dispatch(TrackerActions.SetRotation(rotation = packet.rotation, acceleration = packet.acceleration)) } receiver.packetEvents.onPacket { packet -> val tracker = receiver.getTracker(packet.hidId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.Update { copy(rawRotation = packet.rotation) }) + tracker.context.dispatch(TrackerActions.SetRotation(rotation = packet.rotation)) } receiver.packetEvents.onPacket { packet -> val tracker = receiver.getTracker(packet.hidId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.Update { copy(rawRotation = packet.rotation) }) + tracker.context.dispatch(TrackerActions.SetRotation(rotation = packet.rotation, acceleration = packet.acceleration)) } } } diff --git a/server/core/src/main/java/dev/slimevr/tracker/behaviours.kt b/server/core/src/main/java/dev/slimevr/tracker/behaviours.kt index dca2247b1..56eff2bc8 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/behaviours.kt @@ -81,14 +81,14 @@ object TrackerTapDetectionBehaviour : TrackerBehaviour { } object TrackerBasicBehaviour : TrackerBehaviour { - override fun reduce(state: TrackerState, action: TrackerActions) : TrackerState { - val newState = if (action is TrackerActions.Update) - action.transform(state) - else - state - if (action is TrackerActions.Update) - println(newState) - return newState + override fun reduce(state: TrackerState, action: TrackerActions) = when (action) { + is TrackerActions.Update -> action.transform(state) + is TrackerActions.SetMagStatus -> state.copy(magStatus = action.status) + is TrackerActions.SetStatus -> state.copy(status = action.status) + is TrackerActions.SetRotation -> state.copy( + rawRotation = action.rotation ?: state.rawRotation, + acceleration = action.acceleration ?: state.acceleration, + ) } } diff --git a/server/core/src/main/java/dev/slimevr/tracker/module.kt b/server/core/src/main/java/dev/slimevr/tracker/module.kt index 8101ad883..add3ad94e 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/module.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/module.kt @@ -40,6 +40,9 @@ data class TrackerState( sealed interface TrackerActions { data class Update(val transform: TrackerState.() -> TrackerState) : TrackerActions + data class SetMagStatus(val status: MagnetometerStatus) : TrackerActions + data class SetStatus(val status: TrackerStatus) : TrackerActions + data class SetRotation(val rotation: Quaternion? = null, val acceleration: Vector3? = null) : TrackerActions } typealias TrackerContext = Context diff --git a/server/core/src/main/java/dev/slimevr/udp/behaviours.kt b/server/core/src/main/java/dev/slimevr/udp/behaviours.kt index 2a059fe86..52dc58b5b 100644 --- a/server/core/src/main/java/dev/slimevr/udp/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/udp/behaviours.kt @@ -172,7 +172,7 @@ object TimeoutBehaviour : UDPConnectionBehaviour { DeviceActions.Update { copy(status = TrackerStatus.TIMED_OUT) }, ) state.trackerIds.mapNotNull { receiver.appContext.server.getTracker(it.id) }.forEach { tracker -> - tracker.context.dispatch(TrackerActions.Update { copy(status = TrackerStatus.TIMED_OUT) }) + tracker.context.dispatch(TrackerActions.SetStatus(TrackerStatus.TIMED_OUT)) } } else { delay(timeUntilTimeout + 1) @@ -198,7 +198,7 @@ object DisconnectBehaviour : UDPConnectionBehaviour { DeviceActions.Update { copy(status = TrackerStatus.DISCONNECTED) }, ) currentState.trackerIds.mapNotNull { receiver.appContext.server.getTracker(it.id) }.forEach { tracker -> - tracker.context.dispatch(TrackerActions.Update { copy(status = TrackerStatus.DISCONNECTED) }) + tracker.context.dispatch(TrackerActions.SetStatus(TrackerStatus.DISCONNECTED)) } } } else { @@ -278,23 +278,23 @@ object SensorInfoBehaviour : UDPConnectionBehaviour { val existingTracker = receiver.getTracker(event.data.sensorId) if (existingTracker != null) { - existingTracker.context.dispatch(TrackerActions.Update { - copy(sensorType = event.data.imuType, status = event.data.status, completedRestCalibration = event.data.hasCompletedRestCalibration) - }) + existingTracker.context.dispatchAll(listOf( + TrackerActions.Update { copy(sensorType = event.data.imuType, completedRestCalibration = event.data.hasCompletedRestCalibration) }, + TrackerActions.SetStatus(event.data.status), + )) return@onPacket } val (tracker, isNew) = assignTracker(receiver, device, event) - tracker.context.dispatch(TrackerActions.Update { - copy( - sensorType = event.data.imuType, - status = event.data.status, - completedRestCalibration = event.data.hasCompletedRestCalibration, - magStatus = if (isNew && magStatus == MagnetometerStatus.NOT_SUPPORTED) { - if (event.data.sensorConfig?.magSupported == true) MagnetometerStatus.DISABLED else MagnetometerStatus.NOT_SUPPORTED - } else magStatus, - ) - }) + tracker.context.dispatchAll(listOf( + TrackerActions.Update { copy(sensorType = event.data.imuType, completedRestCalibration = event.data.hasCompletedRestCalibration) }, + TrackerActions.SetStatus(event.data.status), + )) + if (isNew && tracker.context.state.value.magStatus == MagnetometerStatus.NOT_SUPPORTED) { + tracker.context.dispatch(TrackerActions.SetMagStatus( + if (event.data.sensorConfig?.magSupported == true) MagnetometerStatus.DISABLED else MagnetometerStatus.NOT_SUPPORTED + )) + } val remoteMagStatus = event.data.sensorConfig?.let { if (it.magSupported) { @@ -321,22 +321,22 @@ object SensorRotationBehaviour : UDPConnectionBehaviour { override fun observe(receiver: UDPConnection) { receiver.packetEvents.onPacket { event -> val tracker = receiver.getTracker(event.data.sensorId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.Update { copy(rawRotation = event.data.rotation) }) + tracker.context.dispatch(TrackerActions.SetRotation(rotation = event.data.rotation)) } receiver.packetEvents.onPacket { event -> val tracker = receiver.getTracker(event.data.sensorId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.Update { copy(rawRotation = event.data.rotation, acceleration = event.data.acceleration) }) + tracker.context.dispatch(TrackerActions.SetRotation(rotation = event.data.rotation, acceleration = event.data.acceleration)) } receiver.packetEvents.onPacket { event -> val tracker = receiver.getTracker(event.data.sensorId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.Update { copy(acceleration = event.data.acceleration) }) + tracker.context.dispatch(TrackerActions.SetRotation(acceleration = event.data.acceleration)) } receiver.packetEvents.onPacket { event -> val tracker = receiver.getTracker(event.data.sensorId) ?: return@onPacket - tracker.context.dispatch(TrackerActions.Update { copy(rawRotation = event.data.rotation) }) + tracker.context.dispatch(TrackerActions.SetRotation(rotation = event.data.rotation)) } } } @@ -412,7 +412,6 @@ object SensorConfigBehaviour : UDPConnectionBehaviour { state = flags.magStatus == MagnetometerStatus.ENABLED ) ) - println("SEND CONFIG = ${flags.magStatus}") } } .launchIn(receiver.context.scope) @@ -427,8 +426,7 @@ object AckConfigBehaviour : UDPConnectionBehaviour { val tracker = receiver.getTracker(event.data.sensorId) ?: return@onPacket if (configType == SensorConfigType.MAGNETOMETER) { - tracker.context.dispatch(TrackerActions.Update { copy(magStatus = flags.magStatus) }) - println("UPDATE? = ${flags.magStatus}") + tracker.context.dispatch(TrackerActions.SetMagStatus(flags.magStatus)) } } }