github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-06 02:01:58 +02:00
Code Issues 160 Packages Projects Releases Wiki Activity

More position data for devices

Browse Source
This commit is contained in:
loucass003
2026-03-30 05:23:31 +02:00
parent e07ef046a6
commit 0ab80528fe
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/src/main/java/dev/slimevr/heightcalibration/module.kt
View File

@@ -47,12 +47,11 @@ class HeightCalibrationManager(
val hmdUpdates: Flow<TrackerSnapshot> = serverContext.context.state
.flatMapLatest { state ->
val hmd = state.trackers.values
.find { it.context.state.value.bodyPart == BodyPart.HEAD } // TODO: Need to check for a head with position support
.find { it.context.state.value.bodyPart == BodyPart.HEAD && it.context.state.value.position != null }
?: return@flatMapLatest emptyFlow()
hmd.context.state.map { s ->
TrackerSnapshot(
// TODO: get HMD position from VR system once position is set in the tracker
position = Vector3.NULL,
position = s.position ?: error("head (or HMD) will always have a position in this case"),
rotation = s.rawRotation,
)
}
@@ -62,13 +61,12 @@ class HeightCalibrationManager(
.flatMapLatest { state ->
val controllers = state.trackers.values.filter {
val bodyPart = it.context.state.value.bodyPart
bodyPart == BodyPart.LEFT_HAND || bodyPart == BodyPart.RIGHT_HAND
(bodyPart == BodyPart.LEFT_HAND || bodyPart == BodyPart.RIGHT_HAND) && it.context.state.value.position != null
}
if (controllers.isEmpty()) return@flatMapLatest emptyFlow()
combine(controllers.map { controller ->
controller.context.state.map { s ->
// TODO: get controller position from tracker once position is set in the tracker
val position = Vector3.NULL
val position = s.position ?: error("hands (or Controller) will always have a position in this case")
TrackerSnapshot(position = position, rotation = s.rawRotation)
}
}) { snapshots -> snapshots.minByOrNull { it.position.y }!! }

3
server/core/src/main/java/dev/slimevr/tracker/module.kt
View File

@@ -4,6 +4,7 @@ import dev.slimevr.context.Behaviour
import dev.slimevr.context.Context
import dev.slimevr.device.DeviceOrigin
import io.github.axisangles.ktmath.Quaternion
import io.github.axisangles.ktmath.Vector3
import kotlinx.coroutines.CoroutineScope
import solarxr_protocol.datatypes.BodyPart
import solarxr_protocol.datatypes.hardware_info.ImuType
@@ -20,6 +21,7 @@ data class TrackerState(
val rawRotation: Quaternion,
val deviceId: Int,
val origin: DeviceOrigin,
val position: Vector3?
)
sealed interface TrackerActions {
@@ -51,6 +53,7 @@ class Tracker(
deviceId = deviceId,
customName = null,
sensorType = sensorType,
position = null
)
val behaviours = listOf(TrackerInfosBehaviour)