From 34c24ed9df80741f2bfa74b40dc2135c95f3a4e4 Mon Sep 17 00:00:00 2001 From: Erimel Date: Tue, 6 Oct 2026 17:59:31 -0400 Subject: [PATCH] Add VRCOSC toes to bone routing --- server/core/src/main/java/dev/slimevr/routing/routing.kt | 7 ++++++- .../src/main/java/dev/slimevr/vrcosc/output-encoder.kt | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) 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 3409df5d1..36948d923 100644 --- a/server/core/src/main/java/dev/slimevr/routing/routing.kt +++ b/server/core/src/main/java/dev/slimevr/routing/routing.kt @@ -3,6 +3,7 @@ package dev.slimevr.routing import dev.slimevr.AppContextProvider import dev.slimevr.VRServer import dev.slimevr.config.BoneRoutingConfig +import dev.slimevr.resets.ResetBodyParts import dev.slimevr.solarxr.driver.DRIVER_SUPPORTED_BONES import dev.slimevr.tracker.TrackerState import dev.slimevr.util.allContextStates @@ -41,7 +42,11 @@ fun conflictingOutputs(output: RoutingOutput): Set = when (output /** Bones an output needs to work at all, so the user cannot turn them off. */ fun requiredBones(output: RoutingOutput): Set = when (output) { - RoutingOutput.DRIVER, RoutingOutput.VRC_OSC -> emptySet() + RoutingOutput.DRIVER -> emptySet() + + // TODO make VRC_OSC toes toggleable? + RoutingOutput.VRC_OSC -> ResetBodyParts.TOES + RoutingOutput.VMC -> VMC_SUPPORTED_BONES } 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 444069967..20b73dc9c 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 @@ -5,6 +5,7 @@ import dev.slimevr.osc.OscArg import dev.slimevr.osc.OscBundle import dev.slimevr.osc.OscContent import dev.slimevr.osc.OscMessage +import dev.slimevr.resets.ResetBodyParts import dev.slimevr.skeleton.ComputedSkeleton import io.github.axisangles.ktmath.EulerOrder import io.github.axisangles.ktmath.Quaternion @@ -23,7 +24,7 @@ private val trackerIdsByBodyPart = mapOf( ) /** Bones VRChat OSC can accept. Used by the routing module. */ -val VRC_OSC_SUPPORTED_BONES: Set = trackerIdsByBodyPart.keys +val VRC_OSC_SUPPORTED_BONES: Set = trackerIdsByBodyPart.keys + ResetBodyParts.TOES internal fun buildOutgoingBundle( bones: ComputedSkeleton,