diff --git a/server/core/src/main/java/dev/slimevr/resets/bodypart-sets.kt b/server/core/src/main/java/dev/slimevr/resets/bodypart-sets.kt index de84f45a4..f3af96b11 100644 --- a/server/core/src/main/java/dev/slimevr/resets/bodypart-sets.kt +++ b/server/core/src/main/java/dev/slimevr/resets/bodypart-sets.kt @@ -49,11 +49,11 @@ object ResetBodyParts { ) val LEFT_FINGERS_NO_THUMB = LEFT_FINGERS - - setOf( - BodyPart.LEFT_THUMB_METACARPAL, - BodyPart.LEFT_THUMB_PROXIMAL, - BodyPart.LEFT_THUMB_DISTAL, - ) + setOf( + BodyPart.LEFT_THUMB_METACARPAL, + BodyPart.LEFT_THUMB_PROXIMAL, + BodyPart.LEFT_THUMB_DISTAL, + ) val RIGHT_FINGERS = setOf( BodyPart.RIGHT_THUMB_METACARPAL, @@ -74,11 +74,11 @@ object ResetBodyParts { ) val RIGHT_FINGERS_NO_THUMB = RIGHT_FINGERS - - setOf( - BodyPart.RIGHT_THUMB_METACARPAL, - BodyPart.RIGHT_THUMB_PROXIMAL, - BodyPart.RIGHT_THUMB_DISTAL, - ) + setOf( + BodyPart.RIGHT_THUMB_METACARPAL, + BodyPart.RIGHT_THUMB_PROXIMAL, + BodyPart.RIGHT_THUMB_DISTAL, + ) val FINGERS = LEFT_FINGERS + RIGHT_FINGERS diff --git a/server/core/src/main/java/dev/slimevr/solarxr/driver/outgoing.kt b/server/core/src/main/java/dev/slimevr/solarxr/driver/outgoing.kt index 4536c328c..e67f0a873 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/driver/outgoing.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/driver/outgoing.kt @@ -11,12 +11,14 @@ import dev.slimevr.tracker.TrackerState import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.distinctUntilChangedBy import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import solarxr_protocol.datatypes.BodyPart +import solarxr_protocol.datatypes.BoneMask import solarxr_protocol.datatypes.DeviceOrigin import solarxr_protocol.driver_protocol.BoneBatteryUpdate import solarxr_protocol.driver_protocol.SkeletonUpdate @@ -63,11 +65,11 @@ class DriverOutgoingTrackersBehaviour( val boneBatteries = bodyPartMap() - combine(settings.context.state.map { it.data.driverConfig.enabled }, receiver.context.state) { enabled, state -> + combine(settings.context.state.map { it.data.driverConfig }, receiver.context.state) { driverConfig, state -> Triple( - enabled, + driverConfig.enabled, state.driverName, - state.boneMask, + if (!driverConfig.sendVelocity) state.boneMask?.copy(linearVelocity = false, angularVelocity = false) else state.boneMask, ) } .distinctUntilChanged()