From aa4eacccdc36a239d2ac91bb0d6bdaec6a023255 Mon Sep 17 00:00:00 2001 From: Sapphire Date: Mon, 9 Mar 2026 15:49:10 -0500 Subject: [PATCH] Allow selecting which body part to use for tap resets --- gui/public/i18n/en/translation.ftl | 9 +- .../components/onboarding/BodyAssignment.tsx | 22 +++ .../trackers-assign/TrackerAssignment.tsx | 6 +- .../settings/pages/GeneralSettings.tsx | 146 +++++++++++++++++- .../components/tracker/TrackerPartCard.tsx | 28 ++-- .../dev/slimevr/config/TapDetectionConfig.kt | 8 +- .../rpc/settings/RPCSettingsBuilder.kt | 13 +- .../rpc/settings/RPCSettingsHandler.kt | 5 + .../processor/skeleton/TapDetectionManager.kt | 23 +++ 9 files changed, 235 insertions(+), 25 deletions(-) diff --git a/gui/public/i18n/en/translation.ftl b/gui/public/i18n/en/translation.ftl index e91247bac..35b9d3b60 100644 --- a/gui/public/i18n/en/translation.ftl +++ b/gui/public/i18n/en/translation.ftl @@ -671,7 +671,7 @@ settings-general-fk_settings-self_localization-description = Mocap Mode allows t ## Gesture control settings (tracker tapping) settings-general-gesture_control = Gesture control settings-general-gesture_control-subtitle = Tap based resets -settings-general-gesture_control-description = Allows for resets to be triggered by tapping a tracker. The tracker highest up on your torso is used for Yaw Reset, the tracker highest up on your left leg is used for Full Reset, and the tracker highest up on your right leg is used for Mounting Calibration. Taps must occur within the time limit of 0.3 seconds times the number of taps to be recognized. +settings-general-gesture_control-description = Allows for resets to be triggered by tapping a tracker. If the preferred body part is unset, or the preferred body part is not assigned to a connected tracker, the tracker highest up on your torso is used for Yaw Reset, the tracker highest up on your left leg is used for Full Reset, and the tracker highest up on your right leg is used for Mounting Calibration. Taps must occur within the time limit of 0.3 seconds times the number of taps to be recognized. # This is a unit: 3 taps, 2 taps, 1 tap # $amount (Number) - Amount of taps (touches to the tracker's case) settings-general-gesture_control-taps = { $amount -> @@ -684,13 +684,20 @@ settings-general-gesture_control-trackers = { $amount -> [one] 1 tracker *[other] { $amount } trackers } +settings-general-gesture_control-part_select = Which tracker do you want to tap to trigger the reset? +settings-general-gesture_control-part_select-edit = Edit +settings-general-gesture_control-part_select-reset = Reset preference +settings-general-gesture_control-part_select-no_preference = No preference settings-general-gesture_control-yawResetEnabled = Enable tap to yaw reset +settings-general-gesture_control-yawResetPart = Preferred tracker for yaw reset taps settings-general-gesture_control-yawResetDelay = Yaw reset delay settings-general-gesture_control-yawResetTaps = Taps for yaw reset settings-general-gesture_control-fullResetEnabled = Enable tap to full reset +settings-general-gesture_control-fullResetPart = Preferred tracker for full reset taps settings-general-gesture_control-fullResetDelay = Full reset delay settings-general-gesture_control-fullResetTaps = Taps for full reset settings-general-gesture_control-mountingResetEnabled = Enable tap to perform mounting calibration +settings-general-gesture_control-mountingResetPart = Preferred tracker for mounting calibration taps settings-general-gesture_control-mountingResetDelay = Mounting calibration delay settings-general-gesture_control-mountingResetTaps = Taps for mounting calibration # The number of trackers that can have higher acceleration before a tap is rejected diff --git a/gui/src/components/onboarding/BodyAssignment.tsx b/gui/src/components/onboarding/BodyAssignment.tsx index b264d815f..9bc0e4258 100644 --- a/gui/src/components/onboarding/BodyAssignment.tsx +++ b/gui/src/components/onboarding/BodyAssignment.tsx @@ -103,11 +103,13 @@ export function BodyAssignment({ rolesWithErrors = {}, highlightedRoles = [], onlyAssigned = false, + showAssignedTracker = true, dotSize, }: { assignMode: AssignMode | null; mirror: boolean; onlyAssigned?: boolean; + showAssignedTracker?: boolean; rolesWithErrors?: Partial>; highlightedRoles?: BodyPart[]; onRoleSelected: (role: BodyPart) => void; @@ -165,6 +167,7 @@ export function BodyAssignment({ {hasBodyPart(BodyPart.HEAD) && ( onRoleSelected(BodyPart.HIP)} @@ -246,6 +255,7 @@ export function BodyAssignment({ {hasBodyPart(SIDES[left].upperLeg) && ( onRoleSelected(SIDES[right].hand)} @@ -355,6 +373,7 @@ export function BodyAssignment({ {hasBodyPart(BodyPart.WAIST) && ( onRoleSelected(BodyPart.WAIST)} @@ -367,6 +386,7 @@ export function BodyAssignment({ {hasBodyPart(SIDES[right].upperLeg) && ( ({ + id, + control, + name, +}: { + id: string; + control: Control; + name: FieldPath; +}) { + const { isMobile } = useBreakpoint('mobile'); + const { config } = useConfig(); + const [bodyPartSelectorOpen, setBodyPartSelectorOpen] = useState(false); + + return ( + ( + <> +
+ +
+
+ + +
+
+
+
+
+ setBodyPartSelectorOpen(false)} + overlayClassName="fixed top-0 right-0 left-0 bottom-0 flex flex-col items-center w-full h-full justify-center bg-background-90 bg-opacity-90 z-20" + className="focus:ring-transparent focus:ring-offset-transparent focus:outline-transparent outline-none mt-12 z-10 overflow-y-auto" + > +
+
+
+
+ +
+ { + onChange(part); + setBodyPartSelectorOpen(false); + }} + /> +
+
+
+
+
+
+ + )} + /> + ); +} export type SettingsForm = { trackers: { @@ -89,15 +191,18 @@ export type SettingsForm = { interpKneeAnkle: number; }; tapDetection: { - mountingResetEnabled: boolean; yawResetEnabled: boolean; fullResetEnabled: boolean; + mountingResetEnabled: boolean; yawResetDelay: number; fullResetDelay: number; mountingResetDelay: number; yawResetTaps: number; fullResetTaps: number; mountingResetTaps: number; + yawResetTracker: BodyPart; + fullResetTracker: BodyPart; + mountingResetTracker: BodyPart; numberTrackersOverThreshold: number; }; legTweaks: { @@ -149,15 +254,18 @@ const defaultValues: SettingsForm = { }, filtering: { amount: 0.1, type: FilteringType.NONE }, tapDetection: { - mountingResetEnabled: false, yawResetEnabled: false, fullResetEnabled: false, + mountingResetEnabled: false, yawResetDelay: 0.2, fullResetDelay: 1.0, mountingResetDelay: 1.0, yawResetTaps: 2, fullResetTaps: 3, mountingResetTaps: 3, + yawResetTracker: BodyPart.NONE, + fullResetTracker: BodyPart.NONE, + mountingResetTracker: BodyPart.NONE, numberTrackersOverThreshold: 1, }, legTweaks: { correctionStrength: 0.3 }, @@ -302,13 +410,17 @@ export function GeneralSettings() { tapDetection.fullResetDelay = values.tapDetection.fullResetDelay; tapDetection.fullResetEnabled = values.tapDetection.fullResetEnabled; tapDetection.fullResetTaps = values.tapDetection.fullResetTaps; + tapDetection.fullResetTracker = values.tapDetection.fullResetTracker; tapDetection.yawResetDelay = values.tapDetection.yawResetDelay; tapDetection.yawResetEnabled = values.tapDetection.yawResetEnabled; tapDetection.yawResetTaps = values.tapDetection.yawResetTaps; + tapDetection.yawResetTracker = values.tapDetection.yawResetTracker; tapDetection.mountingResetEnabled = values.tapDetection.mountingResetEnabled; tapDetection.mountingResetDelay = values.tapDetection.mountingResetDelay; tapDetection.mountingResetTaps = values.tapDetection.mountingResetTaps; + tapDetection.mountingResetTracker = + values.tapDetection.mountingResetTracker; tapDetection.numberTrackersOverThreshold = values.tapDetection.numberTrackersOverThreshold; tapDetection.setupMode = false; @@ -416,6 +528,15 @@ export function GeneralSettings() { mountingResetTaps: settings.tapDetectionSettings.mountingResetTaps || defaultValues.tapDetection.mountingResetTaps, + yawResetTracker: + settings.tapDetectionSettings.yawResetTracker || + defaultValues.tapDetection.yawResetTracker, + fullResetTracker: + settings.tapDetectionSettings.fullResetTracker || + defaultValues.tapDetection.fullResetTracker, + mountingResetTracker: + settings.tapDetectionSettings.mountingResetTracker || + defaultValues.tapDetection.mountingResetTracker, numberTrackersOverThreshold: settings.tapDetectionSettings.numberTrackersOverThreshold || defaultValues.tapDetection.numberTrackersOverThreshold, @@ -1237,6 +1358,23 @@ export function GeneralSettings() { )} /> +
+ + + +
; }) { @@ -107,17 +109,21 @@ export function TrackerPartCard({ > {l10n.getString('body_part-' + BodyPart[role])} - {td?.map(({ tracker }, index) => ( - updateVelocity(vel)} - /> - ))} - {!td && ( - - {l10n.getString('tracker-part_card-unassigned')} - + {showAssignedTracker && ( + <> + {td?.map(({ tracker }, index) => ( + updateVelocity(vel)} + /> + ))} + {!td && ( + + {l10n.getString('tracker-part_card-unassigned')} + + )} + )}
)) || <> diff --git a/server/core/src/main/java/dev/slimevr/config/TapDetectionConfig.kt b/server/core/src/main/java/dev/slimevr/config/TapDetectionConfig.kt index 0e5a83cde..5fad0dbe3 100644 --- a/server/core/src/main/java/dev/slimevr/config/TapDetectionConfig.kt +++ b/server/core/src/main/java/dev/slimevr/config/TapDetectionConfig.kt @@ -1,17 +1,15 @@ package dev.slimevr.config -import com.jme3.math.FastMath - -// handles the tap detection config -// this involves the number of taps, the delay, and whether or not the feature is enabled -// for each reset type class TapDetectionConfig { var yawResetDelay = 0.2f var fullResetDelay = 1.0f var mountingResetDelay = 1.0f var yawResetEnabled = true + var yawResetDesignation: String? = null var fullResetEnabled = true + var fullResetDesignation: String? = null var mountingResetEnabled = true + var mountingResetDesignation: String? = null var setupMode = false var yawResetTaps = 2 set(yawResetTaps) { diff --git a/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.kt b/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.kt index 0735c1831..8f1d8a1c5 100644 --- a/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.kt +++ b/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.kt @@ -19,6 +19,7 @@ import dev.slimevr.filtering.TrackerFilters.Companion.getByConfigkey import dev.slimevr.tracking.processor.HumanPoseManager import dev.slimevr.tracking.processor.config.SkeletonConfigToggles import dev.slimevr.tracking.processor.config.SkeletonConfigValues +import dev.slimevr.tracking.trackers.TrackerPosition import dev.slimevr.tracking.trackers.TrackerRole import solarxr_protocol.rpc.AutoBoneSettings import solarxr_protocol.rpc.DriftCompensationSettings @@ -163,9 +164,15 @@ fun createTapDetectionSettings( tapDetectionConfig.mountingResetTaps, tapDetectionConfig.setupMode, tapDetectionConfig.numberTrackersOverThreshold, - 0, - 0, - 0, + tapDetectionConfig.yawResetDesignation?.let { + TrackerPosition.getByDesignation(it) + }?.bodyPart ?: 0, + tapDetectionConfig.fullResetDesignation?.let { + TrackerPosition.getByDesignation(it) + }?.bodyPart ?: 0, + tapDetectionConfig.mountingResetDesignation?.let { + TrackerPosition.getByDesignation(it) + }?.bodyPart ?: 0 ) fun createSteamVRSettings(fbb: FlatBufferBuilder, bridge: ISteamVRBridge?): Int { diff --git a/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsHandler.kt b/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsHandler.kt index 713b70e98..9744abb7a 100644 --- a/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsHandler.kt +++ b/server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsHandler.kt @@ -9,6 +9,7 @@ import dev.slimevr.protocol.ProtocolAPI import dev.slimevr.protocol.rpc.RPCHandler import dev.slimevr.tracking.processor.config.SkeletonConfigToggles import dev.slimevr.tracking.processor.config.SkeletonConfigValues +import dev.slimevr.tracking.trackers.TrackerPosition import dev.slimevr.tracking.trackers.TrackerRole import solarxr_protocol.rpc.ChangeSettingsRequest import solarxr_protocol.rpc.RpcMessage @@ -192,6 +193,10 @@ class RPCSettingsHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) { .mountingResetTaps = tapDetectionSettings.mountingResetTaps() } + tapDetectionConfig.yawResetDesignation = TrackerPosition.getByBodyPart(tapDetectionSettings.yawResetTracker())?.designation + tapDetectionConfig.fullResetDesignation = TrackerPosition.getByBodyPart(tapDetectionSettings.fullResetTracker())?.designation + tapDetectionConfig.mountingResetDesignation = TrackerPosition.getByBodyPart(tapDetectionSettings.mountingResetTracker())?.designation + api.server.humanPoseManager.updateTapDetectionConfig() } } diff --git a/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/TapDetectionManager.kt b/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/TapDetectionManager.kt index db942cea7..838ff75c1 100644 --- a/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/TapDetectionManager.kt +++ b/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/TapDetectionManager.kt @@ -3,6 +3,8 @@ package dev.slimevr.tracking.processor.skeleton import dev.slimevr.VRServer import dev.slimevr.tracking.processor.HumanPoseManager import dev.slimevr.tracking.trackers.Tracker +import dev.slimevr.tracking.trackers.TrackerPosition +import dev.slimevr.tracking.trackers.TrackerUtils import java.util.concurrent.CopyOnWriteArrayList class TapDetectionManager( @@ -87,7 +89,14 @@ class TapDetectionManager( private val mountingResetTracker: Tracker? get() { + val selectedTracker = config.mountingResetDesignation?.let { + TrackerUtils.getTrackerForSkeleton(server.allTrackers, + TrackerPosition.getByDesignation(it) + ?: error("unknown designation '$it'") + ) + } return arrayOf( + selectedTracker, skeleton.rightUpperLegTracker, skeleton.rightLowerLegTracker, ).firstNotNullOfOrNull { it } @@ -95,7 +104,14 @@ class TapDetectionManager( private val fullResetTracker: Tracker? get() { + val selectedTracker = config.fullResetDesignation?.let { + TrackerUtils.getTrackerForSkeleton(server.allTrackers, + TrackerPosition.getByDesignation(it) + ?: error("unknown designation '$it'") + ) + } return arrayOf( + selectedTracker, skeleton.leftUpperLegTracker, skeleton.leftLowerLegTracker, ).firstNotNullOfOrNull { it } @@ -103,7 +119,14 @@ class TapDetectionManager( private val yawResetTracker: Tracker? get() { + val selectedTracker = config.yawResetDesignation?.let { + TrackerUtils.getTrackerForSkeleton(server.allTrackers, + TrackerPosition.getByDesignation(it) + ?: error("unknown designation '$it'") + ) + } return arrayOf( + selectedTracker, skeleton.upperChestTracker, skeleton.chestTracker, skeleton.hipTracker,