mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-20 17:11:20 -08:00
Make velocity toggle for driver actually work
This commit is contained in:
1 parent
2f120cfff7
commit
fe08eb103e
2 files changed
+15
-13
No files matched your search
@@ -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
|
||||
|
||||
|
||||
@@ -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<BoneBatteryUpdate>()
|
||||
|
||||
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()
|
||||
|
||||
Reference in new issue
Block a user