From a371af75fa9b05374f465be2ea1426c1a809e4ae Mon Sep 17 00:00:00 2001 From: loucass003 Date: Sun, 13 Sep 2026 14:14:12 +0200 Subject: [PATCH] Move registry into a module, preparing for extensions --- .../dev/slimevr/android/ForegroundService.kt | 8 ++- .../src/main/java/dev/slimevr/app-context.kt | 4 ++ .../java/dev/slimevr/autobone/functions.kt | 2 +- .../dev/slimevr/{skeleton => bones}/bones.kt | 9 ++- .../hierarchy.kt} | 2 +- .../src/main/java/dev/slimevr/bones/module.kt | 38 ++++++++++++ .../main/java/dev/slimevr/bones/reducer.kt | 33 +++++++++++ .../bone-registry.kt => bones/registry.kt} | 31 +++++++--- .../src/main/java/dev/slimevr/bvh/stream.kt | 2 +- .../main/java/dev/slimevr/config/settings.kt | 4 +- .../slimevr/heightcalibration/behaviours.kt | 2 +- .../dev/slimevr/heightcalibration/module.kt | 2 +- .../slimevr/hid/behaviours/v3/sensor-info.kt | 2 +- .../main/java/dev/slimevr/keybind/module.kt | 2 +- .../main/java/dev/slimevr/resets/module.kt | 10 ++-- .../main/java/dev/slimevr/resets/reducer.kt | 2 +- .../java/dev/slimevr/routing/behaviours.kt | 2 +- .../main/java/dev/slimevr/routing/routing.kt | 6 +- .../java/dev/slimevr/skeleton/behaviours.kt | 6 ++ .../slimevr/skeleton/bodypart-constraints.kt | 2 + .../slimevr/skeleton/bodypart-ik-chains.kt | 3 + .../dev/slimevr/skeleton/centre-of-mass.kt | 2 + .../skeleton/computedprocessors/velocity.kt | 2 +- .../skeleton/fkprocessors/foot-plant.kt | 4 +- .../skeleton/fkprocessors/localizer.kt | 4 +- .../slimevr/skeleton/fkprocessors/toe-snap.kt | 4 +- .../src/main/java/dev/slimevr/skeleton/ik.kt | 2 + .../inputprocessors/bone-direct-link.kt | 4 +- .../skeleton/inputprocessors/constraint.kt | 4 +- .../skeleton/inputprocessors/finger-impute.kt | 4 +- .../inputprocessors/head-position-fallback.kt | 2 +- .../inputprocessors/hip-yaw-roll-align.kt | 2 +- .../skeleton/inputprocessors/prediction.kt | 6 +- .../skeleton/inputprocessors/relaxed-spine.kt | 4 +- .../skeleton/inputprocessors/smoothing.kt | 2 +- .../inputprocessors/toe-active-link.kt | 4 +- .../inputprocessors/upper-legs-roll-align.kt | 4 +- .../main/java/dev/slimevr/skeleton/module.kt | 8 ++- .../java/dev/slimevr/skeleton/proportions.kt | 4 ++ .../main/java/dev/slimevr/skeleton/reducer.kt | 3 + .../skeleton/targetprocessors/floor-clip.kt | 4 +- .../targetprocessors/skating-correction.kt | 4 +- .../main/java/dev/slimevr/solarxr/common.kt | 2 +- .../dev/slimevr/solarxr/driver/incoming.kt | 2 +- .../dev/slimevr/solarxr/driver/outgoing.kt | 8 +-- .../main/java/dev/slimevr/solarxr/module.kt | 4 +- .../dev/slimevr/solarxr/rpc/bone-routing.kt | 6 +- .../solarxr/rpc/session-calibration.kt | 2 +- .../solarxr/rpc/skeleton-proportions.kt | 6 +- .../dev/slimevr/solarxr/rpc/tap-detection.kt | 2 +- .../slimevr/solarxr/rpc/tracker-assignment.kt | 2 +- .../dev/slimevr/tapdetection/behaviours.kt | 6 +- .../java/dev/slimevr/tapdetection/module.kt | 5 +- .../dev/slimevr/tracker/behaviours/config.kt | 4 +- .../default-mounting-orientation.kt | 2 +- .../tracker/behaviours/rest-orientation.kt | 2 +- .../tracker/behaviours/stay-aligned.kt | 2 +- .../slimevr/tracker/behaviours/to-skeleton.kt | 2 +- .../main/java/dev/slimevr/tracker/module.kt | 4 +- .../main/java/dev/slimevr/tracker/reducer.kt | 2 +- .../tracker/stayaligned/poses/player-pose.kt | 4 +- .../tracker/stayaligned/poses/relaxed-pose.kt | 2 +- .../stayaligned/tracker-yaw-correction.kt | 4 +- .../slimevr/tracker/stayaligned/yaw-utils.kt | 2 +- .../slimevr/trackingchecklist/behaviours.kt | 4 +- .../java/dev/slimevr/vmc/input-decoder.kt | 4 +- .../src/main/java/dev/slimevr/vmc/input.kt | 4 +- .../src/main/java/dev/slimevr/vmc/mapping.kt | 2 +- .../src/main/java/dev/slimevr/vmc/module.kt | 2 +- .../java/dev/slimevr/vmc/output-encoder.kt | 2 +- .../src/main/java/dev/slimevr/vmc/output.kt | 4 +- .../core/src/main/java/dev/slimevr/vmc/vrm.kt | 2 +- .../main/java/dev/slimevr/vrchat/module.kt | 2 +- .../src/main/java/dev/slimevr/vrcosc/input.kt | 2 +- .../main/java/dev/slimevr/vrcosc/module.kt | 2 +- .../java/dev/slimevr/vrcosc/output-encoder.kt | 2 +- .../main/java/dev/slimevr/vrcosc/output.kt | 4 +- .../vrcosc/toe-plugin-output-encoder.kt | 2 +- .../src/test/java/dev/slimevr/TestServer.kt | 11 ++-- .../slimevr/bones/BoneRegistryManagerTest.kt | 59 +++++++++++++++++++ .../{skeleton => bones}/BoneRegistryTest.kt | 2 +- .../java/dev/slimevr/bvh/BvhStreamTest.kt | 6 +- .../slimevr/routing/AutomaticRoutesTest.kt | 2 +- .../dev/slimevr/routing/ManualRoutesTest.kt | 4 +- .../test/java/dev/slimevr/skeleton/IKTest.kt | 5 +- .../dev/slimevr/solarxr/ConnectionInitTest.kt | 6 +- .../java/dev/slimevr/solarxr/DataFeedTest.kt | 4 +- .../stayaligned/ComputeYawCorrectionTest.kt | 4 +- .../slimevr/tracker/YawResetSmoothingTest.kt | 2 +- .../TrackingChecklistTest.kt | 2 +- .../java/dev/slimevr/vmc/InputDecoderTest.kt | 8 +-- .../java/dev/slimevr/vmc/OutputEncoderTest.kt | 6 +- .../dev/slimevr/vmc/VMCInputBehaviourTest.kt | 6 +- .../src/main/java/dev/slimevr/desktop/Main.kt | 8 ++- 94 files changed, 352 insertions(+), 145 deletions(-) rename server/core/src/main/java/dev/slimevr/{skeleton => bones}/bones.kt (96%) rename server/core/src/main/java/dev/slimevr/{skeleton/bodypart-structure.kt => bones/hierarchy.kt} (99%) create mode 100644 server/core/src/main/java/dev/slimevr/bones/module.kt create mode 100644 server/core/src/main/java/dev/slimevr/bones/reducer.kt rename server/core/src/main/java/dev/slimevr/{skeleton/bone-registry.kt => bones/registry.kt} (79%) create mode 100644 server/core/src/test/java/dev/slimevr/bones/BoneRegistryManagerTest.kt rename server/core/src/test/java/dev/slimevr/{skeleton => bones}/BoneRegistryTest.kt (99%) diff --git a/server/android/src/main/java/dev/slimevr/android/ForegroundService.kt b/server/android/src/main/java/dev/slimevr/android/ForegroundService.kt index 9dfcd3d0b..821663c27 100644 --- a/server/android/src/main/java/dev/slimevr/android/ForegroundService.kt +++ b/server/android/src/main/java/dev/slimevr/android/ForegroundService.kt @@ -27,6 +27,7 @@ import dev.slimevr.android.serial.createAndroidSerialServer import dev.slimevr.android.timing.createAndroidWaiter import dev.slimevr.android.udp.resolveAndroidUdpAddress import dev.slimevr.android.vrchat.resolveAndroidLocalIpAddress +import dev.slimevr.bones.BoneRegistryManager import dev.slimevr.bvh.BVHManager import dev.slimevr.config.AppConfig import dev.slimevr.firmware.FirmwareManager @@ -150,11 +151,15 @@ class ForegroundService : Service() { val config = AppConfig.create(scope = scope, storage = storage) val server = VRServer.create(scope = scope) val serialServer = createAndroidSerialServer(context = this, scope = scope) + val bones = BoneRegistryManager.create(scope = scope) - val phase1 = Phase1Context(server = server, config = config, serialServer = serialServer) + val phase1 = Phase1Context(server = server, config = config, serialServer = serialServer, bones = bones) val firmwareManager = FirmwareManager.create(ctx = phase1, scope = scope, flasher = AndroidFirmwareFlasher) val networkProfileManager = NetworkProfileManager.create(scope = scope, isSupported = false) + // Nothing registers extension bones yet, so this is a no-op today; it exists so the + // tracking stack below never observes a registry that could still change under it. + bones.freeze() val skeleton = Skeleton.create(scope = scope, ctx = phase1, waiter = createAndroidWaiter()) val provisioningManager = ProvisioningManager.create(ctx = phase1, scope = scope) val heightCalibrationManager = HeightCalibrationManager.create(ctx = phase1, scope = scope) @@ -178,6 +183,7 @@ class ForegroundService : Service() { server = server, config = config, serialServer = serialServer, + bones = bones, serverInfos = serverInfos, featureFlags = FeatureFlags( skipCheckUdev = true, diff --git a/server/core/src/main/java/dev/slimevr/app-context.kt b/server/core/src/main/java/dev/slimevr/app-context.kt index 61d8640d7..93987d77b 100644 --- a/server/core/src/main/java/dev/slimevr/app-context.kt +++ b/server/core/src/main/java/dev/slimevr/app-context.kt @@ -1,5 +1,6 @@ package dev.slimevr +import dev.slimevr.bones.BoneRegistryManager import dev.slimevr.bvh.BVHManager import dev.slimevr.config.AppConfig import dev.slimevr.firmware.FirmwareManager @@ -23,12 +24,14 @@ interface Phase1ContextProvider { val server: VRServer val config: AppConfig val serialServer: SerialServer + val bones: BoneRegistryManager } data class Phase1Context( override val server: VRServer, override val config: AppConfig, override val serialServer: SerialServer, + override val bones: BoneRegistryManager, ) : Phase1ContextProvider interface AppContextProvider : Phase1ContextProvider { @@ -57,6 +60,7 @@ class AppContext( override val server: VRServer, override val config: AppConfig, override val serialServer: SerialServer, + override val bones: BoneRegistryManager, override val serverInfos: ServerInfos, override val featureFlags: FeatureFlags, override val keybindManager: KeybindManager, diff --git a/server/core/src/main/java/dev/slimevr/autobone/functions.kt b/server/core/src/main/java/dev/slimevr/autobone/functions.kt index 6d01621b2..1f4a4522d 100644 --- a/server/core/src/main/java/dev/slimevr/autobone/functions.kt +++ b/server/core/src/main/java/dev/slimevr/autobone/functions.kt @@ -1,7 +1,7 @@ package dev.slimevr.autobone +import dev.slimevr.bones.boneId import dev.slimevr.skeleton.ComputedSkeleton -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.Vector3 import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/bones.kt b/server/core/src/main/java/dev/slimevr/bones/bones.kt similarity index 96% rename from server/core/src/main/java/dev/slimevr/skeleton/bones.kt rename to server/core/src/main/java/dev/slimevr/bones/bones.kt index 1a92ff91a..ece23459d 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/bones.kt +++ b/server/core/src/main/java/dev/slimevr/bones/bones.kt @@ -1,4 +1,4 @@ -package dev.slimevr.skeleton +package dev.slimevr.bones import solarxr_protocol.datatypes.BodyPart import java.util.EnumMap @@ -76,7 +76,12 @@ class BoneMap private constructor( } @Suppress("UNCHECKED_CAST") - override fun get(key: BoneId): V? = array.getOrNull(key.value.toInt()) as V? + override fun get(key: BoneId): V? { + val index = key.value.toInt() + if (index == 0) return null + require(index in 1 until array.size) { "$key is outside this registry" } + return array[index] as V? + } operator fun set(key: BoneId, value: V) { array[indexOf(key)] = value diff --git a/server/core/src/main/java/dev/slimevr/skeleton/bodypart-structure.kt b/server/core/src/main/java/dev/slimevr/bones/hierarchy.kt similarity index 99% rename from server/core/src/main/java/dev/slimevr/skeleton/bodypart-structure.kt rename to server/core/src/main/java/dev/slimevr/bones/hierarchy.kt index d74bc4476..51c2d11a5 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/bodypart-structure.kt +++ b/server/core/src/main/java/dev/slimevr/bones/hierarchy.kt @@ -1,4 +1,4 @@ -package dev.slimevr.skeleton +package dev.slimevr.bones import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/bones/module.kt b/server/core/src/main/java/dev/slimevr/bones/module.kt new file mode 100644 index 000000000..37efb835f --- /dev/null +++ b/server/core/src/main/java/dev/slimevr/bones/module.kt @@ -0,0 +1,38 @@ +package dev.slimevr.bones + +import dev.slimevr.context.Context +import kotlinx.coroutines.CoroutineScope +import solarxr_protocol.connection.BoneDefinition + +data class BoneRegistryState(val registry: BoneRegistry, val frozen: Boolean) + +sealed interface BoneRegistryActions { + data class RegisterBones(val bones: List) : BoneRegistryActions + data object Freeze : BoneRegistryActions +} + +typealias BoneRegistryContext = Context + +/** + * Owns the server's [BoneRegistry]. Bones are contributed via [register] during bootstrap, then + * [freeze] closes the window before the tracking stack starts: no tracker or skeleton state is + * ever built against a registry that can still change under it. + */ +class BoneRegistryManager(val context: BoneRegistryContext) { + val current: BoneRegistry get() = context.state.value.registry + + fun register(bones: List) = context.dispatch(BoneRegistryActions.RegisterBones(bones)) + fun freeze() = context.dispatch(BoneRegistryActions.Freeze) + + companion object { + fun create(scope: CoroutineScope, initial: BoneRegistry = BoneRegistry.standard()): BoneRegistryManager { + val context = Context.create( + initialState = BoneRegistryState(registry = initial, frozen = false), + scope = scope, + reducer = ::reduce, + name = "BoneRegistry", + ) + return BoneRegistryManager(context) + } + } +} diff --git a/server/core/src/main/java/dev/slimevr/bones/reducer.kt b/server/core/src/main/java/dev/slimevr/bones/reducer.kt new file mode 100644 index 000000000..de7162ecc --- /dev/null +++ b/server/core/src/main/java/dev/slimevr/bones/reducer.kt @@ -0,0 +1,33 @@ +package dev.slimevr.bones + +import solarxr_protocol.connection.BoneDefinition +import solarxr_protocol.connection.BoneRegistry as WireBoneRegistry + +/** + * Assigns each of [incoming] a fresh ID above every ID [registry] already has, preserving order. + * A `parent` must reference a bone [registry] already defines; contributing two new bones that + * are parent and child of each other in the same batch isn't supported. A `standardBodyPart` is + * rejected here too, since only the initial [BoneRegistry.standard] registry may claim those IDs, + * which is what keeps [BodyPart.boneId][dev.slimevr.bones.boneId] safe to use with no lookup. + */ +private fun assignIds(registry: BoneRegistry, incoming: List): List { + var nextId = registry.maxId + return incoming.map { definition -> + require(definition.standardBodyPart == null) { "Extension bone \"${definition.key}\" cannot claim a standard body part" } + require(definition.parent == 0.toUShort() || registry[BoneId(definition.parent)] != null) { + "Extension bone \"${definition.key}\" has an unknown parent" + } + nextId++ + definition.copy(id = nextId.toUShort()) + } +} + +fun reduce(state: BoneRegistryState, action: BoneRegistryActions): BoneRegistryState = when (action) { + is BoneRegistryActions.RegisterBones -> { + require(!state.frozen) { "The bone registry is frozen; bones must be registered before the tracking stack starts" } + val merged = WireBoneRegistry(bones = state.registry.value.bones + assignIds(state.registry, action.bones)) + state.copy(registry = BoneRegistry.from(merged)) + } + + is BoneRegistryActions.Freeze -> state.copy(frozen = true) +} diff --git a/server/core/src/main/java/dev/slimevr/skeleton/bone-registry.kt b/server/core/src/main/java/dev/slimevr/bones/registry.kt similarity index 79% rename from server/core/src/main/java/dev/slimevr/skeleton/bone-registry.kt rename to server/core/src/main/java/dev/slimevr/bones/registry.kt index 058e6f8dc..a56f5a097 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/bone-registry.kt +++ b/server/core/src/main/java/dev/slimevr/bones/registry.kt @@ -1,4 +1,4 @@ -package dev.slimevr.skeleton +package dev.slimevr.bones import solarxr_protocol.connection.BoneDefinition import solarxr_protocol.datatypes.BodyPart @@ -10,6 +10,11 @@ import solarxr_protocol.connection.BoneRegistry as WireBoneRegistry * * [BodyPart] is only used at the edges: to seed [standard], and to resolve specific bones by * name. Everything else is [BoneId]-keyed, so a bone with no standard body part still works. + * + * Invariant: a definition with a [BoneDefinition.standardBodyPart] always has + * `id == standardBodyPart.value`, checked below. That is what lets [BodyPart.boneId] convert + * without a registry lookup, so extension bones (added via `BoneRegistryManager.register`) must + * never be assigned a standard body part, and standard IDs are never reassigned. */ class BoneRegistry private constructor( val value: WireBoneRegistry, @@ -37,12 +42,15 @@ class BoneRegistry private constructor( fun parentOf(id: BoneId): BoneId? = this[id]?.parent?.takeIf { it != 0.toUShort() }?.let(::BoneId) fun childrenOf(id: BoneId): List = (childIds.getOrNull(id.value.toInt()) ?: IntArray(0)).map { BoneId(it.toUShort()) } - // Hierarchy is fixed for the registry's lifetime, so traversals are too. Memoized lazily - // since the bone set isn't known at compile time. - private val hierarchyCache = arrayOfNulls>>(2 * (maxId + 1)) - fun hierarchyFrom(root: BoneId, onlyChildren: Boolean = false): List> { - val cacheIndex = root.value.toInt() * 2 + if (onlyChildren) 1 else 0 - hierarchyCache[cacheIndex]?.let { return it } + // Hierarchy is fixed for the registry's lifetime, so traversals are too: computed once here, + // not memoized lazily on first use. This registry is shared across every consumer once + // frozen, each free to call hierarchyFrom from its own dispatcher; a lazily-filled plain + // array has no happens-before edge between an unsynchronized writer and a reader on another + // thread, which a mutable ArrayList published that way can turn into a torn read instead of + // just wasted recomputation. Built once, single-threaded, during construction instead. + private val hierarchyCache: Array>> = Array(2 * (maxId + 1)) { cacheIndex -> + val root = BoneId((cacheIndex / 2).toUShort()) + val onlyChildren = cacheIndex % 2 == 1 val result = mutableListOf>() fun visit(parent: BoneId?, id: BoneId, skipSelf: Boolean) { if (!skipSelf) result += parent to id @@ -51,10 +59,12 @@ class BoneRegistry private constructor( } } visit(null, root, onlyChildren) - hierarchyCache[cacheIndex] = result - return result + result } + fun hierarchyFrom(root: BoneId, onlyChildren: Boolean = false): List> = + hierarchyCache[root.value.toInt() * 2 + if (onlyChildren) 1 else 0] + /** Cached: a full rebuild starts from [root] alone, the most common call to [highest]. */ val rootSet: BoneSet = BoneSet.of(this, listOf(root)) @@ -106,6 +116,9 @@ class BoneRegistry private constructor( "Bone registry IDs must be exactly 1..$n" } require(registry.bones.all { it.parent == 0.toUShort() || it.parent in definitions }) { "Bone registry has an unknown parent" } + require(registry.bones.all { definition -> definition.standardBodyPart?.let { it.value.toUShort() == definition.id } ?: true }) { + "A standard body part's ID must equal its BodyPart value" + } val visited = mutableSetOf() fun root(id: UShort): UShort { require(visited.add(id)) { "Bone registry contains a cycle" } diff --git a/server/core/src/main/java/dev/slimevr/bvh/stream.kt b/server/core/src/main/java/dev/slimevr/bvh/stream.kt index 33b9cbccb..85bf7e7c2 100644 --- a/server/core/src/main/java/dev/slimevr/bvh/stream.kt +++ b/server/core/src/main/java/dev/slimevr/bvh/stream.kt @@ -1,8 +1,8 @@ package dev.slimevr.bvh import com.jme3.math.FastMath +import dev.slimevr.bones.BoneId import dev.slimevr.config.TextFileHandle -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.ComputedSkeleton import io.github.axisangles.ktmath.EulerOrder import io.github.axisangles.ktmath.Quaternion diff --git a/server/core/src/main/java/dev/slimevr/config/settings.kt b/server/core/src/main/java/dev/slimevr/config/settings.kt index 6fc6e0bbd..4d1f9f354 100644 --- a/server/core/src/main/java/dev/slimevr/config/settings.kt +++ b/server/core/src/main/java/dev/slimevr/config/settings.kt @@ -1,9 +1,9 @@ package dev.slimevr.config +import dev.slimevr.bones.key import dev.slimevr.context.Behaviour import dev.slimevr.context.Context import dev.slimevr.skeleton.inputprocessors.DEFAULT_SPINE_UPPER_LOWER -import dev.slimevr.skeleton.key import io.github.axisangles.ktmath.Quaternion import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job @@ -59,7 +59,7 @@ data class BoneRoutingConfig( * Explicit routes. Ignored while [automatic], apart from the overridable bones, which * the user owns in either mode. Do not read directly, use BoneRoutingManager. * - * Keyed by [dev.slimevr.skeleton.BoneRegistry] key + * Keyed by [dev.slimevr.bones.BoneRegistry] key */ val manualRoutes: Map>? = null, ) diff --git a/server/core/src/main/java/dev/slimevr/heightcalibration/behaviours.kt b/server/core/src/main/java/dev/slimevr/heightcalibration/behaviours.kt index de95fb0e7..f44cbbc2f 100644 --- a/server/core/src/main/java/dev/slimevr/heightcalibration/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/heightcalibration/behaviours.kt @@ -2,9 +2,9 @@ package dev.slimevr.heightcalibration +import dev.slimevr.bones.boneId import dev.slimevr.config.UserConfig import dev.slimevr.config.UserConfigActions -import dev.slimevr.skeleton.boneId import dev.slimevr.skeleton.computeDefaultProportionsByBone import dev.slimevr.tracker.TrackerState import io.github.axisangles.ktmath.Vector3 diff --git a/server/core/src/main/java/dev/slimevr/heightcalibration/module.kt b/server/core/src/main/java/dev/slimevr/heightcalibration/module.kt index dc11c48ae..2fdaa4d10 100644 --- a/server/core/src/main/java/dev/slimevr/heightcalibration/module.kt +++ b/server/core/src/main/java/dev/slimevr/heightcalibration/module.kt @@ -4,10 +4,10 @@ package dev.slimevr.heightcalibration import dev.slimevr.Phase1ContextProvider import dev.slimevr.VRServer +import dev.slimevr.bones.boneId import dev.slimevr.config.UserConfig import dev.slimevr.context.Behaviour import dev.slimevr.context.Context -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 import kotlinx.coroutines.CoroutineScope diff --git a/server/core/src/main/java/dev/slimevr/hid/behaviours/v3/sensor-info.kt b/server/core/src/main/java/dev/slimevr/hid/behaviours/v3/sensor-info.kt index 061c317b1..27019a648 100644 --- a/server/core/src/main/java/dev/slimevr/hid/behaviours/v3/sensor-info.kt +++ b/server/core/src/main/java/dev/slimevr/hid/behaviours/v3/sensor-info.kt @@ -1,9 +1,9 @@ package dev.slimevr.hid.behaviours.v3 +import dev.slimevr.bones.boneId import dev.slimevr.hid.HIDReceiver import dev.slimevr.hid.HIDReceiverBehaviour import dev.slimevr.hid.HIDSensorInfo -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.TrackerActions import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/keybind/module.kt b/server/core/src/main/java/dev/slimevr/keybind/module.kt index 6afe72c43..0ebf23904 100644 --- a/server/core/src/main/java/dev/slimevr/keybind/module.kt +++ b/server/core/src/main/java/dev/slimevr/keybind/module.kt @@ -2,6 +2,7 @@ package dev.slimevr.keybind import dev.slimevr.AppContextProvider import dev.slimevr.EventDispatcher +import dev.slimevr.bones.boneId import dev.slimevr.config.KeybindConfig import dev.slimevr.config.Settings import dev.slimevr.context.Behaviour @@ -9,7 +10,6 @@ import dev.slimevr.context.Context import dev.slimevr.resets.ResetsManager import dev.slimevr.skeleton.Skeleton import dev.slimevr.skeleton.SkeletonActions -import dev.slimevr.skeleton.boneId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.delay diff --git a/server/core/src/main/java/dev/slimevr/resets/module.kt b/server/core/src/main/java/dev/slimevr/resets/module.kt index e6f00b17b..7276af79b 100644 --- a/server/core/src/main/java/dev/slimevr/resets/module.kt +++ b/server/core/src/main/java/dev/slimevr/resets/module.kt @@ -3,16 +3,17 @@ package dev.slimevr.resets import com.jme3.math.FastMath import dev.slimevr.Phase1ContextProvider import dev.slimevr.VRServer +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.boneId import dev.slimevr.config.ResetsConfig import dev.slimevr.config.Settings import dev.slimevr.config.SettingsActions import dev.slimevr.context.Behaviour import dev.slimevr.context.Context import dev.slimevr.logging.AppLogger -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.Skeleton import dev.slimevr.skeleton.SkeletonActions -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.TrackerActions import dev.slimevr.tracker.getFirstActiveFor import io.github.axisangles.ktmath.Quaternion @@ -52,11 +53,10 @@ sealed interface ResetsActions { typealias ResetsContext = Context typealias ResetsBehaviour = Behaviour -class ResetsManager(val context: ResetsContext, val server: VRServer, val settings: Settings, val skeleton: Skeleton) { +class ResetsManager(val context: ResetsContext, val server: VRServer, val settings: Settings, val skeleton: Skeleton, private val registry: BoneRegistry) { fun startObserving() = context.observeAll(this) private var resetJob: Job = Job() - private val registry get() = skeleton.registry /** * Schedules a reset according to the resetType. @@ -211,7 +211,7 @@ class ResetsManager(val context: ResetsContext, val server: VRServer, val settin behaviours = listOf(ResetsMountingTimeoutBehaviour()), name = "ResetsManager", ) - return ResetsManager(context, ctx.server, ctx.config.settings, skeleton) + return ResetsManager(context, ctx.server, ctx.config.settings, skeleton, ctx.bones.current) } } } diff --git a/server/core/src/main/java/dev/slimevr/resets/reducer.kt b/server/core/src/main/java/dev/slimevr/resets/reducer.kt index 1c568543a..0b2d66734 100644 --- a/server/core/src/main/java/dev/slimevr/resets/reducer.kt +++ b/server/core/src/main/java/dev/slimevr/resets/reducer.kt @@ -1,6 +1,6 @@ package dev.slimevr.resets -import dev.slimevr.skeleton.boneId +import dev.slimevr.bones.boneId import dev.slimevr.util.timeSource import solarxr_protocol.rpc.ResetType diff --git a/server/core/src/main/java/dev/slimevr/routing/behaviours.kt b/server/core/src/main/java/dev/slimevr/routing/behaviours.kt index 7ec03f853..c0c9f3392 100644 --- a/server/core/src/main/java/dev/slimevr/routing/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/routing/behaviours.kt @@ -16,7 +16,7 @@ class BoneRoutingBasicBehaviour(private val appContext: AppContextProvider) : Bo override fun observe(receiver: BoneRoutingManager) { val server = appContext.server val settings = appContext.config.settings - val registry = appContext.skeleton.registry + val registry = appContext.bones.current combine( settings.context.state.map { it.data.boneRoutingConfig }.distinctUntilChanged(), diff --git a/server/core/src/main/java/dev/slimevr/routing/routing.kt b/server/core/src/main/java/dev/slimevr/routing/routing.kt index 07b5c8219..93253a97e 100644 --- a/server/core/src/main/java/dev/slimevr/routing/routing.kt +++ b/server/core/src/main/java/dev/slimevr/routing/routing.kt @@ -1,9 +1,9 @@ package dev.slimevr.routing import dev.slimevr.AppContextProvider +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.BoneRegistry import dev.slimevr.config.BoneRoutingConfig -import dev.slimevr.skeleton.BoneId -import dev.slimevr.skeleton.BoneRegistry import dev.slimevr.solarxr.driver.DRIVER_SUPPORTED_BONES import dev.slimevr.tracker.TrackerState import dev.slimevr.util.isActive @@ -121,7 +121,7 @@ fun intendedRoutesFlow(appContext: AppContextProvider): Flow = combine( appContext.config.settings.context.state.map { it.data.boneRoutingConfig }.distinctUntilChanged(), appContext.boneRouting.context.state.map { it.routes }, ) { config, sent -> - val registry = appContext.skeleton.registry + val registry = appContext.bones.current val requested = if (config.automatic) sent else manualRoutesAsBoneIds(config.manualRoutes, registry) effectiveRoutes(requested + overrideRoutes(config, registry), ALL_ACTIVE, registry) }.distinctUntilChanged() diff --git a/server/core/src/main/java/dev/slimevr/skeleton/behaviours.kt b/server/core/src/main/java/dev/slimevr/skeleton/behaviours.kt index c8d8ea1c9..427e4a670 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/behaviours.kt @@ -1,5 +1,11 @@ package dev.slimevr.skeleton +import dev.slimevr.bones.BoneMap +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.BoneSet +import dev.slimevr.bones.boneId +import dev.slimevr.bones.mutateCopy +import dev.slimevr.bones.resolveToBoneIds import dev.slimevr.config.Settings import dev.slimevr.config.UserConfig import dev.slimevr.logging.AppLogger diff --git a/server/core/src/main/java/dev/slimevr/skeleton/bodypart-constraints.kt b/server/core/src/main/java/dev/slimevr/skeleton/bodypart-constraints.kt index 1e92f919f..86fb4f90a 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/bodypart-constraints.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/bodypart-constraints.kt @@ -1,6 +1,8 @@ package dev.slimevr.skeleton import com.jme3.math.FastMath +import dev.slimevr.bones.BodyPartMap +import dev.slimevr.bones.BoneId import io.github.axisangles.ktmath.Quaternion import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/bodypart-ik-chains.kt b/server/core/src/main/java/dev/slimevr/skeleton/bodypart-ik-chains.kt index dd24e8c5f..e51202c14 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/bodypart-ik-chains.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/bodypart-ik-chains.kt @@ -1,5 +1,8 @@ package dev.slimevr.skeleton +import dev.slimevr.bones.BodyPartMap +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import solarxr_protocol.datatypes.BodyPart typealias BodyPartChain = List diff --git a/server/core/src/main/java/dev/slimevr/skeleton/centre-of-mass.kt b/server/core/src/main/java/dev/slimevr/skeleton/centre-of-mass.kt index fb8adb2a4..82a7766f5 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/centre-of-mass.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/centre-of-mass.kt @@ -1,5 +1,7 @@ package dev.slimevr.skeleton +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.util.inFloatingSeconds import io.github.axisangles.ktmath.Vector3 import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/computedprocessors/velocity.kt b/server/core/src/main/java/dev/slimevr/skeleton/computedprocessors/velocity.kt index 421e54631..24a02b191 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/computedprocessors/velocity.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/computedprocessors/velocity.kt @@ -1,6 +1,6 @@ package dev.slimevr.skeleton.computedprocessors -import dev.slimevr.skeleton.BoneId +import dev.slimevr.bones.BoneId import dev.slimevr.skeleton.ComputedSkeleton import dev.slimevr.skeleton.ResettableSkeletonProcessor import dev.slimevr.skeleton.SkeletonComputedProcessor diff --git a/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/foot-plant.kt b/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/foot-plant.kt index cb1d4fb81..2e160a0e1 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/foot-plant.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/foot-plant.kt @@ -1,11 +1,11 @@ package dev.slimevr.skeleton.fkprocessors +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.ComputedSkeleton import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonFkProcessor -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.eulerHeading import io.github.axisangles.ktmath.Quaternion import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/localizer.kt b/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/localizer.kt index 2995f207e..dcf09b715 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/localizer.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/localizer.kt @@ -1,13 +1,13 @@ package dev.slimevr.skeleton.fkprocessors +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.BoneState import dev.slimevr.skeleton.ComputedSkeleton import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.ResettableSkeletonProcessor import dev.slimevr.skeleton.SkeletonFkProcessor -import dev.slimevr.skeleton.boneId import dev.slimevr.skeleton.centreOfMass import dev.slimevr.skeleton.resolveMasses import dev.slimevr.skeleton.targetprocessors.FLOOR_CALIBRATION_OFFSET diff --git a/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/toe-snap.kt b/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/toe-snap.kt index dbffb32fc..13b56bd7b 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/toe-snap.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/fkprocessors/toe-snap.kt @@ -1,11 +1,11 @@ package dev.slimevr.skeleton.fkprocessors +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.ComputedSkeleton import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonFkProcessor -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.eulerHeading import io.github.axisangles.ktmath.Quaternion import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/ik.kt b/server/core/src/main/java/dev/slimevr/skeleton/ik.kt index 9ec9c018f..57d47a460 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/ik.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/ik.kt @@ -1,6 +1,8 @@ package dev.slimevr.skeleton import com.jme3.math.FastMath +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.BoneSet import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/bone-direct-link.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/bone-direct-link.kt index c0b66975f..9709c5372 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/bone-direct-link.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/bone-direct-link.kt @@ -1,9 +1,9 @@ package dev.slimevr.skeleton.inputprocessors -import dev.slimevr.skeleton.BoneId +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonInputProcessor -import dev.slimevr.skeleton.boneId import solarxr_protocol.datatypes.BodyPart /** diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/constraint.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/constraint.kt index ab7f933e9..506d5cb08 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/constraint.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/constraint.kt @@ -1,13 +1,13 @@ package dev.slimevr.skeleton.inputprocessors +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.resolveToBoneIds import dev.slimevr.config.Settings import dev.slimevr.skeleton.BODY_PART_CONSTRAINT_MAP -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.Constraint import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonInputProcessor import dev.slimevr.skeleton.constrainSkeleton -import dev.slimevr.skeleton.resolveToBoneIds class ConstraintInputProcessor( val settings: Settings, diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/finger-impute.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/finger-impute.kt index 3571d2cc9..69cce1090 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/finger-impute.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/finger-impute.kt @@ -1,9 +1,9 @@ package dev.slimevr.skeleton.inputprocessors -import dev.slimevr.skeleton.BoneId +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonInputProcessor -import dev.slimevr.skeleton.boneId import solarxr_protocol.datatypes.BodyPart private const val INTERMEDIATE_FROM_PROXIMAL = 2.12f diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/head-position-fallback.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/head-position-fallback.kt index c05c9cba1..3d9d6d4e1 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/head-position-fallback.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/head-position-fallback.kt @@ -1,9 +1,9 @@ package dev.slimevr.skeleton.inputprocessors +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonInputProcessor -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.Vector3 import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/hip-yaw-roll-align.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/hip-yaw-roll-align.kt index c47e73708..fb65e2a34 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/hip-yaw-roll-align.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/hip-yaw-roll-align.kt @@ -1,9 +1,9 @@ package dev.slimevr.skeleton.inputprocessors +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonInputProcessor -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.Quaternion import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/prediction.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/prediction.kt index bce0aec34..2707e4991 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/prediction.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/prediction.kt @@ -1,11 +1,11 @@ package dev.slimevr.skeleton.inputprocessors +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.ResettableSkeletonProcessor import dev.slimevr.skeleton.SkeletonInputProcessor -import dev.slimevr.skeleton.boneId import dev.slimevr.util.MonotonicValueTimeMark import dev.slimevr.util.timeSource import io.github.axisangles.ktmath.Quaternion @@ -39,7 +39,7 @@ class PredictionInputProcessor(val settings: Settings) : BodyPart.RIGHT_UPPER_ARM.boneId, BodyPart.LEFT_LOWER_ARM.boneId, BodyPart.RIGHT_LOWER_ARM.boneId, - -> 1.4f + -> 1.4f else -> 1f } diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/relaxed-spine.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/relaxed-spine.kt index a1d5ce116..0366be5ab 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/relaxed-spine.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/relaxed-spine.kt @@ -1,11 +1,11 @@ package dev.slimevr.skeleton.inputprocessors import com.jme3.math.FastMath +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonInputProcessor -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.Quaternion import solarxr_protocol.datatypes.BodyPart import kotlin.enums.enumEntries diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/smoothing.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/smoothing.kt index f4e57a88e..bf3d25d98 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/smoothing.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/smoothing.kt @@ -1,7 +1,7 @@ package dev.slimevr.skeleton.inputprocessors +import dev.slimevr.bones.BoneId import dev.slimevr.config.Settings -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.ResettableSkeletonProcessor import dev.slimevr.skeleton.SkeletonInputProcessor diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/toe-active-link.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/toe-active-link.kt index 898f36c15..ca1d0901e 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/toe-active-link.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/toe-active-link.kt @@ -1,9 +1,9 @@ package dev.slimevr.skeleton.inputprocessors -import dev.slimevr.skeleton.BoneId +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonInputProcessor -import dev.slimevr.skeleton.boneId import solarxr_protocol.datatypes.BodyPart /** diff --git a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/upper-legs-roll-align.kt b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/upper-legs-roll-align.kt index 9e8beb9a2..8a5c0602a 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/upper-legs-roll-align.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/inputprocessors/upper-legs-roll-align.kt @@ -1,10 +1,10 @@ package dev.slimevr.skeleton.inputprocessors +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.SkeletonInputProcessor -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.Quaternion import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/module.kt b/server/core/src/main/java/dev/slimevr/skeleton/module.kt index 9dd89306d..2da7b4602 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/module.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/module.kt @@ -1,6 +1,12 @@ package dev.slimevr.skeleton import dev.slimevr.Phase1ContextProvider +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.BoneMap +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.BoneSet +import dev.slimevr.bones.mapValues +import dev.slimevr.bones.mutateCopy import dev.slimevr.context.Behaviour import dev.slimevr.context.Context import dev.slimevr.skeleton.computedprocessors.VelocityComputedProcessor @@ -215,7 +221,7 @@ class Skeleton( fun create(scope: CoroutineScope, ctx: Phase1ContextProvider, waiter: PreciseWaiter, hz: Int = DEFAULT_HZ): Skeleton { val settings = ctx.config.settings - val registry = BoneRegistry.standard() + val registry = ctx.bones.current val resettableSkeletonProcessors = mutableSetOf() val behaviours = listOf( diff --git a/server/core/src/main/java/dev/slimevr/skeleton/proportions.kt b/server/core/src/main/java/dev/slimevr/skeleton/proportions.kt index 527abecfa..bc1171924 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/proportions.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/proportions.kt @@ -1,5 +1,9 @@ package dev.slimevr.skeleton +import dev.slimevr.bones.BodyPartMap +import dev.slimevr.bones.BoneMap +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.boneId import io.github.axisangles.ktmath.Vector3 import io.github.axisangles.ktmath.times import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/reducer.kt b/server/core/src/main/java/dev/slimevr/skeleton/reducer.kt index 0ab88b20a..7c6960182 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/reducer.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/reducer.kt @@ -1,5 +1,8 @@ package dev.slimevr.skeleton +import dev.slimevr.bones.boneId +import dev.slimevr.bones.mapValues +import dev.slimevr.bones.mutateCopy import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/targetprocessors/floor-clip.kt b/server/core/src/main/java/dev/slimevr/skeleton/targetprocessors/floor-clip.kt index 080405d14..43eb32d92 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/targetprocessors/floor-clip.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/targetprocessors/floor-clip.kt @@ -1,11 +1,11 @@ package dev.slimevr.skeleton.targetprocessors +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.ComputedSkeleton import dev.slimevr.skeleton.IKTargets import dev.slimevr.skeleton.SkeletonTargetProcessor -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.Vector3 import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/skeleton/targetprocessors/skating-correction.kt b/server/core/src/main/java/dev/slimevr/skeleton/targetprocessors/skating-correction.kt index 7c3d82516..6c06e4ecf 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/targetprocessors/skating-correction.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/targetprocessors/skating-correction.kt @@ -1,14 +1,14 @@ package dev.slimevr.skeleton.targetprocessors +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.COMState import dev.slimevr.skeleton.ComputedSkeleton import dev.slimevr.skeleton.IKTargets import dev.slimevr.skeleton.ResettableSkeletonProcessor import dev.slimevr.skeleton.SkeletonTargetProcessor import dev.slimevr.skeleton.Velocity -import dev.slimevr.skeleton.boneId import dev.slimevr.skeleton.centreOfMass import dev.slimevr.skeleton.computeComState import dev.slimevr.skeleton.resolveMasses diff --git a/server/core/src/main/java/dev/slimevr/solarxr/common.kt b/server/core/src/main/java/dev/slimevr/solarxr/common.kt index c03ee8f8b..42d892b68 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/common.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/common.kt @@ -1,6 +1,6 @@ package dev.slimevr.solarxr -import dev.slimevr.skeleton.BoneId +import dev.slimevr.bones.BoneId import dev.slimevr.skeleton.BoneState import solarxr_protocol.datatypes.BoneMask import solarxr_protocol.datatypes.math.Quat diff --git a/server/core/src/main/java/dev/slimevr/solarxr/driver/incoming.kt b/server/core/src/main/java/dev/slimevr/solarxr/driver/incoming.kt index 23cbef162..2c81a9862 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/driver/incoming.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/driver/incoming.kt @@ -2,9 +2,9 @@ package dev.slimevr.solarxr.driver import dev.slimevr.AppContextProvider import dev.slimevr.VRServerActions +import dev.slimevr.bones.BoneId import dev.slimevr.device.Device import dev.slimevr.device.DeviceActions -import dev.slimevr.skeleton.BoneId import dev.slimevr.solarxr.SolarXRBridge import dev.slimevr.solarxr.SolarXRBridgeBehaviour import dev.slimevr.tracker.Tracker 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 09138c158..3810c8ce7 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 @@ -1,11 +1,11 @@ package dev.slimevr.solarxr.driver import dev.slimevr.AppContextProvider +import dev.slimevr.bones.BodyPartMap +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId +import dev.slimevr.bones.forEachBone import dev.slimevr.logging.AppLogger -import dev.slimevr.skeleton.BodyPartMap -import dev.slimevr.skeleton.BoneId -import dev.slimevr.skeleton.boneId -import dev.slimevr.skeleton.forEachBone import dev.slimevr.solarxr.SolarXRBridge import dev.slimevr.solarxr.SolarXRBridgeBehaviour import dev.slimevr.solarxr.createBone diff --git a/server/core/src/main/java/dev/slimevr/solarxr/module.kt b/server/core/src/main/java/dev/slimevr/solarxr/module.kt index 58d0a3352..83a88e179 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/module.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/module.kt @@ -4,6 +4,7 @@ import dev.slimevr.AppContextProvider import dev.slimevr.EventDispatcher import dev.slimevr.Subscription import dev.slimevr.VRServerActions +import dev.slimevr.bones.BoneRegistry import dev.slimevr.context.Behaviour import dev.slimevr.context.Context import dev.slimevr.context.ManagedContext @@ -61,7 +62,6 @@ import solarxr_protocol.rpc.RpcMessage import solarxr_protocol.rpc.RpcMessageHeader import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds -import dev.slimevr.skeleton.BoneRegistry as SkeletonBoneRegistry data class SolarXRBridgeState( val dataFeedConfigs: List = emptyList(), @@ -136,7 +136,7 @@ class SolarXRBridge( private val managedContext: ManagedContext? = null, ) { val isReady: Boolean get() = context.state.value.isReady - val registry: SkeletonBoneRegistry get() = appContext.skeleton.registry + val registry: BoneRegistry get() = appContext.bones.current // Jobs are mutable handles with no meaningful equality; storing them in state // would break distinctUntilChanged and data class copy semantics. diff --git a/server/core/src/main/java/dev/slimevr/solarxr/rpc/bone-routing.kt b/server/core/src/main/java/dev/slimevr/solarxr/rpc/bone-routing.kt index 29241bac8..34703b7ce 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/rpc/bone-routing.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/rpc/bone-routing.kt @@ -1,6 +1,8 @@ package dev.slimevr.solarxr.rpc import dev.slimevr.AppContextProvider +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.BoneRegistry import dev.slimevr.config.SettingsActions import dev.slimevr.routing.OutputStates import dev.slimevr.routing.Routes @@ -11,8 +13,6 @@ import dev.slimevr.routing.intendedRoutesFlow import dev.slimevr.routing.outputStatesFlow import dev.slimevr.routing.overridableBones import dev.slimevr.routing.requiredBones -import dev.slimevr.skeleton.BoneId -import dev.slimevr.skeleton.BoneRegistry import dev.slimevr.solarxr.SolarXRBridge import dev.slimevr.solarxr.SolarXRBridgeBehaviour import kotlinx.coroutines.flow.combine @@ -62,7 +62,7 @@ class BoneRoutingBehaviour( private val settings = appContext.config.settings override fun observe(receiver: SolarXRBridge) { - val registry = appContext.skeleton.registry + val registry = appContext.bones.current val responses = combine( settings.context.state.map { it.data.boneRoutingConfig.automatic }.distinctUntilChanged(), intendedRoutesFlow(appContext), diff --git a/server/core/src/main/java/dev/slimevr/solarxr/rpc/session-calibration.kt b/server/core/src/main/java/dev/slimevr/solarxr/rpc/session-calibration.kt index 6e4d845e7..3af6eb9a7 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/rpc/session-calibration.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/rpc/session-calibration.kt @@ -1,7 +1,7 @@ package dev.slimevr.solarxr.rpc +import dev.slimevr.bones.BoneId import dev.slimevr.resets.ResetsManager -import dev.slimevr.skeleton.BoneId import dev.slimevr.solarxr.SolarXRBridge import dev.slimevr.solarxr.SolarXRBridgeBehaviour import solarxr_protocol.rpc.ClearMountingResetRequest diff --git a/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-proportions.kt b/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-proportions.kt index bd4053387..0231ad3f9 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-proportions.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-proportions.kt @@ -1,12 +1,12 @@ package dev.slimevr.solarxr.rpc +import dev.slimevr.bones.ALL_BODY_PARTS +import dev.slimevr.bones.bodyPartMap +import dev.slimevr.bones.boneId import dev.slimevr.config.UserConfig import dev.slimevr.config.UserConfigActions -import dev.slimevr.skeleton.ALL_BODY_PARTS import dev.slimevr.skeleton.InputSkeleton import dev.slimevr.skeleton.Skeleton -import dev.slimevr.skeleton.bodyPartMap -import dev.slimevr.skeleton.boneId import dev.slimevr.skeleton.computeAllDefaultProportionsByBone import dev.slimevr.skeleton.computeDefaultProportionsByBone import dev.slimevr.skeleton.height diff --git a/server/core/src/main/java/dev/slimevr/solarxr/rpc/tap-detection.kt b/server/core/src/main/java/dev/slimevr/solarxr/rpc/tap-detection.kt index 58f4c0835..1bf88076b 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/rpc/tap-detection.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/rpc/tap-detection.kt @@ -1,9 +1,9 @@ package dev.slimevr.solarxr.rpc +import dev.slimevr.bones.BoneId import dev.slimevr.config.Settings import dev.slimevr.config.SettingsActions import dev.slimevr.config.TapDetectionConfig -import dev.slimevr.skeleton.BoneId import dev.slimevr.solarxr.SolarXRBridge import dev.slimevr.solarxr.SolarXRBridgeBehaviour import dev.slimevr.tapdetection.TapDetectionActions diff --git a/server/core/src/main/java/dev/slimevr/solarxr/rpc/tracker-assignment.kt b/server/core/src/main/java/dev/slimevr/solarxr/rpc/tracker-assignment.kt index 25e539758..4a369a25e 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/rpc/tracker-assignment.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/rpc/tracker-assignment.kt @@ -1,7 +1,7 @@ package dev.slimevr.solarxr.rpc import dev.slimevr.VRServer -import dev.slimevr.skeleton.BoneId +import dev.slimevr.bones.BoneId import dev.slimevr.solarxr.SolarXRBridge import dev.slimevr.solarxr.SolarXRBridgeBehaviour import dev.slimevr.tracker.Tracker diff --git a/server/core/src/main/java/dev/slimevr/tapdetection/behaviours.kt b/server/core/src/main/java/dev/slimevr/tapdetection/behaviours.kt index 113306237..6a7a40dc8 100644 --- a/server/core/src/main/java/dev/slimevr/tapdetection/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/tapdetection/behaviours.kt @@ -1,8 +1,8 @@ package dev.slimevr.tapdetection +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.TapDetectionConfig -import dev.slimevr.skeleton.BoneId -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.Motion import dev.slimevr.tracker.TrackerState import dev.slimevr.util.timeSource @@ -82,7 +82,7 @@ class TapDetectionBasicBehaviour : TapDetectionBehaviour { ) .flatMapLatest { (tapDetectionConfig, setupMode, trackers) -> // Computed once per outer-flow refresh for all trackers - val registry = receiver.skeleton.registry + val registry = receiver.registry val trackersBoneIds = trackers.map { it.context.state.value.boneId }.toSet() val yawResetBoneId = arrayOf(tapDetectionConfig.yawResetBone?.let { registry.byKey(it) }?.let { BoneId(it.id) }, BodyPart.UPPER_CHEST.boneId, BodyPart.LOWER_CHEST.boneId, BodyPart.HIP.boneId, BodyPart.LOWER_WAIST.boneId, BodyPart.UPPER_WAIST.boneId) .firstOrNull { it in trackersBoneIds } ?: BodyPart.UPPER_CHEST.boneId diff --git a/server/core/src/main/java/dev/slimevr/tapdetection/module.kt b/server/core/src/main/java/dev/slimevr/tapdetection/module.kt index 122ab30e8..bdd1055c9 100644 --- a/server/core/src/main/java/dev/slimevr/tapdetection/module.kt +++ b/server/core/src/main/java/dev/slimevr/tapdetection/module.kt @@ -2,6 +2,7 @@ package dev.slimevr.tapdetection import dev.slimevr.Phase1ContextProvider import dev.slimevr.VRServer +import dev.slimevr.bones.BoneRegistry import dev.slimevr.config.Settings import dev.slimevr.context.Behaviour import dev.slimevr.context.Context @@ -21,7 +22,7 @@ sealed interface TapDetectionActions { typealias TapDetectionContext = Context typealias TapDetectionBehaviour = Behaviour -class TapDetectionManager(val context: TapDetectionContext, val server: VRServer, val resetsManager: ResetsManager, val settings: Settings) { +class TapDetectionManager(val context: TapDetectionContext, val server: VRServer, val resetsManager: ResetsManager, val settings: Settings, val registry: BoneRegistry) { val skeleton: Skeleton get() = resetsManager.skeleton fun startObserving() = context.observeAll(this) @@ -37,7 +38,7 @@ class TapDetectionManager(val context: TapDetectionContext, val server: VRServer behaviours = listOf(TapDetectionBasicBehaviour()), name = "TapDetectionManager", ) - return TapDetectionManager(context, ctx.server, resetsManager, ctx.config.settings) + return TapDetectionManager(context, ctx.server, resetsManager, ctx.config.settings, ctx.bones.current) } } } diff --git a/server/core/src/main/java/dev/slimevr/tracker/behaviours/config.kt b/server/core/src/main/java/dev/slimevr/tracker/behaviours/config.kt index a28ec6253..3aa41edbc 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/behaviours/config.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/behaviours/config.kt @@ -1,10 +1,10 @@ package dev.slimevr.tracker.behaviours +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.BoneRegistry import dev.slimevr.config.Settings import dev.slimevr.config.SettingsActions import dev.slimevr.config.TrackerConfig -import dev.slimevr.skeleton.BoneId -import dev.slimevr.skeleton.BoneRegistry import dev.slimevr.tracker.Tracker import dev.slimevr.tracker.TrackerBehaviour import dev.slimevr.tracker.TrackerState diff --git a/server/core/src/main/java/dev/slimevr/tracker/behaviours/default-mounting-orientation.kt b/server/core/src/main/java/dev/slimevr/tracker/behaviours/default-mounting-orientation.kt index 8119c5457..06303b700 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/behaviours/default-mounting-orientation.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/behaviours/default-mounting-orientation.kt @@ -1,6 +1,6 @@ package dev.slimevr.tracker.behaviours -import dev.slimevr.skeleton.BoneRegistry +import dev.slimevr.bones.BoneRegistry import dev.slimevr.tracker.Tracker import dev.slimevr.tracker.TrackerActions import dev.slimevr.tracker.TrackerBehaviour diff --git a/server/core/src/main/java/dev/slimevr/tracker/behaviours/rest-orientation.kt b/server/core/src/main/java/dev/slimevr/tracker/behaviours/rest-orientation.kt index 4a3eb8d8a..1a0bc5722 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/behaviours/rest-orientation.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/behaviours/rest-orientation.kt @@ -1,9 +1,9 @@ package dev.slimevr.tracker.behaviours import com.jme3.math.FastMath +import dev.slimevr.bones.BoneRegistry import dev.slimevr.config.Settings import dev.slimevr.resets.ResetBodyParts -import dev.slimevr.skeleton.BoneRegistry import dev.slimevr.tracker.Tracker import dev.slimevr.tracker.TrackerActions import dev.slimevr.tracker.TrackerBehaviour diff --git a/server/core/src/main/java/dev/slimevr/tracker/behaviours/stay-aligned.kt b/server/core/src/main/java/dev/slimevr/tracker/behaviours/stay-aligned.kt index 38e8e66a0..a5738f1ae 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/behaviours/stay-aligned.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/behaviours/stay-aligned.kt @@ -1,8 +1,8 @@ package dev.slimevr.tracker.behaviours +import dev.slimevr.bones.BoneRegistry import dev.slimevr.config.Settings import dev.slimevr.math.angle.Angle -import dev.slimevr.skeleton.BoneRegistry import dev.slimevr.tracker.Tracker import dev.slimevr.tracker.TrackerActions import dev.slimevr.tracker.TrackerBehaviour diff --git a/server/core/src/main/java/dev/slimevr/tracker/behaviours/to-skeleton.kt b/server/core/src/main/java/dev/slimevr/tracker/behaviours/to-skeleton.kt index cc6d9d279..ed10fa48f 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/behaviours/to-skeleton.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/behaviours/to-skeleton.kt @@ -1,6 +1,6 @@ package dev.slimevr.tracker.behaviours -import dev.slimevr.skeleton.BoneId +import dev.slimevr.bones.BoneId import dev.slimevr.skeleton.SkeletonActions import dev.slimevr.tracker.Tracker import dev.slimevr.tracker.TrackerBehaviour 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 35d72df6c..5541587a2 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/module.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/module.kt @@ -1,13 +1,13 @@ package dev.slimevr.tracker import dev.slimevr.AppContextProvider +import dev.slimevr.bones.BoneId import dev.slimevr.config.Settings import dev.slimevr.context.Behaviour import dev.slimevr.context.Context import dev.slimevr.context.debug.DiffStyle import dev.slimevr.context.debug.LoggingMiddleware import dev.slimevr.math.angle.Angle -import dev.slimevr.skeleton.BoneId import dev.slimevr.tracker.behaviours.TrackerAssignmentConflictBehaviour import dev.slimevr.tracker.behaviours.TrackerCalibrationRefreshBehaviour import dev.slimevr.tracker.behaviours.TrackerConfigBehaviour @@ -133,7 +133,7 @@ class Tracker( appContext: AppContextProvider, ): Tracker { val settings = appContext.config.settings - val registry = appContext.skeleton.registry + val registry = appContext.bones.current val trackerConfigs = settings.context.state.value.data.trackers val savedConfig = trackerConfigs[hardwareId] val baseState = DEFAULT_STATE.copy( diff --git a/server/core/src/main/java/dev/slimevr/tracker/reducer.kt b/server/core/src/main/java/dev/slimevr/tracker/reducer.kt index 7134bac04..ce34cf0eb 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/reducer.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/reducer.kt @@ -1,6 +1,6 @@ package dev.slimevr.tracker -import dev.slimevr.skeleton.boneId +import dev.slimevr.bones.boneId import io.github.axisangles.ktmath.Quaternion import solarxr_protocol.datatypes.BodyPart import solarxr_protocol.datatypes.MountingMethod diff --git a/server/core/src/main/java/dev/slimevr/tracker/stayaligned/poses/player-pose.kt b/server/core/src/main/java/dev/slimevr/tracker/stayaligned/poses/player-pose.kt index 31a0f3719..1f720b70f 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/stayaligned/poses/player-pose.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/stayaligned/poses/player-pose.kt @@ -1,7 +1,7 @@ package dev.slimevr.tracker.stayaligned.poses -import dev.slimevr.skeleton.BoneRegistry -import dev.slimevr.skeleton.boneId +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.boneId import dev.slimevr.tracker.TrackerState import dev.slimevr.tracker.getAllActiveFor import dev.slimevr.tracker.getFirstActiveFor diff --git a/server/core/src/main/java/dev/slimevr/tracker/stayaligned/poses/relaxed-pose.kt b/server/core/src/main/java/dev/slimevr/tracker/stayaligned/poses/relaxed-pose.kt index 7ee4c4d40..5944c21bc 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/stayaligned/poses/relaxed-pose.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/stayaligned/poses/relaxed-pose.kt @@ -1,8 +1,8 @@ package dev.slimevr.tracker.stayaligned.poses +import dev.slimevr.bones.boneId import dev.slimevr.config.StayAlignedConfig import dev.slimevr.math.angle.Angle -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.TrackerState import dev.slimevr.tracker.getFirstActiveFor import dev.slimevr.tracker.stayaligned.StayAlignedBodyParts diff --git a/server/core/src/main/java/dev/slimevr/tracker/stayaligned/tracker-yaw-correction.kt b/server/core/src/main/java/dev/slimevr/tracker/stayaligned/tracker-yaw-correction.kt index 19ecd13f8..60789bb2e 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/stayaligned/tracker-yaw-correction.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/stayaligned/tracker-yaw-correction.kt @@ -1,10 +1,10 @@ package dev.slimevr.tracker.stayaligned +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.boneId import dev.slimevr.config.StayAlignedConfig import dev.slimevr.math.angle.Angle import dev.slimevr.math.angle.AngleErrors -import dev.slimevr.skeleton.BoneRegistry -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.Motion import dev.slimevr.tracker.TrackerState import dev.slimevr.tracker.applyCalibration diff --git a/server/core/src/main/java/dev/slimevr/tracker/stayaligned/yaw-utils.kt b/server/core/src/main/java/dev/slimevr/tracker/stayaligned/yaw-utils.kt index 94565f7be..27c4e26ad 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/stayaligned/yaw-utils.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/stayaligned/yaw-utils.kt @@ -1,8 +1,8 @@ package dev.slimevr.tracker.stayaligned +import dev.slimevr.bones.boneId import dev.slimevr.math.angle.Angle import dev.slimevr.math.angle.AngleAverage -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.TrackerState import dev.slimevr.tracker.getAllActiveFor import dev.slimevr.tracker.getFirstActiveFor diff --git a/server/core/src/main/java/dev/slimevr/trackingchecklist/behaviours.kt b/server/core/src/main/java/dev/slimevr/trackingchecklist/behaviours.kt index ec5e5c71e..48ba82326 100644 --- a/server/core/src/main/java/dev/slimevr/trackingchecklist/behaviours.kt +++ b/server/core/src/main/java/dev/slimevr/trackingchecklist/behaviours.kt @@ -4,15 +4,15 @@ package dev.slimevr.trackingchecklist import dev.slimevr.VRServer import dev.slimevr.VRServerState +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings import dev.slimevr.networkprofile.NetworkProfileManager import dev.slimevr.resets.ResetBodyParts import dev.slimevr.resets.ResetsManager import dev.slimevr.routing.BoneRoutingManager import dev.slimevr.routing.Routes -import dev.slimevr.skeleton.BoneId import dev.slimevr.skeleton.Skeleton -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.TrackerState import dev.slimevr.vrchat.VRCConfigManager import dev.slimevr.vrchat.VRCConfigState diff --git a/server/core/src/main/java/dev/slimevr/vmc/input-decoder.kt b/server/core/src/main/java/dev/slimevr/vmc/input-decoder.kt index 71172a776..c7c03044e 100644 --- a/server/core/src/main/java/dev/slimevr/vmc/input-decoder.kt +++ b/server/core/src/main/java/dev/slimevr/vmc/input-decoder.kt @@ -1,9 +1,9 @@ package dev.slimevr.vmc +import dev.slimevr.bones.BodyPartMap +import dev.slimevr.bones.bodyPartMap import dev.slimevr.osc.OscArg import dev.slimevr.osc.OscMessage -import dev.slimevr.skeleton.BodyPartMap -import dev.slimevr.skeleton.bodyPartMap import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 diff --git a/server/core/src/main/java/dev/slimevr/vmc/input.kt b/server/core/src/main/java/dev/slimevr/vmc/input.kt index f11a8cab2..9bee6259d 100644 --- a/server/core/src/main/java/dev/slimevr/vmc/input.kt +++ b/server/core/src/main/java/dev/slimevr/vmc/input.kt @@ -2,6 +2,8 @@ package dev.slimevr.vmc import dev.slimevr.AppContextProvider import dev.slimevr.VRServerActions +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings import dev.slimevr.device.Device import dev.slimevr.device.DeviceActions @@ -9,8 +11,6 @@ import dev.slimevr.logging.AppLogger import dev.slimevr.osc.OscBundle import dev.slimevr.osc.OscReceiver import dev.slimevr.osc.forEachOscMessage -import dev.slimevr.skeleton.BoneId -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.Tracker import dev.slimevr.tracker.TrackerActions import dev.slimevr.util.formatExceptionMessage diff --git a/server/core/src/main/java/dev/slimevr/vmc/mapping.kt b/server/core/src/main/java/dev/slimevr/vmc/mapping.kt index 7ae6040f7..cc0decb68 100644 --- a/server/core/src/main/java/dev/slimevr/vmc/mapping.kt +++ b/server/core/src/main/java/dev/slimevr/vmc/mapping.kt @@ -1,8 +1,8 @@ package dev.slimevr.vmc import com.jme3.math.FastMath +import dev.slimevr.bones.BodyPartMap import dev.slimevr.resets.ResetBodyParts -import dev.slimevr.skeleton.BodyPartMap import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/vmc/module.kt b/server/core/src/main/java/dev/slimevr/vmc/module.kt index 577522d96..018d8a499 100644 --- a/server/core/src/main/java/dev/slimevr/vmc/module.kt +++ b/server/core/src/main/java/dev/slimevr/vmc/module.kt @@ -60,7 +60,7 @@ class VMCManager(val context: VMCContext) { val settings = appContext.config.settings val behaviours = listOf( VMCVrmBehaviour(settings), - VMCOutputBehaviour(appContext.skeleton, settings, appContext.boneRouting), + VMCOutputBehaviour(appContext.skeleton, appContext.bones.current, settings, appContext.boneRouting), VMCInputBehaviour(appContext, settings), ) diff --git a/server/core/src/main/java/dev/slimevr/vmc/output-encoder.kt b/server/core/src/main/java/dev/slimevr/vmc/output-encoder.kt index b4f69d6c5..4c5dd98b2 100644 --- a/server/core/src/main/java/dev/slimevr/vmc/output-encoder.kt +++ b/server/core/src/main/java/dev/slimevr/vmc/output-encoder.kt @@ -1,5 +1,6 @@ package dev.slimevr.vmc +import dev.slimevr.bones.boneId import dev.slimevr.config.VMCConfig import dev.slimevr.osc.OscArg import dev.slimevr.osc.OscBundle @@ -7,7 +8,6 @@ import dev.slimevr.osc.OscContent import dev.slimevr.osc.OscMessage import dev.slimevr.skeleton.BoneState import dev.slimevr.skeleton.ComputedSkeleton -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/main/java/dev/slimevr/vmc/output.kt b/server/core/src/main/java/dev/slimevr/vmc/output.kt index a62b2e31a..6ea132d55 100644 --- a/server/core/src/main/java/dev/slimevr/vmc/output.kt +++ b/server/core/src/main/java/dev/slimevr/vmc/output.kt @@ -1,5 +1,6 @@ package dev.slimevr.vmc +import dev.slimevr.bones.BoneRegistry import dev.slimevr.config.Settings import dev.slimevr.config.VMCConfig import dev.slimevr.logging.AppLogger @@ -27,6 +28,7 @@ private val RECOVERY_CONFIRM_DELAY = 2.seconds class VMCOutputBehaviour( private val skeleton: Skeleton, + private val registry: BoneRegistry, private val settings: Settings, private val boneRouting: BoneRoutingManager, ) : VMCBehaviour { @@ -60,7 +62,7 @@ class VMCOutputBehaviour( val routedBones = boneRouting.context.state .map { state -> state.routes.filterValues { RoutingOutput.VMC in it }.keys } .distinctUntilChanged() - .map { boneIds -> boneIds.mapNotNullTo(mutableSetOf(), skeleton.registry::bodyPartOf) } + .map { boneIds -> boneIds.mapNotNullTo(mutableSetOf(), registry::bodyPartOf) } val config = settings.context.state .map { it.data.vmcConfig } diff --git a/server/core/src/main/java/dev/slimevr/vmc/vrm.kt b/server/core/src/main/java/dev/slimevr/vmc/vrm.kt index e5f9a96a1..60c67bfa2 100644 --- a/server/core/src/main/java/dev/slimevr/vmc/vrm.kt +++ b/server/core/src/main/java/dev/slimevr/vmc/vrm.kt @@ -1,8 +1,8 @@ package dev.slimevr.vmc +import dev.slimevr.bones.BodyPartMap import dev.slimevr.config.Settings import dev.slimevr.logging.AppLogger -import dev.slimevr.skeleton.BodyPartMap import dev.slimevr.util.formatExceptionMessage import io.github.axisangles.ktmath.Vector3 import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/server/core/src/main/java/dev/slimevr/vrchat/module.kt b/server/core/src/main/java/dev/slimevr/vrchat/module.kt index 25dab11e0..3be3076b4 100644 --- a/server/core/src/main/java/dev/slimevr/vrchat/module.kt +++ b/server/core/src/main/java/dev/slimevr/vrchat/module.kt @@ -1,10 +1,10 @@ package dev.slimevr.vrchat import dev.slimevr.VRServer +import dev.slimevr.bones.boneId import dev.slimevr.config.AppConfig import dev.slimevr.context.Behaviour import dev.slimevr.context.Context -import dev.slimevr.skeleton.boneId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch diff --git a/server/core/src/main/java/dev/slimevr/vrcosc/input.kt b/server/core/src/main/java/dev/slimevr/vrcosc/input.kt index e076aa999..2e9d6b329 100644 --- a/server/core/src/main/java/dev/slimevr/vrcosc/input.kt +++ b/server/core/src/main/java/dev/slimevr/vrcosc/input.kt @@ -2,6 +2,7 @@ package dev.slimevr.vrcosc import dev.slimevr.AppContextProvider import dev.slimevr.VRServerActions +import dev.slimevr.bones.boneId import dev.slimevr.config.Settings import dev.slimevr.device.Device import dev.slimevr.device.DeviceActions @@ -9,7 +10,6 @@ import dev.slimevr.logging.AppLogger import dev.slimevr.osc.OscMessage import dev.slimevr.osc.OscReceiver import dev.slimevr.osc.forEachOscMessage -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.Tracker import dev.slimevr.tracker.TrackerActions import dev.slimevr.util.formatExceptionMessage diff --git a/server/core/src/main/java/dev/slimevr/vrcosc/module.kt b/server/core/src/main/java/dev/slimevr/vrcosc/module.kt index 29b4b336d..779d04e55 100644 --- a/server/core/src/main/java/dev/slimevr/vrcosc/module.kt +++ b/server/core/src/main/java/dev/slimevr/vrcosc/module.kt @@ -103,7 +103,7 @@ class VRCOSCManager( fun startObserving(appContext: AppContextProvider) { val settings = appContext.config.settings val behaviours = listOf( - VRCOSCOutputBehaviour(appContext.skeleton, settings, appContext.boneRouting), + VRCOSCOutputBehaviour(appContext.skeleton, appContext.bones.current, settings, appContext.boneRouting), VRCOSCInputBehaviour(appContext, settings), VRCOSCOscQueryBehaviour( settings, diff --git a/server/core/src/main/java/dev/slimevr/vrcosc/output-encoder.kt b/server/core/src/main/java/dev/slimevr/vrcosc/output-encoder.kt index fd455fe16..5e27c2b79 100644 --- a/server/core/src/main/java/dev/slimevr/vrcosc/output-encoder.kt +++ b/server/core/src/main/java/dev/slimevr/vrcosc/output-encoder.kt @@ -1,11 +1,11 @@ package dev.slimevr.vrcosc +import dev.slimevr.bones.boneId import dev.slimevr.osc.OscArg import dev.slimevr.osc.OscBundle import dev.slimevr.osc.OscContent import dev.slimevr.osc.OscMessage import dev.slimevr.skeleton.ComputedSkeleton -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.EulerOrder import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 diff --git a/server/core/src/main/java/dev/slimevr/vrcosc/output.kt b/server/core/src/main/java/dev/slimevr/vrcosc/output.kt index ac2e5146b..8121183b4 100644 --- a/server/core/src/main/java/dev/slimevr/vrcosc/output.kt +++ b/server/core/src/main/java/dev/slimevr/vrcosc/output.kt @@ -1,5 +1,6 @@ package dev.slimevr.vrcosc +import dev.slimevr.bones.BoneRegistry import dev.slimevr.config.Settings import dev.slimevr.config.VRCOSCConfig import dev.slimevr.logging.AppLogger @@ -33,6 +34,7 @@ private val RECOVERY_CONFIRM_DELAY = 2.seconds class VRCOSCOutputBehaviour( private val skeleton: Skeleton, + private val registry: BoneRegistry, private val settings: Settings, private val boneRouting: BoneRoutingManager, ) : VRCOSCBehaviour { @@ -70,7 +72,7 @@ class VRCOSCOutputBehaviour( val routedBones = boneRouting.context.state .map { state -> state.routes.filterValues { RoutingOutput.VRC_OSC in it }.keys } .distinctUntilChanged() - .map { boneIds -> boneIds.mapNotNullTo(mutableSetOf(), skeleton.registry::bodyPartOf) } + .map { boneIds -> boneIds.mapNotNullTo(mutableSetOf(), registry::bodyPartOf) } combine(skeleton.computed, routedBones, ::Pair) .onEach { (computedSkeleton, bones) -> sendFrame(receiver, runtime, computedSkeleton, bones) } diff --git a/server/core/src/main/java/dev/slimevr/vrcosc/toe-plugin-output-encoder.kt b/server/core/src/main/java/dev/slimevr/vrcosc/toe-plugin-output-encoder.kt index 8c8e7fa3e..3a4d3a1ab 100644 --- a/server/core/src/main/java/dev/slimevr/vrcosc/toe-plugin-output-encoder.kt +++ b/server/core/src/main/java/dev/slimevr/vrcosc/toe-plugin-output-encoder.kt @@ -1,11 +1,11 @@ package dev.slimevr.vrcosc +import dev.slimevr.bones.boneId import dev.slimevr.osc.OscArg import dev.slimevr.osc.OscContent import dev.slimevr.osc.OscMessage import dev.slimevr.skeleton.BoneState import dev.slimevr.skeleton.ComputedSkeleton -import dev.slimevr.skeleton.boneId import dev.slimevr.util.Side import dev.slimevr.util.opposite import io.github.axisangles.ktmath.EulerOrder diff --git a/server/core/src/test/java/dev/slimevr/TestServer.kt b/server/core/src/test/java/dev/slimevr/TestServer.kt index 878cb6a1b..b587d5a7d 100644 --- a/server/core/src/test/java/dev/slimevr/TestServer.kt +++ b/server/core/src/test/java/dev/slimevr/TestServer.kt @@ -1,5 +1,9 @@ package dev.slimevr +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.BoneMap +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.BoneRegistryManager import dev.slimevr.bvh.BVHManager import dev.slimevr.config.AppConfig import dev.slimevr.config.ConfigStorage @@ -27,9 +31,6 @@ import dev.slimevr.routing.BoneRoutingManager import dev.slimevr.serial.FlashingHandler import dev.slimevr.serial.SerialPortHandle import dev.slimevr.serial.SerialServer -import dev.slimevr.skeleton.BoneId -import dev.slimevr.skeleton.BoneMap -import dev.slimevr.skeleton.BoneRegistry import dev.slimevr.skeleton.BoneState import dev.slimevr.skeleton.ComputedSkeleton import dev.slimevr.skeleton.ProportionsBehaviour @@ -140,7 +141,8 @@ fun buildTestResetsManager(server: VRServer, settings: Settings, scope: Coroutin behaviours = listOf(ResetsMountingTimeoutBehaviour()), name = "TestResetsManager", ) - val resetsManager = ResetsManager(context, server, settings, buildTestSkeleton(scope)) + val skeleton = buildTestSkeleton(scope) + val resetsManager = ResetsManager(context, server, settings, skeleton, skeleton.registry) resetsManager.startObserving() return resetsManager } @@ -271,6 +273,7 @@ abstract class TestAppContext : AppContextProvider { override val featureFlags: FeatureFlags = FeatureFlags() override val keybindManager: KeybindManager get() = error("not used in test") override val skeleton: Skeleton get() = error("not used in test") + override val bones: BoneRegistryManager get() = error("not used in test") override val config: AppConfig get() = error("not used in test") override val serialServer: SerialServer get() = error("not used in test") override val serverInfos: ServerInfos get() = error("not used in test") diff --git a/server/core/src/test/java/dev/slimevr/bones/BoneRegistryManagerTest.kt b/server/core/src/test/java/dev/slimevr/bones/BoneRegistryManagerTest.kt new file mode 100644 index 000000000..769d416be --- /dev/null +++ b/server/core/src/test/java/dev/slimevr/bones/BoneRegistryManagerTest.kt @@ -0,0 +1,59 @@ +package dev.slimevr.bones + +import kotlinx.coroutines.test.runTest +import solarxr_protocol.connection.BoneDefinition +import solarxr_protocol.datatypes.BodyPart +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertFailsWith +import kotlin.test.assertNull + +class BoneRegistryManagerTest { + @Test + fun `RegisterBones before freeze appends above every existing ID`() = runTest { + val manager = BoneRegistryManager.create(backgroundScope) + val maxIdBefore = manager.current.maxId + + manager.register(listOf(BoneDefinition(id = 0u, key = "test:extension", parent = manager.current.root.value))) + + val registry = manager.current + assertEquals(maxIdBefore + 1, registry.maxId) + val extensionId = requireNotNull(registry["test:extension"]) + assertEquals(maxIdBefore + 1, extensionId.value.toInt()) + } + + @Test + fun `RegisterBones leaves every standard ID untouched`() = runTest { + val manager = BoneRegistryManager.create(backgroundScope) + val before = manager.current + + manager.register(listOf(BoneDefinition(id = 0u, key = "test:extension", parent = before.root.value))) + + val after = manager.current + for (bodyPart in BodyPart.entries) { + if (bodyPart == BodyPart.NONE) continue + assertEquals(before[bodyPart], after[bodyPart], "$bodyPart's ID moved after registering an extension bone") + } + } + + @Test + fun `RegisterBones after Freeze throws`() = runTest { + val manager = BoneRegistryManager.create(backgroundScope) + manager.freeze() + + assertFailsWith { + manager.register(listOf(BoneDefinition(id = 0u, key = "test:extension", parent = manager.current.root.value))) + } + } + + @Test + fun `a registered extension bone resolves by key and by id and has no body part`() = runTest { + val manager = BoneRegistryManager.create(backgroundScope) + manager.register(listOf(BoneDefinition(id = 0u, key = "test:extension", parent = manager.current.root.value))) + + val registry = manager.current + val id = requireNotNull(registry["test:extension"]) + assertEquals("test:extension", registry.keyOf(id)) + assertNull(registry.bodyPartOf(id)) + } +} diff --git a/server/core/src/test/java/dev/slimevr/skeleton/BoneRegistryTest.kt b/server/core/src/test/java/dev/slimevr/bones/BoneRegistryTest.kt similarity index 99% rename from server/core/src/test/java/dev/slimevr/skeleton/BoneRegistryTest.kt rename to server/core/src/test/java/dev/slimevr/bones/BoneRegistryTest.kt index 175f06fa5..312c1d168 100644 --- a/server/core/src/test/java/dev/slimevr/skeleton/BoneRegistryTest.kt +++ b/server/core/src/test/java/dev/slimevr/bones/BoneRegistryTest.kt @@ -1,4 +1,4 @@ -package dev.slimevr.skeleton +package dev.slimevr.bones import solarxr_protocol.connection.BoneDefinition import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/test/java/dev/slimevr/bvh/BvhStreamTest.kt b/server/core/src/test/java/dev/slimevr/bvh/BvhStreamTest.kt index 77e24b9c6..ee26ed36a 100644 --- a/server/core/src/test/java/dev/slimevr/bvh/BvhStreamTest.kt +++ b/server/core/src/test/java/dev/slimevr/bvh/BvhStreamTest.kt @@ -1,11 +1,11 @@ package dev.slimevr.bvh +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.boneId +import dev.slimevr.bones.mutateCopy import dev.slimevr.config.TextFileHandle -import dev.slimevr.skeleton.BoneRegistry -import dev.slimevr.skeleton.boneId import dev.slimevr.skeleton.buildBones import dev.slimevr.skeleton.defaultSkeletonState -import dev.slimevr.skeleton.mutateCopy import io.github.axisangles.ktmath.Vector3 import kotlinx.coroutines.test.runTest import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/test/java/dev/slimevr/routing/AutomaticRoutesTest.kt b/server/core/src/test/java/dev/slimevr/routing/AutomaticRoutesTest.kt index 87384b067..1b61302aa 100644 --- a/server/core/src/test/java/dev/slimevr/routing/AutomaticRoutesTest.kt +++ b/server/core/src/test/java/dev/slimevr/routing/AutomaticRoutesTest.kt @@ -1,6 +1,6 @@ package dev.slimevr.routing -import dev.slimevr.skeleton.BoneRegistry +import dev.slimevr.bones.BoneRegistry import dev.slimevr.solarxr.driver.DRIVER_SUPPORTED_BONES import dev.slimevr.vmc.VMC_SUPPORTED_BONES import dev.slimevr.vrcosc.VRC_OSC_SUPPORTED_BONES diff --git a/server/core/src/test/java/dev/slimevr/routing/ManualRoutesTest.kt b/server/core/src/test/java/dev/slimevr/routing/ManualRoutesTest.kt index 501c65015..14458dd0a 100644 --- a/server/core/src/test/java/dev/slimevr/routing/ManualRoutesTest.kt +++ b/server/core/src/test/java/dev/slimevr/routing/ManualRoutesTest.kt @@ -1,8 +1,8 @@ package dev.slimevr.routing +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.boneId import dev.slimevr.config.BoneRoutingConfig -import dev.slimevr.skeleton.BoneRegistry -import dev.slimevr.skeleton.boneId import solarxr_protocol.datatypes.BodyPart import solarxr_protocol.rpc.RoutingOutput import solarxr_protocol.rpc.RoutingOutputState diff --git a/server/core/src/test/java/dev/slimevr/skeleton/IKTest.kt b/server/core/src/test/java/dev/slimevr/skeleton/IKTest.kt index 6693aeac4..67e39460a 100644 --- a/server/core/src/test/java/dev/slimevr/skeleton/IKTest.kt +++ b/server/core/src/test/java/dev/slimevr/skeleton/IKTest.kt @@ -1,7 +1,10 @@ package dev.slimevr.skeleton +import dev.slimevr.bones.BoneMap +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.boneId +import dev.slimevr.bones.resolveToBoneIds import io.github.axisangles.ktmath.EulerOrder -import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 import solarxr_protocol.datatypes.BodyPart import kotlin.test.Test diff --git a/server/core/src/test/java/dev/slimevr/solarxr/ConnectionInitTest.kt b/server/core/src/test/java/dev/slimevr/solarxr/ConnectionInitTest.kt index a2baf995e..1ea763e1c 100644 --- a/server/core/src/test/java/dev/slimevr/solarxr/ConnectionInitTest.kt +++ b/server/core/src/test/java/dev/slimevr/solarxr/ConnectionInitTest.kt @@ -3,7 +3,7 @@ package dev.slimevr.solarxr import com.google.flatbuffers.FlatBufferBuilder import dev.slimevr.EventDispatcher import dev.slimevr.TestAppContext -import dev.slimevr.buildTestSkeleton +import dev.slimevr.bones.BoneRegistryManager import dev.slimevr.buildTestVrServer import dev.slimevr.context.Context import dev.slimevr.fbscodegen.runtime.JvmFlatBufferWriter @@ -34,7 +34,7 @@ import kotlin.test.assertTrue private fun TestScope.buildTestBridge(sent: MutableList): SolarXRBridge { val appContext = object : TestAppContext() { override val server = buildTestVrServer(backgroundScope) - override val skeleton = buildTestSkeleton(backgroundScope) + override val bones = BoneRegistryManager.create(backgroundScope) } val context = Context.create( initialState = SolarXRBridgeState(), @@ -157,6 +157,6 @@ class ConnectionInitTest { assertTrue(sent.isEmpty()) // The registry stays the server-issued default; the client's attempt never lands. - assertEquals(dev.slimevr.skeleton.BoneRegistry.standard().value, bridge.registry.value) + assertEquals(dev.slimevr.bones.BoneRegistry.standard().value, bridge.registry.value) } } diff --git a/server/core/src/test/java/dev/slimevr/solarxr/DataFeedTest.kt b/server/core/src/test/java/dev/slimevr/solarxr/DataFeedTest.kt index 4390878f1..9cf035df2 100644 --- a/server/core/src/test/java/dev/slimevr/solarxr/DataFeedTest.kt +++ b/server/core/src/test/java/dev/slimevr/solarxr/DataFeedTest.kt @@ -2,6 +2,8 @@ package dev.slimevr.solarxr import dev.slimevr.EventDispatcher import dev.slimevr.TestAppContext +import dev.slimevr.bones.BoneId +import dev.slimevr.bones.BoneRegistryManager import dev.slimevr.buildTestHeightCalibration import dev.slimevr.buildTestResetsManager import dev.slimevr.buildTestSettings @@ -9,7 +11,6 @@ import dev.slimevr.buildTestSkeleton import dev.slimevr.buildTestUserConfig import dev.slimevr.buildTestVrServer import dev.slimevr.context.Context -import dev.slimevr.skeleton.BoneId import dev.slimevr.solarxr.datafeed.DataFeedInitBehaviour import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestScope @@ -38,6 +39,7 @@ private fun TestScope.testConn(onSend: suspend (MessageBundle) -> Unit): SolarXR val appContext = object : TestAppContext() { override val server = server override val skeleton = skeleton + override val bones = BoneRegistryManager.create(backgroundScope, skeleton.registry) override val resetsManager = resetsManager override val heightCalibrationManager = heightCalibrationManager } diff --git a/server/core/src/test/java/dev/slimevr/stayaligned/ComputeYawCorrectionTest.kt b/server/core/src/test/java/dev/slimevr/stayaligned/ComputeYawCorrectionTest.kt index 6615d5908..bad9dcbb8 100644 --- a/server/core/src/test/java/dev/slimevr/stayaligned/ComputeYawCorrectionTest.kt +++ b/server/core/src/test/java/dev/slimevr/stayaligned/ComputeYawCorrectionTest.kt @@ -1,10 +1,10 @@ package dev.slimevr.stayaligned +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.boneId import dev.slimevr.config.StayAlignedConfig import dev.slimevr.config.StayAlignedRelaxedPoseConfig import dev.slimevr.math.angle.Angle -import dev.slimevr.skeleton.BoneRegistry -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.Motion import dev.slimevr.tracker.Tracker import dev.slimevr.tracker.stayaligned.TrackerYawCorrection diff --git a/server/core/src/test/java/dev/slimevr/tracker/YawResetSmoothingTest.kt b/server/core/src/test/java/dev/slimevr/tracker/YawResetSmoothingTest.kt index ca414689e..6b811c74c 100644 --- a/server/core/src/test/java/dev/slimevr/tracker/YawResetSmoothingTest.kt +++ b/server/core/src/test/java/dev/slimevr/tracker/YawResetSmoothingTest.kt @@ -2,13 +2,13 @@ package dev.slimevr.tracker +import dev.slimevr.bones.boneId import dev.slimevr.buildTestAppContext import dev.slimevr.buildTestSettings import dev.slimevr.buildTestTracker import dev.slimevr.buildTestVrServerStub import dev.slimevr.degreeToRadian import dev.slimevr.quaternionAssertEquals -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.behaviours.TrackerYawResetSmoothingBehaviour import io.github.axisangles.ktmath.Quaternion import kotlinx.coroutines.CoroutineScope diff --git a/server/core/src/test/java/dev/slimevr/trackingchecklist/TrackingChecklistTest.kt b/server/core/src/test/java/dev/slimevr/trackingchecklist/TrackingChecklistTest.kt index b290c5196..2af92e25c 100644 --- a/server/core/src/test/java/dev/slimevr/trackingchecklist/TrackingChecklistTest.kt +++ b/server/core/src/test/java/dev/slimevr/trackingchecklist/TrackingChecklistTest.kt @@ -3,6 +3,7 @@ package dev.slimevr.trackingchecklist import dev.slimevr.TestAppContext import dev.slimevr.VRServer import dev.slimevr.VRServerActions +import dev.slimevr.bones.boneId import dev.slimevr.buildTestResetsManager import dev.slimevr.buildTestSettings import dev.slimevr.buildTestTracker @@ -15,7 +16,6 @@ import dev.slimevr.resets.ResetBodyParts import dev.slimevr.resets.ResetsActions import dev.slimevr.resets.ResetsManager import dev.slimevr.routing.BoneRoutingManager -import dev.slimevr.skeleton.boneId import dev.slimevr.tracker.Tracker import dev.slimevr.tracker.TrackerActions import io.github.axisangles.ktmath.Vector3 diff --git a/server/core/src/test/java/dev/slimevr/vmc/InputDecoderTest.kt b/server/core/src/test/java/dev/slimevr/vmc/InputDecoderTest.kt index 2ed5e6700..7b921cba6 100644 --- a/server/core/src/test/java/dev/slimevr/vmc/InputDecoderTest.kt +++ b/server/core/src/test/java/dev/slimevr/vmc/InputDecoderTest.kt @@ -1,5 +1,9 @@ package dev.slimevr.vmc +import dev.slimevr.bones.BodyPartMap +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.bodyPartMap +import dev.slimevr.bones.boneId import dev.slimevr.computedSkeletonOf import dev.slimevr.config.VMCConfig import dev.slimevr.osc.OscArg @@ -8,12 +12,8 @@ import dev.slimevr.osc.OscContent import dev.slimevr.osc.OscMessage import dev.slimevr.osc.forEachOscMessage import dev.slimevr.quaternionApproxEqual -import dev.slimevr.skeleton.BodyPartMap -import dev.slimevr.skeleton.BoneRegistry import dev.slimevr.skeleton.BoneState import dev.slimevr.skeleton.Velocity -import dev.slimevr.skeleton.bodyPartMap -import dev.slimevr.skeleton.boneId import dev.slimevr.vectorAssertEquals import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 diff --git a/server/core/src/test/java/dev/slimevr/vmc/OutputEncoderTest.kt b/server/core/src/test/java/dev/slimevr/vmc/OutputEncoderTest.kt index c648f661d..bb5fa4a7d 100644 --- a/server/core/src/test/java/dev/slimevr/vmc/OutputEncoderTest.kt +++ b/server/core/src/test/java/dev/slimevr/vmc/OutputEncoderTest.kt @@ -1,16 +1,16 @@ package dev.slimevr.vmc +import dev.slimevr.bones.BoneMap +import dev.slimevr.bones.BoneRegistry +import dev.slimevr.bones.boneId import dev.slimevr.computedSkeletonOf import dev.slimevr.config.VMCConfig import dev.slimevr.osc.OscArg import dev.slimevr.osc.OscBundle import dev.slimevr.osc.OscContent import dev.slimevr.osc.OscMessage -import dev.slimevr.skeleton.BoneMap -import dev.slimevr.skeleton.BoneRegistry import dev.slimevr.skeleton.BoneState import dev.slimevr.skeleton.Velocity -import dev.slimevr.skeleton.boneId import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 import solarxr_protocol.datatypes.BodyPart diff --git a/server/core/src/test/java/dev/slimevr/vmc/VMCInputBehaviourTest.kt b/server/core/src/test/java/dev/slimevr/vmc/VMCInputBehaviourTest.kt index 6607a3949..534d48d78 100644 --- a/server/core/src/test/java/dev/slimevr/vmc/VMCInputBehaviourTest.kt +++ b/server/core/src/test/java/dev/slimevr/vmc/VMCInputBehaviourTest.kt @@ -3,6 +3,9 @@ package dev.slimevr.vmc import dev.slimevr.AppContextProvider import dev.slimevr.TestAppContext import dev.slimevr.VRServer +import dev.slimevr.bones.BoneRegistryManager +import dev.slimevr.bones.bodyPartMap +import dev.slimevr.bones.boneId import dev.slimevr.buildTestAppConfig import dev.slimevr.buildTestSkeleton import dev.slimevr.buildTestVrServerStub @@ -13,8 +16,6 @@ import dev.slimevr.osc.OscContent import dev.slimevr.osc.OscMessage import dev.slimevr.quaternionApproxEqual import dev.slimevr.skeleton.Skeleton -import dev.slimevr.skeleton.bodyPartMap -import dev.slimevr.skeleton.boneId import dev.slimevr.vectorAssertEquals import io.github.axisangles.ktmath.Quaternion import io.github.axisangles.ktmath.Vector3 @@ -47,6 +48,7 @@ private fun buildHarness(scope: CoroutineScope): Harness { override val server: VRServer = server override val config: AppConfig = config override val skeleton: Skeleton = skeleton + override val bones = BoneRegistryManager.create(scope, skeleton.registry) } return Harness(server, appContext, VMCManager.create(scope)) } diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt index 7ae69a81f..ef60028ff 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt +++ b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt @@ -10,6 +10,7 @@ import dev.slimevr.FeatureFlags import dev.slimevr.Phase1Context import dev.slimevr.Platform import dev.slimevr.VRServer +import dev.slimevr.bones.BoneRegistryManager import dev.slimevr.bvh.BVHManager import dev.slimevr.config.AppConfig import dev.slimevr.context.debug.contextDebugEnabled @@ -126,12 +127,16 @@ fun main(args: Array) = runBlocking(appCoroutineExceptionHandler + val config = AppConfig.create(this, storage = storage) val server = VRServer.create(this) val serialServer = createDesktopSerialServer(this) + val bones = BoneRegistryManager.create(scope = this) - val phase1 = Phase1Context(server = server, config = config, serialServer = serialServer) + val phase1 = Phase1Context(server = server, config = config, serialServer = serialServer, bones = bones) val firmwareManager = FirmwareManager.create(ctx = phase1, scope = this, flasher = DesktopFirmwareFlasher) val vrcConfigManager = createDesktopVRCConfigManager(ctx = phase1, scope = this) val networkProfileManager = NetworkProfileManager.create(scope = this, isSupported = CURRENT_PLATFORM == Platform.WINDOWS) + // Nothing registers extension bones yet, so this is a no-op today; it exists so the + // tracking stack below never observes a registry that could still change under it. + bones.freeze() val skeleton = Skeleton.create(scope = this, ctx = phase1, waiter = createDesktopWaiter()) val provisioningManager = ProvisioningManager.create(ctx = phase1, scope = this) val heightCalibrationManager = HeightCalibrationManager.create(ctx = phase1, scope = this) @@ -159,6 +164,7 @@ fun main(args: Array) = runBlocking(appCoroutineExceptionHandler + server = server, config = config, serialServer = serialServer, + bones = bones, serverInfos = serverInfos, featureFlags = featureFlags, keybindManager = keybindManager,