mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-21 17:41:28 -08:00
Add VRCOSC toes to bone routing
This commit is contained in:
1 parent
eb04fdd300
commit
34c24ed9df
2 files changed
+8
-2
No files matched your search
@@ -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<RoutingOutput> = when (output
|
||||
|
||||
/** Bones an output needs to work at all, so the user cannot turn them off. */
|
||||
fun requiredBones(output: RoutingOutput): Set<BodyPart> = 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
|
||||
}
|
||||
|
||||
|
||||
@@ -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<BodyPart> = trackerIdsByBodyPart.keys
|
||||
val VRC_OSC_SUPPORTED_BONES: Set<BodyPart> = trackerIdsByBodyPart.keys + ResetBodyParts.TOES
|
||||
|
||||
internal fun buildOutgoingBundle(
|
||||
bones: ComputedSkeleton,
|
||||
|
||||
Reference in new issue
Block a user