mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-21 09:31:20 -08:00
Cleaner actions for common dispatch
This commit is contained in:
1 parent
aa505d041b
commit
fa3ebf4eb1
6 files changed
+37
-36
No files matched your search
@@ -17,7 +17,7 @@ object DriverBaseBehaviour : DriverBridgeBehaviour {
|
||||
|
||||
receiver.inbound.on<DriverBridgeInbound.TrackerPosition> { event ->
|
||||
receiver.appContext.server.getTracker(event.trackerId)?.context?.dispatch(
|
||||
TrackerActions.Update { copy(rawRotation = event.rotation) },
|
||||
TrackerActions.SetRotation(rotation = event.rotation),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ object FeederBaseBehaviour : FeederBridgeBehaviour {
|
||||
|
||||
receiver.inbound.on<FeederBridgeInbound.TrackerPosition> { event ->
|
||||
receiver.appContext.server.getTracker(event.trackerId)?.context?.dispatch(
|
||||
TrackerActions.Update { copy(rawRotation = event.rotation) },
|
||||
TrackerActions.SetRotation(rotation = event.rotation),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,22 +125,22 @@ object HIDRotationBehaviour : HIDReceiverBehaviour {
|
||||
override fun observe(receiver: HIDReceiver) {
|
||||
receiver.packetEvents.onPacket<HIDRotation> { 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<HIDRotationBattery> { 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<HIDRotationMag> { 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<HIDRotationButton> { 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))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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<TrackerState, TrackerActions>
|
||||
|
||||
@@ -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<RotationData> { 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<RotationAndAccel> { 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<Accel> { 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<Rotation2> { 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))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user