Move registry into a module, preparing for extensions

This commit is contained in:
loucass003 committed 2026-09-13 14:14:12 +02:00
1 parent 69acb068c7
commit a371af75fa
94 files changed
+352 -145

No files matched your search

@@ -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,
@@ -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,
@@ -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
@@ -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<V> 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
@@ -1,4 +1,4 @@
package dev.slimevr.skeleton
package dev.slimevr.bones
import solarxr_protocol.datatypes.BodyPart
@@ -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<BoneDefinition>) : BoneRegistryActions
data object Freeze : BoneRegistryActions
}
typealias BoneRegistryContext = Context<BoneRegistryState, BoneRegistryActions>
/**
* 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<BoneDefinition>) = 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)
}
}
}
@@ -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<BoneDefinition>): List<BoneDefinition> {
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)
}
@@ -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<BoneId> = (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<List<Pair<BoneId?, BoneId>>>(2 * (maxId + 1))
fun hierarchyFrom(root: BoneId, onlyChildren: Boolean = false): List<Pair<BoneId?, BoneId>> {
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<List<Pair<BoneId?, BoneId>>> = Array(2 * (maxId + 1)) { cacheIndex ->
val root = BoneId((cacheIndex / 2).toUShort())
val onlyChildren = cacheIndex % 2 == 1
val result = mutableListOf<Pair<BoneId?, BoneId>>()
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<Pair<BoneId?, BoneId>> =
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<UShort>()
fun root(id: UShort): UShort {
require(visited.add(id)) { "Bone registry contains a cycle" }
@@ -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
@@ -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<String, Set<RoutingOutput>>? = null,
)
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<ResetsState, ResetsActions>
typealias ResetsBehaviour = Behaviour<ResetsManager>
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)
}
}
}
@@ -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
@@ -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(),
@@ -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<Routes> = 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()
@@ -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
@@ -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
@@ -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<BodyPart>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
/**
@@ -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,
@@ -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
@@ -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
@@ -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
@@ -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
}
@@ -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
@@ -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
@@ -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
/**
@@ -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
@@ -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<ResettableSkeletonProcessor>()
val behaviours = listOf(
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<DataFeedConfig> = emptyList(),
@@ -136,7 +136,7 @@ class SolarXRBridge(
private val managedContext: ManagedContext<SolarXRBridgeState, SolarXRBridgeActions>? = 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.
@@ -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),
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<TapDetectionState, TapDetectionActions>
typealias TapDetectionBehaviour = Behaviour<TapDetectionManager>
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)
}
}
}
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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(
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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),
)
@@ -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
@@ -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 }
@@ -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
@@ -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
@@ -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
@@ -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,
@@ -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
@@ -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) }
@@ -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
@@ -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")
@@ -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<IllegalArgumentException> {
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))
}
}
@@ -1,4 +1,4 @@
package dev.slimevr.skeleton
package dev.slimevr.bones
import solarxr_protocol.connection.BoneDefinition
import solarxr_protocol.datatypes.BodyPart
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<MessageBundle>): 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)
}
}
@@ -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
}
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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))
}
@@ -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<String>) = runBlocking<Unit>(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<String>) = runBlocking<Unit>(appCoroutineExceptionHandler +
server = server,
config = config,
serialServer = serialServer,
bones = bones,
serverInfos = serverInfos,
featureFlags = featureFlags,
keybindManager = keybindManager,