diff --git a/.gitignore b/.gitignore
index d86993266..1f6767f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,6 @@ build/
# Ignore Android local properties
local.properties
+
+# Ignore temporary config
+vrconfig.yml.tmp
diff --git a/dev.slimevr.SlimeVR.metainfo.xml b/dev.slimevr.SlimeVR.metainfo.xml
index c1e914d31..141ea2040 100644
--- a/dev.slimevr.SlimeVR.metainfo.xml
+++ b/dev.slimevr.SlimeVR.metainfo.xml
@@ -65,6 +65,10 @@ work. If not, see .
+ https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1
+ https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.3
+ https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.2
+ https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.1https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0-rc.4https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0-rc.3
diff --git a/gui/public/i18n/de/translation.ftl b/gui/public/i18n/de/translation.ftl
index 77dc7ad07..e4a6a8ed6 100644
--- a/gui/public/i18n/de/translation.ftl
+++ b/gui/public/i18n/de/translation.ftl
@@ -36,7 +36,7 @@ body_part-RIGHT_UPPER_ARM = Rechter Oberarm
body_part-RIGHT_LOWER_ARM = Rechter Unterarm
body_part-RIGHT_HAND = Rechte Hand
body_part-RIGHT_UPPER_LEG = Rechter Oberschenkel
-body_part-RIGHT_LOWER_LEG = Rechter Unterschenkel
+body_part-RIGHT_LOWER_LEG = Rechter Knöchel
body_part-RIGHT_FOOT = Rechter Fuß
body_part-UPPER_CHEST = Obere Brust
body_part-CHEST = Brust
@@ -47,7 +47,7 @@ body_part-LEFT_UPPER_ARM = Linker Oberarm
body_part-LEFT_LOWER_ARM = Linker Unterarm
body_part-LEFT_HAND = Linke Hand
body_part-LEFT_UPPER_LEG = Linker Oberschenkel
-body_part-LEFT_LOWER_LEG = Linker Unterschenkel
+body_part-LEFT_LOWER_LEG = Linker Knöchel
body_part-LEFT_FOOT = Linker Fuß
## Proportions
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = Ellbogenversatz
## Tracker reset buttons
reset-reset_all = Alle Proportionen zurücksetzen
+reset-reset_all_warning =
+ Achtung: Die Proportionen werden zurückgesetzt und auf Basis ihrer Körpergröße neu berechnet.
+ Sind sie sich sicher?
+reset-reset_all_warning-reset = Proportionen zurücksetzen
+reset-reset_all_warning-cancel = Abbrechen
reset-full = Reset
reset-mounting = Befestigungs-Reset
reset-yaw = Horizontaler Reset
@@ -142,9 +147,12 @@ widget-developer_mode-more_info = Mehr Infos
## Widget: IMU Visualizer
widget-imu_visualizer = Drehung
+widget-imu_visualizer-preview = Vorschau
+widget-imu_visualizer-hide = Ausblenden
widget-imu_visualizer-rotation_raw = Rohe Drehung
widget-imu_visualizer-rotation_preview = Vorschau
-widget-imu_visualizer-rotation_hide = Ausblenden
+widget-imu_visualizer-acceleration = Beschleunigung
+widget-imu_visualizer-position = Position
## Widget: Skeleton Visualizer
@@ -199,6 +207,13 @@ tracker-infos-hardware_identifier = Hardware-ID
tracker-infos-imu = IMU-Sensor
tracker-infos-board_type = Platine
tracker-infos-network_version = Protokoll Version
+tracker-infos-magnetometer = Magnetometer
+tracker-infos-magnetometer-status-v1 =
+ { $status ->
+ [DISABLED] Ausgeschalten
+ [ENABLED] Angeschalten
+ *[NOT_SUPPORTED] Nicht unterstützt
+ }
## Tracker settings
@@ -213,11 +228,19 @@ tracker-settings-mounting_section-edit = Befestigung bearbeiten
tracker-settings-drift_compensation_section = Drift-Kompensierung
tracker-settings-drift_compensation_section-description = Soll dieser Tracker Drift kompensieren, wenn die Drift-Kompensierung allgemein aktiviert ist?
tracker-settings-drift_compensation_section-edit = Erlaube Drift Kompensierung
+tracker-settings-use_mag = Magnetometer auf diesem Tracker zulassen
+# Multiline!
+tracker-settings-use_mag-description =
+ Soll dieser Tracker das Magnetometer verwenden um Drift zu reduzieren, wenn die Verwendung von Magnetometer erlaubt ist? Bitten schalten Sie den Tracker nicht aus, während Sie diese Einstellung umschalten!
+
+ Sie müssen zuerst die Verwendung des Magnetometers zulassen, klicken Sie hier, um zu den Einstellungen zu gelangen.
+tracker-settings-use_mag-label = Magnetometer zulassen
# The . means it's an attribute and it's related to the top key.
# In this case that is the settings for the assignment section.
tracker-settings-name_section = Trackername
tracker-settings-name_section-description = Geben Sie ihm einen süßen Spitznamen :)
tracker-settings-name_section-placeholder = NightyBeast's linkes Bein
+tracker-settings-name_section-label = Trackername
tracker-settings-forget = Tracker Vergessen
tracker-settings-forget-description = Entfernt den Tracker vom SlimeVR Server und verhindert, dass er sich wieder verbindet, bis der Server neu gestartet wurde. Die Konfiguration des Trackers geht nicht verloren.
tracker-settings-forget-label = Tracker Vergessen
@@ -296,6 +319,7 @@ settings-sidebar-utils = Werkzeuge
settings-sidebar-serial = Serielle Konsole
settings-sidebar-appearance = Erscheinungsbild
settings-sidebar-notifications = Benachrichtigungen
+settings-sidebar-advanced = Erweitert
## SteamVR settings
@@ -350,6 +374,20 @@ settings-general-tracker_mechanics-drift_compensation-description =
Kompensiert IMU Drift auf der Gier-Achse durch Anwenden einer invertierten Rotation.
Ändern Sie die Menge der Kompensierung und die Anzahl der Resets, welche für die Berechnung genutzt werden.
settings-general-tracker_mechanics-drift_compensation-enabled-label = Drift-Kompensierung
+settings-general-tracker_mechanics-drift_compensation-prediction = Prognose der Driftkompensation
+# This cares about multilines
+settings-general-tracker_mechanics-drift_compensation-prediction-description =
+ Prognostiziert die Driftkompensation basierend auf dem zuvor gemessenen Drift.
+ Aktivieren Sie diese Funktion, wenn sich der Tracker kontinuierlich um die gier-Achse dreht.
+settings-general-tracker_mechanics-drift_compensation-prediction-label = Prognose der Driftkompensation
+settings-general-tracker_mechanics-drift_compensation_warning =
+ Warnung: Verwenden Sie die Driftkompensation nur, wenn sie sehr oft
+ reseten müssen (alle ~5-10 Minuten).
+
+ Zu den IMUs, die häufig einen Reset benötigen, gehören:
+ Joy-Cons, owoTrack und MPUs (ohne aktuelle Firmware).
+settings-general-tracker_mechanics-drift_compensation_warning-cancel = Abbrechen
+settings-general-tracker_mechanics-drift_compensation_warning-done = Ich verstehe
settings-general-tracker_mechanics-drift_compensation-amount-label = Kompensierungsmenge
settings-general-tracker_mechanics-drift_compensation-max_resets-label = Nutze die letzten x Resets
settings-general-tracker_mechanics-save_mounting_reset = Automatische Befestigungs-Reset Kalibrierung speichern
@@ -357,6 +395,11 @@ settings-general-tracker_mechanics-save_mounting_reset-description =
Speichert die automatische Befestigungs-Reset Kalibrierung für die Tracker zwischen den Neustarts. Nützlich
wenn Sie einen Anzug tragen, bei dem sich die Tracker zwischen den Sitzungen nicht bewegen. Für normale Benutzer nicht zu empfehlen!
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = Befestigungs-Reset speichern
+settings-general-tracker_mechanics-use_mag_on_all_trackers = Verwende das Magnetometer auf allen IMU-Trackern, die dies unterstützen.
+settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
+ Verwendet das Magnetometer auf allen Trackern, die über eine kompatible Firmware verfügen, um den Drift in stabilen magnetischen Umgebungen zu reduzieren.
+ Kann pro Tracker in den Einstellungen des Trackers deaktiviert werden. Bitte schalten Sie keinen der Tracker aus, während Sie dies umschalten!
+settings-general-tracker_mechanics-use_mag_on_all_trackers-label = Magnetometer auf Trackern verwenden
## FK/Tracking settings
@@ -454,6 +497,9 @@ settings-general-interface-dev_mode = Entwicklermodus
settings-general-interface-dev_mode-description = Der Entwicklermodus stellt mehr Daten dar und erlaubt auch erweiterte Einstellungen, so wie erweiterte Optionen bei verbundenen Trackern.
settings-general-interface-dev_mode-label = Entwicklermodus
settings-general-interface-theme = Farbschema
+settings-general-interface-show-navbar-onboarding = "{ navbar-onboarding }" in der Navigationsleiste anzeigen
+settings-general-interface-show-navbar-onboarding-description = Dies ändert die Sichtbarkeit der Schaltfläche "{ navbar-onboarding }" in der Navigationsleiste
+settings-general-interface-show-navbar-onboarding-label = Zeige "{ navbar-onboarding }"
settings-general-interface-lang = Sprachauswahl
settings-general-interface-lang-description = Ändern Sie die Standard-Sprache, die Sie verwenden möchten
settings-general-interface-lang-placeholder = Wählen Sie die zu verwendende Sprache aus
@@ -465,6 +511,9 @@ settings-interface-appearance-font-os_font = Betriebssystem-Schriftart
settings-interface-appearance-font-slime_font = Standard-Schriftart
settings-interface-appearance-font_size = Standard-Schriftgröße
settings-interface-appearance-font_size-description = Verändert die Schriftgröße der gesamten Oberfläche außer diesem Einstellungs-Panel.
+settings-interface-appearance-decorations = Verwenden Sie die systemeigenen Fensterdekorationen
+settings-interface-appearance-decorations-description = Dadurch wird die obere Leiste der Benutzeroberfläche nicht gerendert, sondern die des Betriebssystems verwendet.
+settings-interface-appearance-decorations-label = Verwenden der native Fensterdekorationen
## Notification settings
@@ -607,6 +656,36 @@ settings-osc-vmc-mirror_tracking = Tracking spiegeln
settings-osc-vmc-mirror_tracking-description = Tracking horizontal spiegeln
settings-osc-vmc-mirror_tracking-label = Tracking spiegeln
+## Advanced settings
+
+settings-utils-advanced = Erweitert
+settings-utils-advanced-reset-gui = Einstellungen der Benutzeroberfläche zurücksetzen
+settings-utils-advanced-reset-gui-description = Stellt die Standardeinstellungen für die Benutzeroberfläche wieder her.
+settings-utils-advanced-reset-gui-label = Benutzeroberfläche zurücksetzen
+settings-utils-advanced-reset-server = Tracking-Einstellungen zurücksetzen
+settings-utils-advanced-reset-server-description = Stellen Sie die Standardeinstellungen für das Tracking wieder her.
+settings-utils-advanced-reset-server-label = Tracking zurücksetzen
+settings-utils-advanced-reset-all = Alle Einstellungen zurücksetzen
+settings-utils-advanced-reset-all-description = Stellt die Standardeinstellungen für die Benutzeroberfläche und das Tracking wieder her.
+settings-utils-advanced-reset-all-label = Alles zurücksetzen
+settings-utils-advanced-reset_warning =
+ { $type ->
+ [gui]
+ Warnung: Dadurch werden Ihre Benutzeroberfläche-Einstellungen auf die Standardeinstellungen zurückgesetzt.
+ Möchten Sie das wirklich tun?
+ [server]
+ Warnung: Dadurch werden Ihre Tracking-Einstellungen auf die Standardeinstellungen zurückgesetzt.
+ Möchten Sie das wirklich tun?
+ *[all]
+ Warnung: Dadurch werden alle Ihre Einstellungen auf die Standardeinstellungen zurückgesetzt.
+ Möchten Sie das wirklich tun?
+ }
+settings-utils-advanced-reset_warning-reset = Einstellungen zurücksetzen
+settings-utils-advanced-reset_warning-cancel = Abbrechen
+settings-utils-advanced-open_data = Daten-Ordner
+settings-utils-advanced-open_data-description = Öffnet den Daten-Ordner von SlimeVR im Explorer, der Konfigurations- und Protokolldateien enthält.
+settings-utils-advanced-open_data-label = Ordner öffnen
+
## Setup/onboarding menu
onboarding-skip = Einrichtung überspringen
@@ -717,6 +796,7 @@ onboarding-calibration_tutorial-status-waiting = Wir warten auf Sie
onboarding-calibration_tutorial-status-calibrating = Kalibriere
onboarding-calibration_tutorial-status-success = Gut!
onboarding-calibration_tutorial-status-error = Der Tracker wurde bewegt
+onboarding-calibration_tutorial-skip = Tutorial überspringen
## Tracker assignment tutorial
@@ -840,11 +920,11 @@ onboarding-choose_mounting = Welche Kalibrierungsmethode ist zu verwenden?
# Multiline text
onboarding-choose_mounting-description = Die Montageausrichtung korrigiert die Platzierung von Trackern am Körper.
onboarding-choose_mounting-auto_mounting = Befestigung automatisch ermitteln
-# Italized text
+# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = Empfohlen
onboarding-choose_mounting-auto_mounting-description = Dadurch werden die Befestigungsausrichtungen für alle Ihrer Tracker automatisch aus 2 Posen erkannt
onboarding-choose_mounting-manual_mounting = Manuelle Befestigungsposition
-# Italized text
+# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = Möglicherweise nicht präzise genug
onboarding-choose_mounting-manual_mounting-description = Auf diese Weise können Sie die Montagerichtung für jeden Tracker manuell auswählen
# Multiline text
@@ -892,14 +972,14 @@ onboarding-choose_proportions-description-v1 =
Wenn die Proportionen Ihres Körpers nicht mit den Gespeicherten übereinstimmen, ist die Präzision des Trackings schlechter. Außerdem können Probleme wie Skaten oder Rutschen auftreten oder, dass die Bewegungen Ihres Avatars nicht gut mit den Bewegungen Ihres Körpers übereinstimmen.
Sie müssen Ihren Körper nur einmal messen! Es sei denn, die Messwerte sind falsch oder Ihr Körper hat sich verändert, dann müssen Sie die Körperproportionen nochmal bestimmen.
onboarding-choose_proportions-auto_proportions = Automatische Proportionen
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Empfohlen
onboarding-choose_proportions-auto_proportions-descriptionv3 =
Dies wird versuchen, Ihre Proportionen mit Hilfe einer Bewegungsaufnahme zu bestimmen, welche von einem Algorithmus verarbeitet wird.
Dazu muss Ihr Headset (HMD) mit SlimeVR verbunden sein und Sie müssen es an haben!
onboarding-choose_proportions-manual_proportions = Manuelle Körperproportionen
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = Für kleine Anpassungen
onboarding-choose_proportions-manual_proportions-description = Auf diese Weise können Sie Ihre Proportionen manuell anpassen, indem Sie diese direkt ändern
onboarding-choose_proportions-export = Proportionen exportieren
@@ -977,9 +1057,10 @@ onboarding-automatic_proportions-verify_results-redo = Aufnahme wiederholen
onboarding-automatic_proportions-verify_results-confirm = Ergebnisse sind korrekt
onboarding-automatic_proportions-done-title = Körper gemessen und gespeichert.
onboarding-automatic_proportions-done-description = Ihre Körperproportionen-Kalibrierung ist abgeschlossen!
-onboarding-automatic_proportions-error_modal =
- Warnung: Beim Schätzen der Proportionen wurde ein Fehler festgestellt!
- Bitte prüfen Sie die Dokumentation oder treten sie unserem Discord Server bei, um Hilfe zu bekommen. ^_^
+onboarding-automatic_proportions-error_modal-v2 =
+ Warnung: Bei der Schätzung der Proportionen ist ein Fehler aufgetreten!
+ Dies ist wahrscheinlich ein Problem mit der Tracker-Ausrichtung. Vergewissern Sie sich, dass Ihre Tracker ordnungsgemäß funktioniert, bevor Sie es erneut versuchen.
+ Bitte überprüfen Sie die Dokumentation oder treten Sie unserem Discord bei, um Hilfe zu erhalten ^_^
onboarding-automatic_proportions-error_modal-confirm = Verstanden!
## Home
diff --git a/gui/public/i18n/en/translation.ftl b/gui/public/i18n/en/translation.ftl
index 5ac38a5c9..14afb1475 100644
--- a/gui/public/i18n/en/translation.ftl
+++ b/gui/public/i18n/en/translation.ftl
@@ -44,6 +44,36 @@ body_part-LEFT_HAND = Left hand
body_part-LEFT_UPPER_LEG = Left thigh
body_part-LEFT_LOWER_LEG = Left ankle
body_part-LEFT_FOOT = Left foot
+body_part-LEFT_THUMB_PROXIMAL = Left thumb proximal
+body_part-LEFT_THUMB_INTERMEDIATE = Left thumb intermediate
+body_part-LEFT_THUMB_DISTAL = Left thumb distal
+body_part-LEFT_INDEX_PROXIMAL = Left index proximal
+body_part-LEFT_INDEX_INTERMEDIATE = Left index intermediate
+body_part-LEFT_INDEX_DISTAL = Left index distal
+body_part-LEFT_MIDDLE_PROXIMAL = Left middle proximal
+body_part-LEFT_MIDDLE_INTERMEDIATE = Left middle intermediate
+body_part-LEFT_MIDDLE_DISTAL = Left middle distal
+body_part-LEFT_RING_PROXIMAL = Left ring proximal
+body_part-LEFT_RING_INTERMEDIATE = Left ring intermediate
+body_part-LEFT_RING_DISTAL = Left ring distal
+body_part-LEFT_LITTLE_PROXIMAL = Left little proximal
+body_part-LEFT_LITTLE_INTERMEDIATE = Left little intermediate
+body_part-LEFT_LITTLE_DISTAL = Left little distal
+body_part-RIGHT_THUMB_PROXIMAL = Right thumb proximal
+body_part-RIGHT_THUMB_INTERMEDIATE = Right thumb intermediate
+body_part-RIGHT_THUMB_DISTAL = Right thumb distal
+body_part-RIGHT_INDEX_PROXIMAL = Right index proximal
+body_part-RIGHT_INDEX_INTERMEDIATE = Right index intermediate
+body_part-RIGHT_INDEX_DISTAL = Right index distal
+body_part-RIGHT_MIDDLE_PROXIMAL = Right middle proximal
+body_part-RIGHT_MIDDLE_INTERMEDIATE = Right middle intermediate
+body_part-RIGHT_MIDDLE_DISTAL = Right middle distal
+body_part-RIGHT_RING_PROXIMAL = Right ring proximal
+body_part-RIGHT_RING_INTERMEDIATE = Right ring intermediate
+body_part-RIGHT_RING_DISTAL = Right ring distal
+body_part-RIGHT_LITTLE_PROXIMAL = Right little proximal
+body_part-RIGHT_LITTLE_INTERMEDIATE = Right little intermediate
+body_part-RIGHT_LITTLE_DISTAL = Right little distal
## Proportions
skeleton_bone-NONE = None
diff --git a/gui/public/i18n/es-419/translation.ftl b/gui/public/i18n/es-419/translation.ftl
index 547162a47..0fb12c4e7 100644
--- a/gui/public/i18n/es-419/translation.ftl
+++ b/gui/public/i18n/es-419/translation.ftl
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = Desplazamiento del codo
## Tracker reset buttons
reset-reset_all = Reiniciar todas las proporciones
+reset-reset_all_warning =
+ Advertencia: Esto reiniciará tus proporciones para ser basadas solamente en tu altura.
+ ¿Estás seguro de que quieres seguir?
+reset-reset_all_warning-reset = Reiniciar proporciones
+reset-reset_all_warning-cancel = Cancelar
reset-full = Reinicio completo
reset-mounting = Reinicio de montura
reset-yaw = Reinicio horizontal
@@ -142,9 +147,12 @@ widget-developer_mode-more_info = More info
## Widget: IMU Visualizer
widget-imu_visualizer = Rotation
+widget-imu_visualizer-preview = Vista previa
+widget-imu_visualizer-hide = Ocultar
widget-imu_visualizer-rotation_raw = Raw
widget-imu_visualizer-rotation_preview = Preview
-widget-imu_visualizer-rotation_hide = Ocultar
+widget-imu_visualizer-acceleration = Aceleración
+widget-imu_visualizer-position = Posición
## Widget: Skeleton Visualizer
@@ -199,6 +207,13 @@ tracker-infos-hardware_identifier = ID del hardware
tracker-infos-imu = Sensor IMU
tracker-infos-board_type = Placa principal
tracker-infos-network_version = Versión del protocolo
+tracker-infos-magnetometer = Magnetómetro
+tracker-infos-magnetometer-status-v1 =
+ { $status ->
+ [DISABLED] Deshabilitado
+ [ENABLED] Habilitado
+ *[NOT_SUPPORTED] No soportado
+ }
## Tracker settings
@@ -213,11 +228,19 @@ tracker-settings-mounting_section-edit = Editar montura
tracker-settings-drift_compensation_section = Permitir compensación de desviación
tracker-settings-drift_compensation_section-description = ¿Este sensor deberia compensar la desviación?
tracker-settings-drift_compensation_section-edit = Permitir compensación de desviación
+tracker-settings-use_mag = Permitir el uso del magnetómetro en este tracker
+# Multiline!
+tracker-settings-use_mag-description =
+ ¿Debería este tracker usar el magnetómetro para reducir la desviacion cuando se permite el uso del magnetómetro? ¡Por favor, no apagues tu tracker mientras alternas esto!
+
+ Primero debes permitir el uso del magnetómetro, haga clic aquí para ir al ajuste.
+tracker-settings-use_mag-label = Permitir el uso del magnetómetro
# The . means it's an attribute and it's related to the top key.
# In this case that is the settings for the assignment section.
tracker-settings-name_section = Nombre del sensor
tracker-settings-name_section-description = Dale un apodo bonito :)
tracker-settings-name_section-placeholder = Pata izquierda de Manteca
+tracker-settings-name_section-label = Nombre del sensor
tracker-settings-forget = Olvidar tracker
tracker-settings-forget-description = Remueve el tracker del servidor de SlimeVR y lo previene de conectarse hasta que el servidor se reinicie. La configuración del tracker no se perderá.
tracker-settings-forget-label = Olvidar tracker
@@ -296,6 +319,7 @@ settings-sidebar-utils = Utilidades
settings-sidebar-serial = Consola serial
settings-sidebar-appearance = Apariencia
settings-sidebar-notifications = Notificaciones
+settings-sidebar-advanced = Avanzado
## SteamVR settings
@@ -350,6 +374,20 @@ settings-general-tracker_mechanics-drift_compensation-description =
Compensa la desviación del eje vertical de los sensores aplicando una rotación inversa.
Cambia la fuerza de la compensación y hasta cuantos reinicios tomar en cuenta.
settings-general-tracker_mechanics-drift_compensation-enabled-label = Compensación de desviación
+settings-general-tracker_mechanics-drift_compensation-prediction = Compensación mediante la predicción del desvío
+# This cares about multilines
+settings-general-tracker_mechanics-drift_compensation-prediction-description =
+ Predice la desviación horizontal y compensa cuando esta mas allá del rango previamente medido.
+ Activa esto si el sensor esta girando continuamente en el eje horizontal.
+settings-general-tracker_mechanics-drift_compensation-prediction-label = Compensación mediante la predicción del desvío
+settings-general-tracker_mechanics-drift_compensation_warning =
+ Advertencia: Solo usa la compensación de desviación si necesitas reiniciar
+ muy seguido (cada ~5-10 minutos).
+
+ Algunos IMUs propensos a reinicios frecuentes incluyen:
+ Joy-Cons, owoTrack y MPU (sin un firmware reciente).
+settings-general-tracker_mechanics-drift_compensation_warning-cancel = Cancelar
+settings-general-tracker_mechanics-drift_compensation_warning-done = Entiendo
settings-general-tracker_mechanics-drift_compensation-amount-label = Fuerza de la compensación
settings-general-tracker_mechanics-drift_compensation-max_resets-label = Utilizar hasta los últimos x reinicios
settings-general-tracker_mechanics-save_mounting_reset = Guardar calibración automática de reinicio de montura
@@ -357,6 +395,11 @@ settings-general-tracker_mechanics-save_mounting_reset-description =
Guarda las calibraciones automáticas del reinicio de montura para los trackers entre reinicios. Útil
para cuando se usa un traje donde los trackers no se mueven entre sesiones. ¡No se recomienda para usuarios típicos!
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = Guardar reinicio de montura
+settings-general-tracker_mechanics-use_mag_on_all_trackers = Usar el magnetómetro en todos los trackers IMU que lo admitan
+settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
+ Usa el magnetómetro en todos los trackers que tienen un firmware compatible, lo que reduce la desviación en entornos magnéticos estables.
+ Se puede desactivar por sensor en la configuración del sensor. ¡Por favor, no apagues ninguno de los trackers mientras activas esta opción!
+settings-general-tracker_mechanics-use_mag_on_all_trackers-label = Usar magnetómetro en trackers
## FK/Tracking settings
@@ -454,6 +497,9 @@ settings-general-interface-dev_mode = Modo desarrollador
settings-general-interface-dev_mode-description = Este modo puede ser útil si es que necesitas información a fondo o para un nivel de interacción más avanzado con los sensores conectados.
settings-general-interface-dev_mode-label = Modo desarrollador
settings-general-interface-theme = Tema de color
+settings-general-interface-show-navbar-onboarding = Mostrar "{ navbar-onboarding }" en la barra de navegación
+settings-general-interface-show-navbar-onboarding-description = Esto cambia si el botón "{ navbar-onboarding }" se muestra en la barra de navegación.
+settings-general-interface-show-navbar-onboarding-label = Mostrar "{ navbar-onboarding }"
settings-general-interface-lang = Selecciona un idioma
settings-general-interface-lang-description = Cambia el idioma que quieras usar.
settings-general-interface-lang-placeholder = Selecciona el idioma a utilizar
@@ -465,6 +511,9 @@ settings-interface-appearance-font-os_font = Fuente del sistema operativo
settings-interface-appearance-font-slime_font = Fuente predeterminada
settings-interface-appearance-font_size = Tamaño base de la fuente
settings-interface-appearance-font_size-description = Esto afecta al tamaño de las letras en toda la interfaz excepto en este panel de ajustes.
+settings-interface-appearance-decorations = Usar las decoraciones nativas del sistema
+settings-interface-appearance-decorations-description = Esto no renderizará la barra superior de la interfaz y en cambio usará la del sistema operativo.
+settings-interface-appearance-decorations-label = Usar decoraciones nativas
## Notification settings
@@ -611,6 +660,36 @@ settings-osc-vmc-mirror_tracking = Invertir el tracking
settings-osc-vmc-mirror_tracking-description = invierte el tracking horizontalmente.
settings-osc-vmc-mirror_tracking-label = Invertir el tracking
+## Advanced settings
+
+settings-utils-advanced = Avanzado
+settings-utils-advanced-reset-gui = Reiniciar ajustes de la interfaz de usuario
+settings-utils-advanced-reset-gui-description = Restaura los ajustes por defecto de la interfaz.
+settings-utils-advanced-reset-gui-label = Reiniciar interfaz de usuario
+settings-utils-advanced-reset-server = Reiniciar los ajustes del tracking
+settings-utils-advanced-reset-server-description = Restaura los ajustes por defecto para el tracking.
+settings-utils-advanced-reset-server-label = Reiniciar tracking
+settings-utils-advanced-reset-all = Reiniciar todos los ajustes
+settings-utils-advanced-reset-all-description = Restaura los ajustes por defecto para la interfaz y el tracking.
+settings-utils-advanced-reset-all-label = Reiniciar todo
+settings-utils-advanced-reset_warning =
+ { $type ->
+ [gui]
+ Advertencia: Esto reiniciará tus ajustes de la interfaz de usuario a sus valores predeterminados.
+ ¿Estás seguro de que quieres seguir?
+ [server]
+ Advertencia: Esto reiniciará tus ajustes de seguimiento a sus valores predeterminados.
+ ¿Estás seguro de que quieres seguir?
+ *[all]
+ Advertencia: Esto reiniciará todos tus ajustes a sus valores predeterminados.
+ ¿Estás seguro de que quieres seguir?
+ }
+settings-utils-advanced-reset_warning-reset = Reiniciar ajustes
+settings-utils-advanced-reset_warning-cancel = Cancelar
+settings-utils-advanced-open_data = Carpeta de datos
+settings-utils-advanced-open_data-description = Abre la carpeta de datos de SlimeVR en el explorador de archivos, conteniendo archivos de configuración y registros.
+settings-utils-advanced-open_data-label = Abrir carpeta
+
## Setup/onboarding menu
onboarding-skip = Saltar configuración
@@ -722,6 +801,7 @@ onboarding-calibration_tutorial-status-waiting = Esperando por ti
onboarding-calibration_tutorial-status-calibrating = Calibrando
onboarding-calibration_tutorial-status-success = ¡Genial!
onboarding-calibration_tutorial-status-error = El tracker fue movido
+onboarding-calibration_tutorial-skip = Saltar tutorial
## Tracker assignment tutorial
@@ -846,11 +926,11 @@ onboarding-choose_mounting = ¿Qué método de calibración de montura quiere us
# Multiline text
onboarding-choose_mounting-description = La orientación de montura corrige la colocación (o orientación) de los trackers en tu cuerpo.
onboarding-choose_mounting-auto_mounting = Montura automática
-# Italized text
+# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = Recomendado
onboarding-choose_mounting-auto_mounting-description = Esto detectará automáticamente las direcciones de montura para todos tus trackers a partir de 2 poses
onboarding-choose_mounting-manual_mounting = Montura manual
-# Italized text
+# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = Puede que no sea lo suficientemente preciso
onboarding-choose_mounting-manual_mounting-description = Esto te permitirá elegir la dirección de montura manualmente para cada tracker.
# Multiline text
@@ -899,14 +979,14 @@ onboarding-choose_proportions-description-v1 =
Cuando las proporciones de tu cuerpo no encajan con las guardadas, la precisión de tu tracking será peor y notarás cosas como deslizamiento o desplazamiento, o tu cuerpo no encajando bien con tu avatar.
¡Solo necesitas medir tu cuerpo una vez! A menos que estén mal o tu cuerpo haya cambiado, no necesitas hacerlo de nuevo.
onboarding-choose_proportions-auto_proportions = Proporciones automáticas
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Recomendado
onboarding-choose_proportions-auto_proportions-descriptionv3 =
Esto estimará tus proporciones grabando una muestra de tus movimientos y pasándolos a través de un algoritmo.
¡Esto requiere tener tu visor (HMD) conectado a SlimeVR y en tu cabeza!
onboarding-choose_proportions-manual_proportions = Proporciones manuales
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = Para toques pequeños
onboarding-choose_proportions-manual_proportions-description = Esto te permitirá ajustar tus proporciones manualmente de forma directa
onboarding-choose_proportions-export = Exportar proporciones
@@ -986,9 +1066,10 @@ onboarding-automatic_proportions-verify_results-redo = Rehacer grabación
onboarding-automatic_proportions-verify_results-confirm = Son correctos
onboarding-automatic_proportions-done-title = Cuerpo medido y guardado.
onboarding-automatic_proportions-done-description = ¡La calibración de tus proporciones corporales fue completada!
-onboarding-automatic_proportions-error_modal =
- Atención: ¡Se ha encontrado un error durante la estimación de sus proporciones!
- Por favor fijate la documentación o únete a nuestro Discord para obtener ayuda ^_^
+onboarding-automatic_proportions-error_modal-v2 =
+ Peligro: ¡Hubo un error mientras se estimaban las proporciones!
+ Esto es posiblemente debido a un problema con la calibración de montura. Asegúrate de que tu tracking funcione adecuadamente antes de intentarlo nuevamente.
+ Por favor revisa la documentación o únete a nuestro Discord por ayuda ^_^
onboarding-automatic_proportions-error_modal-confirm = ¡Entendido!
## Home
diff --git a/gui/public/i18n/es-ES/translation.ftl b/gui/public/i18n/es-ES/translation.ftl
index 4e29ef079..a56284d7a 100644
--- a/gui/public/i18n/es-ES/translation.ftl
+++ b/gui/public/i18n/es-ES/translation.ftl
@@ -144,7 +144,6 @@ widget-developer_mode-more_info = Más información
widget-imu_visualizer = Rotación
widget-imu_visualizer-rotation_raw = Sin filtrar
widget-imu_visualizer-rotation_preview = Previsualización
-widget-imu_visualizer-rotation_hide = Ocultar
## Widget: Skeleton Visualizer
@@ -348,6 +347,7 @@ settings-general-tracker_mechanics-drift_compensation-description =
Compensa la desviación horizontal del IMU aplicando una rotación inversa.
Cambia la cantidad de compensación y de reinicios que se tienen en cuenta.
settings-general-tracker_mechanics-drift_compensation-enabled-label = Compensación en la desviación
+settings-general-tracker_mechanics-drift_compensation_warning-done = Yo entiendo
settings-general-tracker_mechanics-drift_compensation-amount-label = Cantidad de compensación
settings-general-tracker_mechanics-drift_compensation-max_resets-label = Usar los últimos X reinicios.
settings-general-tracker_mechanics-save_mounting_reset = Guardar la calibración de reajuste de montaje automático
@@ -454,6 +454,9 @@ settings-general-interface-dev_mode = Modo de desarrollador
settings-general-interface-dev_mode-description = Este modo puede ser útil si necesitas datos en profundidad o para interactuar con los trackers conectados a un nivel más avanzado
settings-general-interface-dev_mode-label = Modo de desarrollador
settings-general-interface-theme = Temas
+settings-general-interface-show-navbar-onboarding = Enseñar ''{ navbar-onboarding }" en la barra de navegación
+settings-general-interface-show-navbar-onboarding-description = Esto cambia si el botón de "{ navbar-onboarding }" enseña en la barra de navegación
+settings-general-interface-show-navbar-onboarding-label = Enseña "{ navbar-onboarding }"
settings-general-interface-lang = Seleccionar idioma
settings-general-interface-lang-description = Cambiar el idioma predeterminado que deseas utilizar.
settings-general-interface-lang-placeholder = Seleccionar el idioma que desea utilizar
@@ -465,6 +468,7 @@ settings-interface-appearance-font-os_font = Fuente SO
settings-interface-appearance-font-slime_font = Fuente predeterminada
settings-interface-appearance-font_size = Escala de la fuente base
settings-interface-appearance-font_size-description = Esto afecta al tamaño de la fuente de toda la interfaz excepto este panel de configuración
+settings-interface-appearance-decorations-label = Usar decoraciones nativos.
## Notification settings
@@ -608,6 +612,21 @@ settings-osc-vmc-mirror_tracking = Invertir el tracking
settings-osc-vmc-mirror_tracking-description = Invierte el tracking horizontalmente.
settings-osc-vmc-mirror_tracking-label = Invertir el tracking
+## Advanced settings
+
+settings-utils-advanced = Avanzado
+settings-utils-advanced-reset-gui = Restablecer configucación del GUI
+settings-utils-advanced-reset-gui-description = Restaurar la configuración predeterminado para el interfaz.
+settings-utils-advanced-reset-gui-label = Restablecer el GUI
+settings-utils-advanced-reset-server = Restablecer la configuración del tracking
+settings-utils-advanced-reset-server-description = Restaurar la configuración predeterminado para el tracking,
+settings-utils-advanced-reset-server-label = Restablecer el tracking,
+settings-utils-advanced-reset-all = Restablecer todas las configuraciónes
+settings-utils-advanced-reset-all-description = Restaurar la configuración predeterminada para el interfaz y el tracking.
+settings-utils-advanced-reset_warning-cancel = Cancelar
+settings-utils-advanced-open_data = Carpeta de datos
+settings-utils-advanced-open_data-label = Abrir carpeta
+
## Setup/onboarding menu
onboarding-skip = Omitir configuración
@@ -842,11 +861,11 @@ onboarding-choose_mounting = ¿Qué método de calibración de montura usara?
# Multiline text
onboarding-choose_mounting-description = La posición de montura corrige la colocación de los trackers en el cuerpo.
onboarding-choose_mounting-auto_mounting = Calibración de montura automatica
-# Italized text
+# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = Recomendada
onboarding-choose_mounting-auto_mounting-description = Esto detectará automáticamente la posición de montura para todos sus trackers a partir de 2 poses
onboarding-choose_mounting-manual_mounting = Calibración de montura manual
-# Italized text
+# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = Puede que no sea lo suficientemente precisa
onboarding-choose_mounting-manual_mounting-description = Esto te permitirá elegir la posición de montura para cada tracker de manera manual
# Multiline text
@@ -895,14 +914,14 @@ onboarding-choose_proportions-description-v1 =
Cuando las proporciones de tu cuerpo no coincidan con las guardadas, la precisión del tracking será peor y notarás cosas como que patinas o te deslizas, o que tu cuerpo no se ajusta bien a tu avatar.
¡Sólo necesitas medir tu cuerpo una vez! A menos que estén mal o tu cuerpo haya cambiado, entonces no necesitas volver a hacerlo.
onboarding-choose_proportions-auto_proportions = Proporciones automáticas
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Recomendado
onboarding-choose_proportions-auto_proportions-descriptionv3 =
Adivinará tus proporciones grabando una muestra de tus movimientos y pasándola por un algoritmo.
¡Esto requiere tener tu visor (HMD) conectado a SlimeVR y en tu cabeza!
onboarding-choose_proportions-manual_proportions = Proporciones manuales
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = Para pequeños retoques
onboarding-choose_proportions-manual_proportions-description = Esto te permitirá ajustar tus proporciones manualmente modificándolas directamente
onboarding-choose_proportions-export = Exportar proporciones
@@ -982,9 +1001,6 @@ onboarding-automatic_proportions-verify_results-redo = Rehacer la grabación
onboarding-automatic_proportions-verify_results-confirm = Estan correctas
onboarding-automatic_proportions-done-title = Proporciones medidas y guardadas.
onboarding-automatic_proportions-done-description = ¡Calibración de las proporciones físicas completada!
-onboarding-automatic_proportions-error_modal =
- Atención: ¡Se ha encontrado un error al estimar las proporciones!
- Por favor comprueba la documentación o únete a nuestro Discord para obtener ayuda ^_^
onboarding-automatic_proportions-error_modal-confirm = ¡Entendido!
## Home
diff --git a/gui/public/i18n/fr/translation.ftl b/gui/public/i18n/fr/translation.ftl
index dc8710fa9..a36f2f9fb 100644
--- a/gui/public/i18n/fr/translation.ftl
+++ b/gui/public/i18n/fr/translation.ftl
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = Décalage des coudes
## Tracker reset buttons
reset-reset_all = Réinitialiser toutes les proportions
+reset-reset_all_warning =
+ Avertissement: Cela réinitialisera vos proportions pour qu’elles soient basées sur votre taille.
+ Êtes-vous sûr de vouloir faire cela ?
+reset-reset_all_warning-reset = Réinitialiser les proportions
+reset-reset_all_warning-cancel = Annuler
reset-full = Réinitialisation complète
reset-mounting = Réinitialiser l'alignement
reset-yaw = Réinitialisation horizontale
@@ -126,7 +131,7 @@ widget-drift_compensation-clear = Réinitialiser la compensation de la dérive
## Widget: Clear Reset Mounting
-widget-clear_mounting = Mettre à zéro la réinitialisation de l'alignement
+widget-clear_mounting = Réinitialiser la calibration de l'alignement
## Widget: Developer settings
@@ -142,9 +147,12 @@ widget-developer_mode-more_info = Plus d'informations
## Widget: IMU Visualizer
widget-imu_visualizer = Rotation
+widget-imu_visualizer-preview = Aperçu
+widget-imu_visualizer-hide = Masquer
widget-imu_visualizer-rotation_raw = Brute
widget-imu_visualizer-rotation_preview = Aperçu
-widget-imu_visualizer-rotation_hide = Masquer
+widget-imu_visualizer-acceleration = Accélération
+widget-imu_visualizer-position = Position
## Widget: Skeleton Visualizer
@@ -199,6 +207,13 @@ tracker-infos-hardware_identifier = ID Matériel
tracker-infos-imu = Capteur IMU
tracker-infos-board_type = Carte principale
tracker-infos-network_version = Version du protocole
+tracker-infos-magnetometer = Magnétomètre
+tracker-infos-magnetometer-status-v1 =
+ { $status ->
+ [DISABLED] Désctivé
+ [ENABLED] Activé
+ *[NOT_SUPPORTED] Non pris en charge
+ }
## Tracker settings
@@ -213,11 +228,19 @@ tracker-settings-mounting_section-edit = Changer l'orientation
tracker-settings-drift_compensation_section = Permettre la compensation de la dérive
tracker-settings-drift_compensation_section-description = Ce capteur devrait-il compenser pour sa dérive quand l'option est activée ?
tracker-settings-drift_compensation_section-edit = Permettre la compensation de la dérive
+tracker-settings-use_mag = Autoriser l'utilisation du magnétomètre sur ce capteur
+# Multiline!
+tracker-settings-use_mag-description =
+ Est-ce que ce capteur utiliser son magnétomètre pour réduire la dérive lorsque l’utilisation du magnétomètre est autorisée ? N’éteignez pas votre capteur pendant que vous changez cette option !
+
+ Vous devez d’abord autoriser l’utilisation du magnétomètre dans les paramètres. Cliquez ici pour y accéder.
+tracker-settings-use_mag-label = Autoriser le magnétomètre
# The . means it's an attribute and it's related to the top key.
# In this case that is the settings for the assignment section.
tracker-settings-name_section = Nom personalisé
tracker-settings-name_section-description = Donnez-lui un joli surnom :3
tracker-settings-name_section-placeholder = Patte gauche d'Erimel
+tracker-settings-name_section-label = Nom personalisé
tracker-settings-forget = Oublier capteur
tracker-settings-forget-description = Supprime le capteur du serveur SlimeVR et l’empêche de s’y connecter jusqu’à ce que le serveur soit redémarré. La configuration du capteur ne sera pas perdue.
tracker-settings-forget-label = Oublier capteur
@@ -296,6 +319,7 @@ settings-sidebar-utils = Utilitaires
settings-sidebar-serial = Console série
settings-sidebar-appearance = Apparence
settings-sidebar-notifications = Notifications
+settings-sidebar-advanced = Avancé
## SteamVR settings
@@ -350,6 +374,20 @@ settings-general-tracker_mechanics-drift_compensation-description =
Compense la dérive des gyroscopes en appliquant une rotation inverse.
Modifier la force de la compensation et le nombre de réinitialisations prises en compte.
settings-general-tracker_mechanics-drift_compensation-enabled-label = Compensation de la dérive
+settings-general-tracker_mechanics-drift_compensation-prediction = Prédiction de la compensation de la dérive
+# This cares about multilines
+settings-general-tracker_mechanics-drift_compensation-prediction-description =
+ Prédit la compensation de la dérive au-delà de la dérive précédemment mesurée.
+ Activez cette option si vos capteurs tournent continuellement sur eux-mêmes horizontalement.
+settings-general-tracker_mechanics-drift_compensation-prediction-label = Prédiction de la compensation de la dérive
+settings-general-tracker_mechanics-drift_compensation_warning =
+ Avertissement: n’utilisez la compensation de la dérive que si vous devez
+ réinitialiser très souvent (toutes les ~5-10 minutes).
+
+ Voici quelques IMUs sujets à des réinitialisations fréquentes :
+ Joy-Cons, owoTrack et MPUs (sans firmware récent).
+settings-general-tracker_mechanics-drift_compensation_warning-cancel = Annuler
+settings-general-tracker_mechanics-drift_compensation_warning-done = Je comprends
settings-general-tracker_mechanics-drift_compensation-amount-label = Force de la compensation
settings-general-tracker_mechanics-drift_compensation-max_resets-label = Nombre de réinitialisations prises en compte
settings-general-tracker_mechanics-save_mounting_reset = Enregistrer la calibration de la réinitialisation automatique de l'alignement
@@ -357,6 +395,11 @@ settings-general-tracker_mechanics-save_mounting_reset-description =
Enregistre les calibrations des réinitialisation automatiques d'alignement pour les capteurs entre les redémarrages.
Utile lorsque vous portez une combinaison où les capteurs ne bougent pas entre les sessions. Non recommandé pour les utilisateurs normaux !
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = Enregistrer la réinitialisation de l'alignement
+settings-general-tracker_mechanics-use_mag_on_all_trackers = Utiliser le magnétomètre sur tous les capteurs IMU qui le prennent en charge
+settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
+ Utilise le magnétomètre sur tous les capteurs dotés d’un firmware compatible, réduisant ainsi la dérive dans des environnements magnétiques stables.
+ Peut être désactivé par capteur dans les paramètres du capteur. Ne fermez aucun des capteurs en changeant cette option !
+settings-general-tracker_mechanics-use_mag_on_all_trackers-label = Utiliser le magnétomètre sur les capteurs
## FK/Tracking settings
@@ -454,6 +497,9 @@ settings-general-interface-dev_mode = Mode développeur
settings-general-interface-dev_mode-description = Ce mode peut être utile pour avoir des données approfondies ou pour interagir avec des capteurs connectés à un niveau plus avancé.
settings-general-interface-dev_mode-label = Mode développeur
settings-general-interface-theme = Thème
+settings-general-interface-show-navbar-onboarding = Afficher « { navbar-onboarding } » dans la barre de navigation
+settings-general-interface-show-navbar-onboarding-description = Cela change si le bouton « { navbar-onboarding } » s’affiche dans la barre de navigation.
+settings-general-interface-show-navbar-onboarding-label = Afficher « { navbar-onboarding } »
settings-general-interface-lang = Langue
settings-general-interface-lang-description = Choisir la langue par défaut.
settings-general-interface-lang-placeholder = Langue
@@ -465,6 +511,9 @@ settings-interface-appearance-font-os_font = Police du système d’exploitation
settings-interface-appearance-font-slime_font = Police par défaut
settings-interface-appearance-font_size = Agrandissement du texte
settings-interface-appearance-font_size-description = Cela affecte la taille du texte de toute l'interface, sauf de ce menu.
+settings-interface-appearance-decorations = Utiliser les décorations natives du système
+settings-interface-appearance-decorations-description = Cela n'affichera pas la barre supérieure de l'interface et utilisera celle du système d'exploitation à la place.
+settings-interface-appearance-decorations-label = Utiliser les décorations natives
## Notification settings
@@ -610,6 +659,36 @@ settings-osc-vmc-mirror_tracking = Inverser les mouvements
settings-osc-vmc-mirror_tracking-description = Inverse les mouvements horizontalement
settings-osc-vmc-mirror_tracking-label = Inverser les mouvements
+## Advanced settings
+
+settings-utils-advanced = Avancé
+settings-utils-advanced-reset-gui = Réinitialiser les paramètres de l’interface graphique
+settings-utils-advanced-reset-gui-description = Restaurez les paramètres par défaut de l'interface.
+settings-utils-advanced-reset-gui-label = Réinitialiser l’interface graphique
+settings-utils-advanced-reset-server = Réinitialiser les paramètres de la capture
+settings-utils-advanced-reset-server-description = Restaurez les paramètres par défaut de la capture
+settings-utils-advanced-reset-server-label = Réinitialiser la capture
+settings-utils-advanced-reset-all = Réinitialiser tous les paramètres
+settings-utils-advanced-reset-all-description = Restaurez les paramètres de l'interface et de la capture.
+settings-utils-advanced-reset-all-label = Tout réinitialiser
+settings-utils-advanced-reset_warning =
+ { $type ->
+ [gui]
+ Avertissement: Cela réinitialisera vos paramètres de l'interface.
+ Êtes-vous sûr de vouloir faire cela ?
+ [server]
+ Avertissement: Cela réinitialisera vos paramètres de la capture.
+ Êtes-vous sûr de vouloir faire cela ?
+ *[all]
+ Avertissement: Cela réinitialisera tous vos paramètres.
+ Êtes-vous sûr de vouloir faire cela ?
+ }
+settings-utils-advanced-reset_warning-reset = Réinitialiser les paramètres
+settings-utils-advanced-reset_warning-cancel = Annuler
+settings-utils-advanced-open_data = Dossier des données
+settings-utils-advanced-open_data-description = Ouvre le dossier des données de SlimeVR dans l’explorateur de fichiers, contenant les fichiers de configuration ainsi que les logs.
+settings-utils-advanced-open_data-label = Ouvrir le dossier
+
## Setup/onboarding menu
onboarding-skip = Passer
@@ -721,6 +800,7 @@ onboarding-calibration_tutorial-status-waiting = En attente de vous
onboarding-calibration_tutorial-status-calibrating = Calibration...
onboarding-calibration_tutorial-status-success = Génial !
onboarding-calibration_tutorial-status-error = Le capteur a été déplacé
+onboarding-calibration_tutorial-skip = Sauter le tutoriel
## Tracker assignment tutorial
@@ -844,11 +924,11 @@ onboarding-choose_mounting = Quelle méthode de calibration de l’alignement ut
# Multiline text
onboarding-choose_mounting-description = La calibration de l'alignement ajuste pour l'orientation des capteurs sur votre corps.
onboarding-choose_mounting-auto_mounting = Alignement automatique
-# Italized text
+# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = Recommendée
onboarding-choose_mounting-auto_mounting-description = Ceci permettra de détecter automatiquement la direction de tous vos capteurs à partir de 2 poses
onboarding-choose_mounting-manual_mounting = Alignement manuel
-# Italized text
+# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = Peut manquer de précision
onboarding-choose_mounting-manual_mounting-description = Ceci vous permettra de choisir la direction de chaque capteur manuellement
# Multiline text
@@ -897,14 +977,14 @@ onboarding-choose_proportions-description-v1 =
Lorsque les proportions de votre corps ne correspondent pas à celles enregistrées, la précision du suivi sera moins bonne et vous remarquerez certains problèmes comme du patinage ou de la glisse, ou votre corps ne correspondra pas bien à votre avatar.
Vous n’avez besoin de mesurer les proportions de votre corps qu’une seule fois ! À moins qu’elle ne soient incorrectes ou que votre corps ait changé, vous n’avez pas besoin de les refaire.
onboarding-choose_proportions-auto_proportions = Proportions automatiques
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Recommendée
onboarding-choose_proportions-auto_proportions-descriptionv3 =
Cela permettra d'estimer vos proportions en enregistrant un échantillon de vos mouvements et en le faisant passer par un algorithme.
Cela nécessite d’avoir votre casque VR connecté à SlimeVR et sur votre tête !
onboarding-choose_proportions-manual_proportions = Proportions manuelles
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = Pour les retouches
onboarding-choose_proportions-manual_proportions-description = Ceci vous permettra d'ajuster vos proportions manuellement en les modifiant directement
onboarding-choose_proportions-export = Exporter les proportions
@@ -984,9 +1064,10 @@ onboarding-automatic_proportions-verify_results-redo = Refaire l'enregistrement
onboarding-automatic_proportions-verify_results-confirm = Les résultats sont corrects
onboarding-automatic_proportions-done-title = Calibration terminée
onboarding-automatic_proportions-done-description = La calibration de vos proportions est terminée !
-onboarding-automatic_proportions-error_modal =
- Avertissement : Une erreur a été détectée lors de l’estimation des proportions !
- Veuillez consulter la documentation ou rejoindre notre Discord pour obtenir de l’aide ^_^
+onboarding-automatic_proportions-error_modal-v2 =
+ Avertissement: Il y a eu une erreur lors de l’estimation des proportions !
+ Il s’agit probablement d’un problème avec la calibration de l'alignement. Assurez-vous que votre capture des mouvements fonctionne correctement avant de réessayer.
+ Veuillez consulter la documentation ou rejoindre notre Discord pour obtenir de l’aide ^_^
onboarding-automatic_proportions-error_modal-confirm = Compris !
## Home
diff --git a/gui/public/i18n/ko/translation.ftl b/gui/public/i18n/ko/translation.ftl
index d02fe7893..3fe3711a9 100644
--- a/gui/public/i18n/ko/translation.ftl
+++ b/gui/public/i18n/ko/translation.ftl
@@ -19,7 +19,7 @@ version_update-close = 닫기
## Tips
-tips-find_tracker = 어떤 트래커가 어디에 대응되는지 모르겠나요? 트래커를 흔들면 해당 트래커에 해당되는 항목이 강조 표시됩니다.
+tips-find_tracker = 어떤 트래커가 어디에 대응되는지 모르겠나요? 트래커를 흔들면 해당 트래커에 해당되는 항목이 강조 표시돼요.
tips-do_not_move_heels = 기록하는 동안 발뒤꿈치가 움직이지 않도록 조심하세요!
tips-file_select = 파일을 열거나, 여기에 드래그&드롭하세요.
tips-tap_setup = 목록에서 트래커를 선택하는 대신 트래커를 천천히 2번 탭해서 선택할 수 있어요.
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = 팔꿈치 오프셋
## Tracker reset buttons
reset-reset_all = 모든 신체 비율 초기화
+reset-reset_all_warning =
+ 경고: 이렇게 하면 지금까지 변경한 신체 비율 설정이 사라지고 설정했던 키를 기반으로 초기화돼요.
+ 계속하시겠어요?
+reset-reset_all_warning-reset = 신체 비율 초기화
+reset-reset_all_warning-cancel = 취소
reset-full = 전체 정렬
reset-mounting = 착용 방향 정렬
reset-yaw = Yaw 정렬
@@ -142,9 +147,12 @@ widget-developer_mode-more_info = 더 많은 정보 보기
## Widget: IMU Visualizer
widget-imu_visualizer = 회전
+widget-imu_visualizer-preview = 미리보기
+widget-imu_visualizer-hide = 숨기기
widget-imu_visualizer-rotation_raw = Raw
widget-imu_visualizer-rotation_preview = 미리보기
-widget-imu_visualizer-rotation_hide = 숨기기
+widget-imu_visualizer-acceleration = 가속도
+widget-imu_visualizer-position = 위치
## Widget: Skeleton Visualizer
@@ -199,6 +207,13 @@ tracker-infos-hardware_identifier = 하드웨어 ID
tracker-infos-imu = IMU 센서
tracker-infos-board_type = 메인보드
tracker-infos-network_version = 프로토콜 버전
+tracker-infos-magnetometer = 자력계
+tracker-infos-magnetometer-status-v1 =
+ { $status ->
+ [DISABLED] 비활성화됨
+ [ENABLED] 활성화됨
+ *[NOT_SUPPORTED] 지원되지 않음
+ }
## Tracker settings
@@ -213,11 +228,19 @@ tracker-settings-mounting_section-edit = 방향 수정
tracker-settings-drift_compensation_section = 틀어짐 보정 사용
tracker-settings-drift_compensation_section-description = 틀어짐 보정이 켜져 있을 때 이 트래커의 틀어짐을 보정할까요?
tracker-settings-drift_compensation_section-edit = 틀어짐 보정 사용
+tracker-settings-use_mag = 이 트래커에서 자력계 활성화하기
+# Multiline!
+tracker-settings-use_mag-description =
+ 이 트래커는 자력계 사용이 허용될 때 드리프트를 줄이기 위해 자력계를 사용해야 합니까? 이것을 토글하는 동안 트래커를 종료하지 마십시오!
+
+ 먼저 자력계를 사용하도록 설정한 다음, 여기를 클릭하여 설정으로 이동하세요.
+tracker-settings-use_mag-label = 자력계 활성화
# The . means it's an attribute and it's related to the top key.
# In this case that is the settings for the assignment section.
tracker-settings-name_section = 트래커 이름
tracker-settings-name_section-description = 귀여운 이름을 지어주세요! >_<
tracker-settings-name_section-placeholder = NightyBeast's left leg
+tracker-settings-name_section-label = 트래커 이름
tracker-settings-forget = 트래커 삭제
tracker-settings-forget-description = SlimeVR 서버에서 트래커를 제거하고 서버를 다시 시작할 때까지 자동으로 연결하지 않아요. 트래커의 설정은 지워지지 않아요.
tracker-settings-forget-label = 트래커 삭제
@@ -296,6 +319,7 @@ settings-sidebar-utils = 유틸리티
settings-sidebar-serial = 시리얼 콘솔
settings-sidebar-appearance = 모양
settings-sidebar-notifications = 알림
+settings-sidebar-advanced = 고급
## SteamVR settings
@@ -343,20 +367,38 @@ settings-general-tracker_mechanics-filtering-type-smoothing-description = 움직
settings-general-tracker_mechanics-filtering-type-prediction = Prediction
settings-general-tracker_mechanics-filtering-type-prediction-description = 대기 시간이 줄어들고 움직임이 더 빨라지지만 지터가 증가할 수 있어요.
settings-general-tracker_mechanics-filtering-amount = 강도
-settings-general-tracker_mechanics-yaw-reset-smooth-time = 부드러운 Yaw 리셋 작용 시간 (0초는 부드러운 Yaw 리셋을 비활성화 합니다)
+settings-general-tracker_mechanics-yaw-reset-smooth-time = Yaw 정렬할 때 부드럽게 움직이는 시간 (비활성화: 0초)
settings-general-tracker_mechanics-drift_compensation = 틀어짐 보정
# This cares about multilines
settings-general-tracker_mechanics-drift_compensation-description =
틀어지는 방향의 반대 방향으로 회전해서 IMU Yaw 드리프트를 보정할 수 있어요.
보정하는 강도와 감지할 최근 정렬 횟수를 설정할 수 있어요.
settings-general-tracker_mechanics-drift_compensation-enabled-label = 틀어짐 보정
+settings-general-tracker_mechanics-drift_compensation-prediction = 틀어짐 보정 예측
+# This cares about multilines
+settings-general-tracker_mechanics-drift_compensation-prediction-description =
+ 점점 심하게 틀어지는 트래커의 틀어짐 방향을 예측해요.
+ 틀어짐 보정을 사용해도 트래커가 Yaw 축에서 계속 틀어지면 이 옵션을 켜세요.
+settings-general-tracker_mechanics-drift_compensation-prediction-label = 예측해서 틀어짐 보정하기
+settings-general-tracker_mechanics-drift_compensation_warning =
+ 경고: 트래커를 지나치게 자주 정렬해야 하는 경우에만 틀어짐 보정을 사용하세요 (5~10분마다).
+
+ Joy-Con, owoTrack 및 MPU 시리즈 IMU(최신 펌웨어 제외)
+ 등과 같은 트래커들이 해당합니다.
+settings-general-tracker_mechanics-drift_compensation_warning-cancel = 취소
+settings-general-tracker_mechanics-drift_compensation_warning-done = 이해했어요
settings-general-tracker_mechanics-drift_compensation-amount-label = 보정 강도
settings-general-tracker_mechanics-drift_compensation-max_resets-label = 보정에 사용할 최근 정렬 횟수
settings-general-tracker_mechanics-save_mounting_reset = 자동 착용 방향 정렬 보정값 저장
settings-general-tracker_mechanics-save_mounting_reset-description =
- 트래커의 자동 마운팅 리셋 보정값을 저장합니다. 트래커들의 위치가 고정된
- 모션 캡처 슈트 같은 것을 사용할 때 유용합니다. 일반 사용자들에게는 권장되지 않아요!
+ 트래커의 착용 방향 정렬 보정값을 저장합니다. 트래커들의 위치가 고정된
+ 모션 캡처 슈트 같은 것을 사용할 때 유용해요. 일반 사용자들에게는 권장되지 않아요!
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = 착용 방향 정렬 저장
+settings-general-tracker_mechanics-use_mag_on_all_trackers = 자력계를 지원하는 모든 IMU 트래커에서 자력계 활성화
+settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
+ 호환 가능한 펌웨어가 있는 모든 트래커에서 자력계를 사용하여 안정적인 자기 환경에서 틀어짐을 줄일 수 있어요.
+ 트래커의 설정에서 트래커별로 비활성화할 수 있어요. 이 기능을 토글하는 동안 트래커를 종료하지 마세요!
+settings-general-tracker_mechanics-use_mag_on_all_trackers-label = 트래커에서 자력계 사용하기
## FK/Tracking settings
@@ -449,6 +491,9 @@ settings-general-interface-dev_mode = 개발자 모드
settings-general-interface-dev_mode-description = 이 모드는 더 많은 데이터가 필요하거나 고급 수준에서 연결된 트래커와 상호 작용하는 경우에 유용할 수 있어요.
settings-general-interface-dev_mode-label = 개발자 모드
settings-general-interface-theme = 컬러 테마
+settings-general-interface-show-navbar-onboarding = 내비게이션 바에 "{ navbar-onboarding }" 표시
+settings-general-interface-show-navbar-onboarding-description = 이 설정은 내비게이션 바에 "{ navbar-onboarding }" 버튼을 표시할 지 결정해요.
+settings-general-interface-show-navbar-onboarding-label = "{ navbar-onboarding }" 보이기
settings-general-interface-lang = 언어 선택
settings-general-interface-lang-description = 사용하고 싶은 기본 언어를 선택하세요.
settings-general-interface-lang-placeholder = 사용할 언어를 선택하세요
@@ -460,6 +505,9 @@ settings-interface-appearance-font-os_font = OS 글꼴
settings-interface-appearance-font-slime_font = 기본 글꼴
settings-interface-appearance-font_size = 글꼴 크기 조정
settings-interface-appearance-font_size-description = 변경하면 이 설정 패널을 제외하고 모든 인터페이스의 글꼴 크기가 달라져요.
+settings-interface-appearance-decorations = 인터페이스
+settings-interface-appearance-decorations-description = 상단바 인터페이스를 자체적으로 랜더링하는 대신 시스템의 기본 인터페이스를 유지하기
+settings-interface-appearance-decorations-label = 시스템 기본 인터페이스 사용
## Notification settings
@@ -602,6 +650,30 @@ settings-osc-vmc-mirror_tracking = 움직임 좌우 반전
settings-osc-vmc-mirror_tracking-description = 움직임을 수평 방향으로 반전시킵니다.
settings-osc-vmc-mirror_tracking-label = 움직임 좌우 반전
+## Advanced settings
+
+settings-utils-advanced = 고급
+settings-utils-advanced-reset-gui = GUI 설정 초기화하기
+settings-utils-advanced-reset-gui-description = 인터페이스 관련 설정을 원래대로 되돌려요.
+settings-utils-advanced-reset-gui-label = GUI 설정 초기화
+settings-utils-advanced-reset-server = 트래킹 설정 초기화하기
+settings-utils-advanced-reset-server-description = 트래킹 관련 설정을 원래대로 되돌려요.
+settings-utils-advanced-reset-server-label = 트래킹 설정 초기화
+settings-utils-advanced-reset-all = 모든 설정 초기화하기
+settings-utils-advanced-reset-all-description = 인터페이스와 트래킹 설정을 모두 원래대로 되돌려요.
+settings-utils-advanced-reset-all-label = 모든 설정 초기화
+settings-utils-advanced-reset_warning =
+ { $type ->
+ [gui] 경고: 이렇게 하면 화면 표시와 관련된 모든 설정이 초기화돼요. 계속하시겠어요?
+ [server] 경고: 이렇게 하면 화면 트래커의 움직임에 관한 모든 설정이 초기화돼요. 계속하시겠어요?
+ *[all] 경고: 이렇게 하면 지금까지 변경한 모든 설정이 초기화돼요. 계속하시겠어요?
+ }
+settings-utils-advanced-reset_warning-reset = 설정 초기화
+settings-utils-advanced-reset_warning-cancel = 취소
+settings-utils-advanced-open_data = 데이터 폴더 열기
+settings-utils-advanced-open_data-description = 설정 파일과 로그 파일이 들어 있는 SlimeVR의 데이터 폴더를 파일 탐색기에서 엽니다.
+settings-utils-advanced-open_data-label = 폴더 열기
+
## Setup/onboarding menu
onboarding-skip = 설정 건너뛰기
@@ -712,6 +784,7 @@ onboarding-calibration_tutorial-status-waiting = 대기 중
onboarding-calibration_tutorial-status-calibrating = 보정 중
onboarding-calibration_tutorial-status-success = 좋아요!
onboarding-calibration_tutorial-status-error = 트래커가 움직였습니다
+onboarding-calibration_tutorial-skip = 튜토리얼 건너뛰기
## Tracker assignment tutorial
@@ -720,7 +793,7 @@ onboarding-assignment_tutorial-first_step = 1. 신체 부위가 적힌 스티커
# This text has a character limit of around 11 characters, so please keep it short
onboarding-assignment_tutorial-sticker = 스티커
onboarding-assignment_tutorial-second_step-v2 = 2. 스트랩을 트래커에 장착하되, 벨크로 접착면이 트래커의 Slime 얼굴과 같은 방향을 바라보도록 해 주세요:
-onboarding-assignment_tutorial-second_step-continuation-v2 = 확장 모듈의 벨크로 접착면이 다음 이미지처럼 위를 바라봐야 합니다:
+onboarding-assignment_tutorial-second_step-continuation-v2 = 확장 모듈의 벨크로 접착면이 다음 이미지처럼 위를 향하게 해 주세요:
onboarding-assignment_tutorial-done = 스트랩과 스티커를 트래커에 잘 부착했어요!
## Tracker assignment setup
@@ -827,11 +900,11 @@ onboarding-choose_mounting = 착용 방향 보정을 위해 어떤 방법을 사
# Multiline text
onboarding-choose_mounting-description = 착용 방향 정렬은 트래커가 몸에 착용된 방향을 찾아 수정하도록 도와줘요.
onboarding-choose_mounting-auto_mounting = 자동으로 방향 설정
-# Italized text
+# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = 권장됨
onboarding-choose_mounting-auto_mounting-description = 이렇게 하면 2가지 자세로 모든 트래커의 착용 방향을 자동으로 설정할 수 있어요
onboarding-choose_mounting-manual_mounting = 수동으로 방향 설정
-# Italized text
+# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = 정확하지 않을 수도 있어요
onboarding-choose_mounting-manual_mounting-description = 이렇게 하면 각 트래커의 착용 방향을 직접 고를 수 있어요
# Multiline text
@@ -878,13 +951,13 @@ onboarding-choose_proportions-description-v1 =
설정된 신체 비율과 실제 신체 비율이 다를 경우, 트래킹 정확도가 훨씬 낮아질 수 있으며 사용 중 스케이팅, 슬라이딩, 또는 아바타와 신체 동작이 일치하지 않게 되는 경우가 발생할 수 있어요.
신체 비율 측정은 한 번이면 충분해요! 측정치가 부정확하거나 신체 비율이 달라진 경우를 제외하고는 다시 측정할 필요가 없어요.
onboarding-choose_proportions-auto_proportions = 자동으로 비율 설정
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = 권장
onboarding-choose_proportions-auto_proportions-descriptionv3 =
몸을 이리저리 움직여 샘플을 기록한 다음 알고리즘을 통해 연산하는 방식으로 신체 비율을 추산합니다.
사용하기 위해서는 VR 헤드셋이 SlimeVR과 연결되어 있어야 해요
onboarding-choose_proportions-manual_proportions = 수동으로 비율 설정
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = 정밀하게 설정하고 싶다면
onboarding-choose_proportions-manual_proportions-description = 이 옵션을 사용하면 신체 비율을 직접 입력해 수동으로 조절할 수 있어요.
onboarding-choose_proportions-export = 다른 이름으로 저장
@@ -963,9 +1036,10 @@ onboarding-automatic_proportions-verify_results-redo = 다시 기록하기
onboarding-automatic_proportions-verify_results-confirm = 정확해요!
onboarding-automatic_proportions-done-title = 몸을 측정하고 저장했어요
onboarding-automatic_proportions-done-description = 신체 비율 보정이 완료되었어요!
-onboarding-automatic_proportions-error_modal =
- 경고: 신체 비율을 계산하는 동안 오류가 발생했습니다!
- 도움말을 확인하거나 디스코드 서버에서 도움을 받으세요 ^_^
+onboarding-automatic_proportions-error_modal-v2 =
+ 경고: 신체 비율을 추정하는 동안 오류가 발생했어요..!
+ 이는 착용 방향 정렬 문제일 수 있어요. 다시 시도하기 전에 추적이 제대로 작동하는지 확인해보세요.
+ 설명서를 읽어보거나 Discord 서버에 가입해서 도와달라고 해 보세요! ^_^
onboarding-automatic_proportions-error_modal-confirm = 이해했어요!
## Home
diff --git a/gui/public/i18n/pl/translation.ftl b/gui/public/i18n/pl/translation.ftl
index 539a1d3bc..0d351b66a 100644
--- a/gui/public/i18n/pl/translation.ftl
+++ b/gui/public/i18n/pl/translation.ftl
@@ -206,7 +206,7 @@ tracker-settings-back = Wróć do listy trackerów
tracker-settings-title = Ustawienia Trackerów
tracker-settings-assignment_section = Przydzielanie
tracker-settings-assignment_section-description = Do jakiej części ciała przydzielony jest tracker.
-tracker-settings-assignment_section-edit = Edytuj
+tracker-settings-assignment_section-edit = Edytuj przypisanie
tracker-settings-mounting_section = Położenie Trackera
tracker-settings-mounting_section-description = Gdzie zamontowany jest tracker?
tracker-settings-mounting_section-edit = Edytuj
@@ -247,8 +247,8 @@ tracker_selection_menu-NONE = Któremu trackerowi chcesz cofnąć przypisanie?
tracker_selection_menu-HEAD = { -tracker_selection-part } głowa?
tracker_selection_menu-NECK = { -tracker_selection-part } szyja?
tracker_selection_menu-RIGHT_SHOULDER = { -tracker_selection-part } prawe ramię?
-tracker_selection_menu-RIGHT_UPPER_ARM = { -tracker_selection-part } right upper arm?
-tracker_selection_menu-RIGHT_LOWER_ARM = { -tracker_selection-part } right lower arm?
+tracker_selection_menu-RIGHT_UPPER_ARM = { -tracker_selection-part } prawe ramię?
+tracker_selection_menu-RIGHT_LOWER_ARM = { -tracker_selection-part }prawe przedramię?
tracker_selection_menu-RIGHT_HAND = { -tracker_selection-part } prawa ręka?
tracker_selection_menu-RIGHT_UPPER_LEG = { -tracker_selection-part } prawe udo?
tracker_selection_menu-RIGHT_LOWER_LEG = { -tracker_selection-part } prawa kostka?
@@ -287,20 +287,20 @@ mounting_selection_menu-close = Zamknij
settings-sidebar-title = Ustawienia
settings-sidebar-general = Ogólne
settings-sidebar-tracker_mechanics = Mechanika trackerów
-settings-sidebar-fk_settings = FK settings
+settings-sidebar-fk_settings = Ustawienia śledzenia
settings-sidebar-gesture_control = Sterowanie gestami
settings-sidebar-interface = Interfejs
settings-sidebar-osc_router = OSC router
settings-sidebar-osc_trackers = Śledzenie VRChat OSC
settings-sidebar-utils = Narzędzia
-settings-sidebar-serial = Konsola Seryjna
+settings-sidebar-serial = Konsola szeregowa
settings-sidebar-appearance = Wygląd
settings-sidebar-notifications = Powiadomienia
## SteamVR settings
settings-general-steamvr = SteamVR
-settings-general-steamvr-subtitle = SteamVR trackers
+settings-general-steamvr-subtitle = Trackery SteamVR
# Not all translation keys support multiline, only the ones that specify it will actually
# split it in lines (that also means you can split in lines however you want in those).
# The first spaces (not tabs) for indentation will be ignored, just to make the file look nice when writing.
@@ -318,7 +318,7 @@ settings-general-steamvr-trackers-left_elbow = Lewy łokieć
settings-general-steamvr-trackers-right_elbow = Prawy łokieć
settings-general-steamvr-trackers-left_hand = Lewa dłoń
settings-general-steamvr-trackers-right_hand = Prawa dłoń
-settings-general-steamvr-trackers-tracker_toggling = Automatyczne przypisanie wirtualnych trackerów
+settings-general-steamvr-trackers-tracker_toggling = Automatyczne przypisanie trackerów
settings-general-steamvr-trackers-tracker_toggling-description = Automatycznie obsługuje włączanie i wyłączanie wirtualnych trackerów SteamVR w zależności od bieżących przypisań fizycznych trackerów
settings-general-steamvr-trackers-tracker_toggling-label = Automatyczne przypisanie wirtualnych trackerów SteamVR
settings-general-steamvr-trackers-hands-warning =
@@ -350,7 +350,7 @@ settings-general-tracker_mechanics-drift_compensation-description =
Kompensuje dryf odchylenia IMU poprzez zastosowanie odwrotnej rotacji.
Zmień wysokość kompensacji i do ilu resetów jest branych pod uwagę.
settings-general-tracker_mechanics-drift_compensation-enabled-label = Kompensacja dryfu
-settings-general-tracker_mechanics-drift_compensation-amount-label = Compensation amount
+settings-general-tracker_mechanics-drift_compensation-amount-label = Ilość kompensacji
settings-general-tracker_mechanics-drift_compensation-max_resets-label = Użyj maksymalnie x ostatnich resetów
settings-general-tracker_mechanics-save_mounting_reset = Zapisz pozycję trackerów na ciele
settings-general-tracker_mechanics-save_mounting_reset-description =
@@ -383,6 +383,9 @@ settings-general-fk_settings-leg_fk-reset_mounting_feet = Reset mocowania stóp
settings-general-fk_settings-arm_fk = Śledzenie ramienia
settings-general-fk_settings-arm_fk-description = Zmień sposób śledzenia ramion.
settings-general-fk_settings-arm_fk-force_arms = Śledź ramiona z gogli VR
+settings-general-fk_settings-reset_settings = Zresetuj ustawienia
+settings-general-fk_settings-reset_settings-reset_hmd_pitch-description = Resetuj kąt nachylenia headsetu (rotacja pionowa) podczas pełnego resetu. Przydatne, jeśli nosisz headset na czole do VTubingu lub mocapu. Nie włączaj do VR.
+settings-general-fk_settings-reset_settings-reset_hmd_pitch = Resetuj kąt nachylenia headsetu
settings-general-fk_settings-arm_fk-reset_mode-description = Zmień pozycję ramienia oczekiwaną przy resetowaniu montażu.
settings-general-fk_settings-arm_fk-back = Wstecz
settings-general-fk_settings-arm_fk-back-description = Tryb domyślny, w którym górne ramiona cofają się, a dolne ramiona przesuwają się do przodu.
@@ -397,7 +400,7 @@ settings-general-fk_settings-skeleton_settings-description = Włącz lub wyłąc
settings-general-fk_settings-skeleton_settings-extended_spine_model = Wydłużony model kręgosłupa
settings-general-fk_settings-skeleton_settings-extended_pelvis_model = Rozszerzony model miednicy
settings-general-fk_settings-skeleton_settings-extended_knees_model = Model z przedłużonym kolanem
-settings-general-fk_settings-skeleton_settings-ratios = Współczynniki szkieletu
+settings-general-fk_settings-skeleton_settings-ratios = Proporcje szkieletu
settings-general-fk_settings-skeleton_settings-ratios-description = Zmień wartości ustawień szkieletu. Po zmianie może być konieczne dostosowanie proporcji.
settings-general-fk_settings-skeleton_settings-impute_waist_from_chest_hip = Przypisz talię od klatki piersiowej do bioder
settings-general-fk_settings-skeleton_settings-impute_waist_from_chest_legs = Przypisz talię od klatki piersiowej do nóg
@@ -415,16 +418,16 @@ settings-general-fk_settings-vive_emulation-label = Włącz emulację Vive
## Gesture control settings (tracker tapping)
settings-general-gesture_control = Kontrola Gestami
-settings-general-gesture_control-subtitle = Dotknij 2 razy by wykonać szybki reset
+settings-general-gesture_control-subtitle = Resetowanie na podstawie stuknięć
settings-general-gesture_control-description = Umożliwia wyzwalanie resetów przez stuknięcie modułu śledzącego. Układ śledzący znajdujący się najwyżej na tułowiu służy do resetowania odchylenia, układ śledzący znajdujący się najwyżej na lewej nodze służy do pełnego resetu, a układ śledzący znajdujący się najwyżej na prawej nodze służy do resetowania montażu. Należy wspomnieć, że stuknięcia muszą nastąpić w ciągu 0,6 sekundy, aby zostały zarejestrowane.
# 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 ->
- [one] 1 dotknięcie
- [few] { $amount } dotknięcia
- [many] { $amount } dotknięć
- *[other] { $amount } dotknięć
+ [one] 1 stuknięcie
+ [few] { $amount } stuknięcia
+ [many] { $amount } stuknięć
+ *[other] { $amount } stuknięć
}
# This is a unit: 3 trackers, 2 trackers, 1 tracker
# $amount (Number) - Amount of trackers
@@ -437,10 +440,10 @@ settings-general-gesture_control-trackers =
}
settings-general-gesture_control-yawResetEnabled = Włącz stuknięcie, aby zresetować odchylanie
settings-general-gesture_control-yawResetDelay = Opóźnienie resetowania odchylenia
-settings-general-gesture_control-yawResetTaps = Stuknięcie do resetowania odchylenia
+settings-general-gesture_control-yawResetTaps = Stuknięć do zresetowania odchylenia
settings-general-gesture_control-fullResetEnabled = Włącz stuknięcie, aby całkowicie zresetować
settings-general-gesture_control-fullResetDelay = Pełne opóźnienie resetu
-settings-general-gesture_control-fullResetTaps = Stuknij do pełnego resetu
+settings-general-gesture_control-fullResetTaps = Stuknięć do pełnego resetu
settings-general-gesture_control-mountingResetEnabled = Włącz stuknięcie, aby zresetować położenie
settings-general-gesture_control-mountingResetDelay = Opóźnienie resetowania położenia
settings-general-gesture_control-mountingResetTaps = Stuknięcie do resetowania położenia
@@ -457,14 +460,14 @@ settings-general-interface-dev_mode-label = Tryb Dewelopera
settings-general-interface-theme = Motyw kolorystyczny
settings-general-interface-lang = Wybierz Język
settings-general-interface-lang-description = Zmień podstawowy język jaki chcesz używać
-settings-general-interface-lang-placeholder = Wybierz Język który będziesz używać
+settings-general-interface-lang-placeholder = Wybierz język, który będziesz używać
# Keep the font name untranslated
settings-interface-appearance-font = Czcionka interfejsu użytkownika
settings-interface-appearance-font-description = Spowoduje to zmianę czcionki używanej przez interfejs
settings-interface-appearance-font-placeholder = Domyślna czcionka
settings-interface-appearance-font-os_font = Czcionka systemu operacyjnego
settings-interface-appearance-font-slime_font = Domyślna czcionka
-settings-interface-appearance-font_size = Skalowanie czcionki bazowej
+settings-interface-appearance-font_size = Skalowanie czcionki
settings-interface-appearance-font_size-description = Wpływa to na rozmiar czcionki całego interfejsu z wyjątkiem tego panelu ustawień
## Notification settings
@@ -476,7 +479,7 @@ settings-general-interface-serial_detection-label = Wykrywanie urządzeń
settings-general-interface-feedback_sound = Dźwięk zwrotny
settings-general-interface-feedback_sound-description = Ta opcja odtworzy dźwięk, gdy reset zostanie uruchomiony
settings-general-interface-feedback_sound-label = Dźwięk Informacji
-settings-general-interface-feedback_sound-volume = Poziom głośności sprzężenia zwrotnego
+settings-general-interface-feedback_sound-volume = Poziom głośności dzwięku zwrotnego
settings-general-interface-connected_trackers_warning = Ostrzeżenie o podłączonych trackerach
settings-general-interface-connected_trackers_warning-description = Ta opcja wyświetli wyskakujące okienko za każdym razem, gdy spróbujesz wyjść ze SlimeVR, mając jeden lub więcej podłączonych trackerów. Przypomina o wyłączeniu trackerów, gdy skończysz, aby wydłużyć żywotność baterii.
settings-general-interface-connected_trackers_warning-label = Ostrzeżenie o podłączonych trackerach przy wyjściu
@@ -486,6 +489,13 @@ settings-general-interface-use_tray-label = Minimalizuj do zasobnika systemowego
settings-general-interface-discord_presence = Udostępniaj aktywność na Discordzie
settings-general-interface-discord_presence-description = Informuje Twojego klienta Discord o korzystaniu ze SlimeVR oraz o liczbie używanych trackerów IMU.
settings-general-interface-discord_presence-label = Udostępniaj aktywność na Discordzie
+settings-general-interface-discord_presence-message =
+ { $amount ->
+ [0] Brak trackerów
+ [one] Użwanie 1 trackera
+ [few] Używanie { $amount } trackerów
+ *[many] Używanie { $amount } trackerów
+ }
## Serial settings
@@ -543,6 +553,7 @@ settings-osc-vrchat-enable = Zezwól
settings-osc-vrchat-enable-description = Zezwól na wysyłanie i odbieranie danych.
settings-osc-vrchat-enable-label = Zezwól
settings-osc-vrchat-network = Porty sieciowe
+settings-osc-vrchat-network-description-v1 = Ustaw porty do odbierania i wysyłania danych. Nie trzeba tego zmieniać dla VRChata.
settings-osc-vrchat-network-port_in =
.label = Port In
.placeholder = Port in (default: 9001)
@@ -550,6 +561,7 @@ settings-osc-vrchat-network-port_out =
.label = Port Out
.placeholder = Port out (default: 9000)
settings-osc-vrchat-network-address = Adres sieciowy
+settings-osc-vrchat-network-address-description-v1 = Wybierz adres, na który mają być wysyłane dane. Można pozostawić domyślnie dla VRChata.
settings-osc-vrchat-network-address-placeholder = Adres IP VRChata
settings-osc-vrchat-network-trackers = Trackers
settings-osc-vrchat-network-trackers-description = Przełącz wysyłanie określonych trackerów przez OSC.
@@ -592,6 +604,9 @@ settings-osc-vmc-vrm-file_select = Przeciągnij i upuść model, którego chcesz
settings-osc-vmc-anchor_hip = Blokada na biodrach
settings-osc-vmc-anchor_hip-description = Zablokuj śledzenie na biodrach, przydatne podczas siedzenia VTubing. W przypadku wyłączenia załaduj model VRM.
settings-osc-vmc-anchor_hip-label = Blokada na biodrach
+settings-osc-vmc-mirror_tracking = Odbicie lustrzane śledzenia
+settings-osc-vmc-mirror_tracking-description = Odbij śledzenie w poziomie.
+settings-osc-vmc-mirror_tracking-label = Odbicie lustrzane śledzenia
## Setup/onboarding menu
@@ -735,6 +750,12 @@ onboarding-assign_trackers-assigned =
onboarding-assign_trackers-advanced = Pokaż zaawansowane ustawienia pozycji
onboarding-assign_trackers-next = Przydzieliłem już wszystkie trackery
onboarding-assign_trackers-mirror_view = Widok lustrzany
+onboarding-assign_trackers-option-amount =
+ { $trackersCount ->
+ [one] x{ $trackersCount }
+ [few] x{ $trackersCount }
+ *[many] x{ $trackersCount }
+ }
onboarding-assign_trackers-option-label =
{ $mode ->
[lower-body] Zestaw na dolną część ciała
@@ -830,6 +851,8 @@ onboarding-choose_mounting-auto_mounting = Automatyczne mocowanie
onboarding-choose_mounting-auto_mounting-label-v2 = Zalecane
onboarding-choose_mounting-auto_mounting-description = To automatycznie wykryje kierunki montażu dla wszystkich twoich trackerów z 2 pozycji
onboarding-choose_mounting-manual_mounting = Montaż ręczny
+# Italized text
+onboarding-choose_mounting-manual_mounting-label-v2 = Może nie być wystarczająco dokładne
onboarding-choose_mounting-manual_mounting-description = Umożliwi to ręczne wybranie kierunku montażu dla każdego trackera
# Multiline text
onboarding-choose_mounting-manual_modal-title =
@@ -973,7 +996,7 @@ onboarding-automatic_proportions-error_modal-confirm = Zrozumiano!
## Home
-home-no_trackers = Nie wykryto trackerów
+home-no_trackers = Nie wykryto ani nie przypisano żadnych trackerów
## Trackers Still On notification
diff --git a/gui/public/i18n/pt-BR/translation.ftl b/gui/public/i18n/pt-BR/translation.ftl
index 85eb83635..729e59870 100644
--- a/gui/public/i18n/pt-BR/translation.ftl
+++ b/gui/public/i18n/pt-BR/translation.ftl
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = Compensação do Cotovelo
## Tracker reset buttons
reset-reset_all = Redefinir todas as proporções
+reset-reset_all_warning =
+ Aviso: Isso irá resetar suas proporções para serem baseadas apenas em sua altura.
+ Você tem certeza que deseja fazer isso?
+reset-reset_all_warning-reset = Resetar proporções
+reset-reset_all_warning-cancel = Cancelar
reset-full = Reset Completo
reset-mounting = Reset de Posição
reset-yaw = Reset de guinada (yaw)
@@ -111,8 +116,8 @@ bvh-recording = Gravando...
## Tracking pause
-tracking-unpaused = Pausar tracking
-tracking-paused = Resumir tracking
+tracking-unpaused = Pausar rastreamento
+tracking-paused = Retomar rastreamento
## Widget: Overlay settings
@@ -136,15 +141,18 @@ widget-developer_mode-precise_rotation = Precise rotation
widget-developer_mode-fast_data_feed = Fast data feed
widget-developer_mode-filter_slimes_and_hmd = Filter slimes and HMD
widget-developer_mode-sort_by_name = Sort by name
-widget-developer_mode-raw_slime_rotation = Raw rotation
+widget-developer_mode-raw_slime_rotation = Rotação bruta
widget-developer_mode-more_info = More info
## Widget: IMU Visualizer
-widget-imu_visualizer = Rotation
-widget-imu_visualizer-rotation_raw = Raw
-widget-imu_visualizer-rotation_preview = Preview
-widget-imu_visualizer-rotation_hide = Esconder
+widget-imu_visualizer = Rotação do tracker
+widget-imu_visualizer-preview = Pré-visualização
+widget-imu_visualizer-hide = Esconder
+widget-imu_visualizer-rotation_raw = Bruta
+widget-imu_visualizer-rotation_preview = Pré-visualizar rotação
+widget-imu_visualizer-acceleration = Aceleração
+widget-imu_visualizer-position = Posição
## Widget: Skeleton Visualizer
@@ -169,7 +177,7 @@ tracker-table-column-battery = Bateria
tracker-table-column-ping = Ping
tracker-table-column-tps = TPS
tracker-table-column-temperature = Temp. °C
-tracker-table-column-linear-acceleration = Accel. X/Y/Z
+tracker-table-column-linear-acceleration = Aceleração. X/Y/Z
tracker-table-column-rotation = Rotação X/Y/Z
tracker-table-column-position = Posição X/Y/Z
tracker-table-column-url = URL
@@ -185,7 +193,7 @@ tracker-rotation-back = Atrás
tracker-rotation-back_left = Trás-esquerda
tracker-rotation-back_right = Trás-direita
tracker-rotation-custom = Personalizado
-tracker-rotation-overriden = (substituído por reset de posição)
+tracker-rotation-overriden = (substituído pelo reset de posição)
## Tracker information
@@ -199,6 +207,13 @@ tracker-infos-hardware_identifier = ID do Hardware
tracker-infos-imu = Sensor IMU
tracker-infos-board_type = Placa principal
tracker-infos-network_version = Versão do protocolo
+tracker-infos-magnetometer = Magnetômetro
+tracker-infos-magnetometer-status-v1 =
+ { $status ->
+ [DISABLED] Desabilitado
+ [ENABLED] Habilitado
+ *[NOT_SUPPORTED] Incompatível
+ }
## Tracker settings
@@ -213,11 +228,19 @@ tracker-settings-mounting_section-edit = Editar posição
tracker-settings-drift_compensation_section = Ligar a compensação de drift
tracker-settings-drift_compensation_section-description = Esse tracker deverá compensar pelo drift quando a compensação de drift estiver ligado?
tracker-settings-drift_compensation_section-edit = Ligar a compensação de drift
+tracker-settings-use_mag = Permitir o uso do magnetômetro neste tracker
+# Multiline!
+tracker-settings-use_mag-description =
+ Esse tracker deve usar o magnetômetro para reduzir o drift quando o uso de magnetômetro estiver permitido? Não desligue seu tracker enquanto altera esta opção!
+
+ Você precisa permitir o uso de magnetômetro primeiro, clique aqui para ir para as configurações.
+tracker-settings-use_mag-label = Permitir o uso do magnetômetro
# The . means it's an attribute and it's related to the top key.
# In this case that is the settings for the assignment section.
tracker-settings-name_section = Nome do tracker
tracker-settings-name_section-description = Dê um apelido fofo :)
tracker-settings-name_section-placeholder = Coxa esquerda de NightyBeast
+tracker-settings-name_section-label = Nome do tracker
tracker-settings-forget = Esquecer o tracker
tracker-settings-forget-description = Remove o tracker do servidor SlimeVR e impede que ele se conecte a ele até que o servidor seja reiniciado. A configuração do tracker não será perdida.
tracker-settings-forget-label = Esquecer o tracker
@@ -287,7 +310,7 @@ mounting_selection_menu-close = Fechar
settings-sidebar-title = Opções
settings-sidebar-general = Geral
settings-sidebar-tracker_mechanics = Mecânicas do Tracker
-settings-sidebar-fk_settings = Opções de Tracker
+settings-sidebar-fk_settings = Opções dos trackers
settings-sidebar-gesture_control = Controle de Gestos
settings-sidebar-interface = Interface
settings-sidebar-osc_router = Roteador OSC
@@ -296,6 +319,7 @@ settings-sidebar-utils = Utilidades
settings-sidebar-serial = Console Serial
settings-sidebar-appearance = Aparência
settings-sidebar-notifications = Notificações
+settings-sidebar-advanced = Avançado
## SteamVR settings
@@ -350,6 +374,20 @@ settings-general-tracker_mechanics-drift_compensation-description =
Compensa o drift de guinada (yaw) aplicando uma rotação inversa.
Mudar a quantidade de compensação e até quantos resets vão ser levados em conta.
settings-general-tracker_mechanics-drift_compensation-enabled-label = Compensação de drift
+settings-general-tracker_mechanics-drift_compensation-prediction = Predição de compensação de drift
+# This cares about multilines
+settings-general-tracker_mechanics-drift_compensation-prediction-description =
+ Antecipa a compensação de drift além do intervalo medido anteriormente.
+ Ative essa opção se o tracker estiver girando continuamente no eixo de guinada (yaw).
+settings-general-tracker_mechanics-drift_compensation-prediction-label = Predição de compensação de drift
+settings-general-tracker_mechanics-drift_compensation_warning =
+ Aviso: Use a compensação de drift somente se você precisar resetar
+ com muita frequência (a cada 5 a 10 minutos).
+
+ Algumas IMUs sujeitas a resets mais frequentes incluem:
+ Joy-Cons, owoTrack e MPUs (sem firmware recente).
+settings-general-tracker_mechanics-drift_compensation_warning-cancel = Cancelar
+settings-general-tracker_mechanics-drift_compensation_warning-done = Eu entedi
settings-general-tracker_mechanics-drift_compensation-amount-label = Quantidade de compensação
settings-general-tracker_mechanics-drift_compensation-max_resets-label = Use até x últimos resets
settings-general-tracker_mechanics-save_mounting_reset = Salvar a calibragem automática de posição
@@ -357,6 +395,11 @@ settings-general-tracker_mechanics-save_mounting_reset-description =
Salva as calibrações automáticas de reset de posição para os trackers entre as reinicializações. Útil
ao usar uma roupa em que os trackers não se movem entre as sessões. Não recomendado para usuários normais!
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = Salvar reset de Posição
+settings-general-tracker_mechanics-use_mag_on_all_trackers = Usar o magnetômetro em todos os trackers IMUs compatíveis
+settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
+ Usa o magnetômetro em todos os trackers com firmware compatível, reduzindo o drift em ambientes magneticamente estáveis.
+ Essa opção pode ser desativada indivualmente nas configurações de cada tracker. Não desligue nenhum dos trackers enquanto altera esta opção!
+settings-general-tracker_mechanics-use_mag_on_all_trackers-label = Usar o magnetômetro nos trackers
## FK/Tracking settings
@@ -450,11 +493,14 @@ settings-general-gesture_control-numberTrackersOverThreshold-description = Aumen
## Appearance settings
-settings-interface-appearance = Aparênia
+settings-interface-appearance = Aparência
settings-general-interface-dev_mode = Modo de desenvolvedor
settings-general-interface-dev_mode-description = Este modo pode ser útil se precisar de dados específicos ou para interagir com trackers conectados a um nível mais avançado
settings-general-interface-dev_mode-label = Modo de desenvolvedor
settings-general-interface-theme = Cor do tema
+settings-general-interface-show-navbar-onboarding = Mostrar "{ navbar-onboarding }" na barra de navegação
+settings-general-interface-show-navbar-onboarding-description = Isso muda se o botão "{ navbar-onboarding }" for exibido na barra de navegação.
+settings-general-interface-show-navbar-onboarding-label = Mostrar "{ navbar-onboarding }"
settings-general-interface-lang = Selecione o idioma
settings-general-interface-lang-description = Alterar o idioma padrão que pretende utilizar
settings-general-interface-lang-placeholder = Selecione o idioma que vai usar
@@ -466,6 +512,9 @@ settings-interface-appearance-font-os_font = Fonte do sistema
settings-interface-appearance-font-slime_font = Fonte padrão
settings-interface-appearance-font_size = Escala da fonte
settings-interface-appearance-font_size-description = Isso afeta o tamanho da fonte de toda a interface, exceto neste painel de configurações.
+settings-interface-appearance-decorations = Use as decorações nativas do sistema
+settings-interface-appearance-decorations-description = Quando essa opção estiver ativada, a barra de título do SlimeVR não será exibida, mas será substituída pela barra de título nativa do sistema.
+settings-interface-appearance-decorations-label = Usar a barra de título nativa do sistema
## Notification settings
@@ -611,6 +660,36 @@ settings-osc-vmc-mirror_tracking = Espelhar rastreamento
settings-osc-vmc-mirror_tracking-description = Espelhar o rastreamento horizontalmente.
settings-osc-vmc-mirror_tracking-label = Espelhar rastreamento
+## Advanced settings
+
+settings-utils-advanced = Avançado
+settings-utils-advanced-reset-gui = Resetar configurações da interface
+settings-utils-advanced-reset-gui-description = Restaura a interface para as configurações iniciais.
+settings-utils-advanced-reset-gui-label = Resetar interface
+settings-utils-advanced-reset-server = Resetar configuraçõse de tracking
+settings-utils-advanced-reset-server-description = Restaura as configurações de tracking para as configurações iniciais.
+settings-utils-advanced-reset-server-label = Resetar tracking
+settings-utils-advanced-reset-all = Resetar todas as configurações
+settings-utils-advanced-reset-all-description = Restaura a configuração da interface e de tracking para as configurações iniciais.
+settings-utils-advanced-reset-all-label = Resetar todas as configurações
+settings-utils-advanced-reset_warning =
+ { $type ->
+ [gui]
+ Aviso: Isso irá restaurar as configurações da interface gráfica para as configurações iniciais.
+ Tem certeza de que deseja fazer isso?
+ [server]
+ Aviso: Isso irá restaurar as configurações de tracking para as configurações iniciais.
+ Tem certeza de que deseja fazer isso?
+ *[all]
+ Aviso: Isso irá restaurar todas as suas configurações para as configurações iniciais.
+ Tem certeza de que deseja fazer isso?
+ }
+settings-utils-advanced-reset_warning-reset = Resetar configurações
+settings-utils-advanced-reset_warning-cancel = Cancelar
+settings-utils-advanced-open_data = Pasta de arquivos
+settings-utils-advanced-open_data-description = Abre a pasta de arquivos do SlimeVR no explorador de arquivos, a qual contém os arquivos de configuração e de registro.
+settings-utils-advanced-open_data-label = Abrir pasta
+
## Setup/onboarding menu
onboarding-skip = Pular configurações
@@ -722,6 +801,7 @@ onboarding-calibration_tutorial-status-waiting = Esperando por você
onboarding-calibration_tutorial-status-calibrating = Calibrando
onboarding-calibration_tutorial-status-success = Legal!
onboarding-calibration_tutorial-status-error = O tracker foi movido
+onboarding-calibration_tutorial-skip = Pular tutorial
## Tracker assignment tutorial
@@ -845,11 +925,11 @@ onboarding-choose_mounting = Qual método de calibração de posição você des
# Multiline text
onboarding-choose_mounting-description = A orientação de posição corrige a colocação dos trackers no seu corpo.
onboarding-choose_mounting-auto_mounting = Posição automática
-# Italized text
+# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = Recomendado
onboarding-choose_mounting-auto_mounting-description = Isso detectará automaticamente as direções de posição para todos os seus trackers a partir de 2 poses
onboarding-choose_mounting-manual_mounting = Posição manual
-# Italized text
+# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = Pode não ser precisa o suficiente
onboarding-choose_mounting-manual_mounting-description = Isso permitirá que você escolha manualmente a direção de posição para cada tracker
# Multiline text
@@ -898,14 +978,14 @@ onboarding-choose_proportions-description-v1 =
Quando as proporções do seu corpo não corresponderem às que estão salvas, a precisão do rastreamento será pior e você observará problemas como efeito de patinação ou deslizamento, ou que seu corpo não corresponde bem ao seu avatar.
Você precisará medir seu corpo apenas uma vez! Se as medições estiverem corretas e o seu corpo não tiver passado por mudanças significativas, não há necessidade de repeti-las.
onboarding-choose_proportions-auto_proportions = Proporções automáticas
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Recomendado
onboarding-choose_proportions-auto_proportions-descriptionv3 =
Isso irá estimar suas proporções gravando uma amostra de seus movimentos e passando-a por um algoritmo.
Isso requer ter seu headset (HMD) conectado ao SlimeVR e na sua cabeça!
onboarding-choose_proportions-manual_proportions = Proporções manuais
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = Para pequenos ajustes
onboarding-choose_proportions-manual_proportions-description = Isso permitirá que você ajuste suas proporções manualmente, modificando-as diretamente
onboarding-choose_proportions-export = Exportar proporções
@@ -985,9 +1065,10 @@ onboarding-automatic_proportions-verify_results-redo = Refazer a gravação
onboarding-automatic_proportions-verify_results-confirm = Eles estão corretos
onboarding-automatic_proportions-done-title = Corpo medido e salvo.
onboarding-automatic_proportions-done-description = Sua calibragem de proporção de corpo está completa!
-onboarding-automatic_proportions-error_modal =
- Aviso: Um erro foi encontrado ao estimar proporções!
- Por favor, verifique a documentação ou junte-se ao nosso Discord para obter ajuda ^_^
+onboarding-automatic_proportions-error_modal-v2 =
+ Aviso: Ocorreu um erro ao calcular as proporções!
+ Isso provavelmente é um problema da calibragem de posição. Verifique se o rastreamento está funcionando corretamente antes de tentar novamente.
+ Por favor, verifique a documentação ou entre em nosso Discord para obter ajuda ^_^
onboarding-automatic_proportions-error_modal-confirm = Entendido!
## Home
diff --git a/gui/public/i18n/ru/translation.ftl b/gui/public/i18n/ru/translation.ftl
index ea09262ce..1834e55c2 100644
--- a/gui/public/i18n/ru/translation.ftl
+++ b/gui/public/i18n/ru/translation.ftl
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = Смещение локтя
## Tracker reset buttons
reset-reset_all = Сбросить все пропорции
+reset-reset_all_warning =
+ Внимание: Это сбросит ваши пропорции до основанных только на вашем росте.
+ Вы уверены, что хотите это сделать?
+reset-reset_all_warning-reset = Сброс пропорций
+reset-reset_all_warning-cancel = Отмена
reset-full = Полный сброс
reset-mounting = Сбросить крепление
reset-yaw = Горизонтальный сброс
@@ -142,9 +147,12 @@ widget-developer_mode-more_info = Дополнительная информац
## Widget: IMU Visualizer
widget-imu_visualizer = Вращение
+widget-imu_visualizer-preview = Предпросмотр
+widget-imu_visualizer-hide = Скрыть
widget-imu_visualizer-rotation_raw = RAW
widget-imu_visualizer-rotation_preview = Предпросмотр
-widget-imu_visualizer-rotation_hide = Скрыть
+widget-imu_visualizer-acceleration = Ускорение
+widget-imu_visualizer-position = Позиция
## Widget: Skeleton Visualizer
@@ -199,6 +207,13 @@ tracker-infos-hardware_identifier = ID оборудования
tracker-infos-imu = Датчик IMU
tracker-infos-board_type = Основная плата
tracker-infos-network_version = Версия Протокола
+tracker-infos-magnetometer = Магнитометр
+tracker-infos-magnetometer-status-v1 =
+ { $status ->
+ [DISABLED] Выключено
+ [ENABLED] Включено
+ *[NOT_SUPPORTED] Не Поддерживается
+ }
## Tracker settings
@@ -213,11 +228,16 @@ tracker-settings-mounting_section-edit = Изменить прикреплени
tracker-settings-drift_compensation_section = Разрешить компенсацию дрейфа
tracker-settings-drift_compensation_section-description = Должен ли этот трекер компенсировать свой дрифт?
tracker-settings-drift_compensation_section-edit = Разрешить компенсацию дрейфа
+tracker-settings-use_mag = Разрешить использование магнитометра для этого трекера
+# Multiline!
+tracker-settings-use_mag-description = Должен ли этот трекер использовать магнитометр для компенсации дрифта, когда использование магнитометра разрешено?Пожалуйста, не выключайте трекер во время включения данной функции! Вам сначала нужно разрешить использование магнитометра, нажмите здесь чтобы зайти в настройки.
+tracker-settings-use_mag-label = Разрешить магнитометр
# The . means it's an attribute and it's related to the top key.
# In this case that is the settings for the assignment section.
tracker-settings-name_section = Имя трекера
tracker-settings-name_section-description = Дай ему милое имя :)
tracker-settings-name_section-placeholder = Левая нога NightyBeast'а
+tracker-settings-name_section-label = Имя трекера
tracker-settings-forget = Забыть трекер
tracker-settings-forget-description = Убирает трекер с SlimeVR Сервер и запрещает ему подключаться к серверу до того как он будет перезапущен. Конфигурация трекера не будет потеряна.
tracker-settings-forget-label = Забыть трекер
@@ -296,6 +316,7 @@ settings-sidebar-utils = Утилиты
settings-sidebar-serial = Консоль
settings-sidebar-appearance = Внешний вид
settings-sidebar-notifications = Уведомление
+settings-sidebar-advanced = Продвинутые
## SteamVR settings
@@ -350,6 +371,16 @@ settings-general-tracker_mechanics-drift_compensation-description =
Компенсирует дрейф IMU по рысканию путем применения обратного вращения.
Измените количество компенсации и до скольких сбросов учитывается.
settings-general-tracker_mechanics-drift_compensation-enabled-label = Компенсация дрейфа
+settings-general-tracker_mechanics-drift_compensation-prediction = Прогноз компенсации дрифта
+settings-general-tracker_mechanics-drift_compensation-prediction-label = Прогноз компенсации дрифта
+settings-general-tracker_mechanics-drift_compensation_warning =
+ Предупреждение: Используйте компенсацию дрифта только в том случае, если вам нужно сбросить настройки
+ очень часто (каждые ~5-10 минут).
+
+ IMU, склонные к частым сбросам, включают:
+ Joy-Con, owoTrack, и MPU (без последней прошивки).
+settings-general-tracker_mechanics-drift_compensation_warning-cancel = Отмена
+settings-general-tracker_mechanics-drift_compensation_warning-done = Я понимаю
settings-general-tracker_mechanics-drift_compensation-amount-label = Кол-во компенсации
settings-general-tracker_mechanics-drift_compensation-max_resets-label = Используйте до x последних сбросов
settings-general-tracker_mechanics-save_mounting_reset = Сохранить калибровку автоматического сброса крепления
@@ -357,6 +388,11 @@ settings-general-tracker_mechanics-save_mounting_reset-description =
Сохраняет автоматические калибровки сброса крепления для трекеров между перезапусками. Полезный
при ношении костюма, в котором трекеры не перемещаются между сессиями. Не рекомендуется для обычных пользователей!
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = Сохранить сброс крепления
+settings-general-tracker_mechanics-use_mag_on_all_trackers = Использовать магнитометр на всех IMU трекерах, которые его поддерживают
+settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
+ Использует магнитометр на всех трекерах, которые имеют совместимую с ним прошивку, уменьшая дрифт в стабильных магнитных средах.
+ Может быть отключен для каждого трекера в настройках трекера. Пожалуйста, не выключайте ни один из трекеров во время переключения!
+settings-general-tracker_mechanics-use_mag_on_all_trackers-label = Использовать магнитометр трекеров
## FK/Tracking settings
@@ -384,6 +420,8 @@ settings-general-fk_settings-arm_fk = Отслеживание рук
settings-general-fk_settings-arm_fk-description = Измените способ отслеживания рук.
settings-general-fk_settings-arm_fk-force_arms = Руки от HMD
settings-general-fk_settings-reset_settings = Сбросить настройки
+settings-general-fk_settings-reset_settings-reset_hmd_pitch-description = Сбросить уклон HMD (вертикальное вращение) после полного сброса. Полезно при ношении шлема на лбу для VTubing-а или mocap-а. Не включайте для VR.
+settings-general-fk_settings-reset_settings-reset_hmd_pitch = Сбросить уклон HMD
settings-general-fk_settings-arm_fk-reset_mode-description = Изменение ожидаемой позы руки для сброса крепления.
settings-general-fk_settings-arm_fk-back = Назад
settings-general-fk_settings-arm_fk-back-description = Режим по умолчанию, в котором плечи идут назад, а предплечья — вперед.
@@ -455,6 +493,8 @@ settings-general-interface-dev_mode = Режим разработчика
settings-general-interface-dev_mode-description = Этот режим может быть полезен, если вам нужны подробные данные или для взаимодействия с подключенными трекерами на более продвинутом уровне.
settings-general-interface-dev_mode-label = Режим разработчика
settings-general-interface-theme = Варианты оформления
+settings-general-interface-show-navbar-onboarding = Показать "{ navbar-onboarding }" на панели навигации
+settings-general-interface-show-navbar-onboarding-label = Показать "{ navbar-onboarding }"
settings-general-interface-lang = Выбрать язык
settings-general-interface-lang-description = Измените язык по умолчанию, который вы хотите использовать.
settings-general-interface-lang-placeholder = Выберите язык для использования
@@ -466,6 +506,7 @@ settings-interface-appearance-font-os_font = Шрифт ОС
settings-interface-appearance-font-slime_font = Шрифт по умолчанию
settings-interface-appearance-font_size = Базовое масштабирование шрифта
settings-interface-appearance-font_size-description = Это влияет на размер шрифта всего интерфейса, за исключением этой панели настроек.
+settings-interface-appearance-decorations-description = Это не будет отображать верхнюю панель интерфейса, а вместо этого будет использоваться панель операционной системы.
## Notification settings
@@ -612,6 +653,36 @@ settings-osc-vmc-mirror_tracking = Отзеркалить отслеживани
settings-osc-vmc-mirror_tracking-description = Отзеркалить отслеживание горизонтально.
settings-osc-vmc-mirror_tracking-label = Отзеркалить отслеживание
+## Advanced settings
+
+settings-utils-advanced = Продвинутые
+settings-utils-advanced-reset-gui = Сброс настроек графического интерфейса
+settings-utils-advanced-reset-gui-description = Восстановить стандартные настройки интерфейса.
+settings-utils-advanced-reset-gui-label = Сбросить графический интерфейс
+settings-utils-advanced-reset-server = Сброс настроек отслеживания
+settings-utils-advanced-reset-server-description = Восстановить стандартные настройки для отслеживания.
+settings-utils-advanced-reset-server-label = Сбросить отслеживание
+settings-utils-advanced-reset-all = Сбросить все настройки
+settings-utils-advanced-reset-all-description = Восстановить стандартные настройки как для интерфейса, так и для отслеживания.
+settings-utils-advanced-reset-all-label = Сбросить всё
+settings-utils-advanced-reset_warning =
+ { $type ->
+ [gui]
+ Предупреждение: Это сбросит ваши настройки графического интерфейса до значений по умолчанию.
+ Вы уверены, что хотите это сделать?
+ [server]
+ Предупреждение: Это сбросит ваши настройки отслеживания до значений по умолчанию.
+ Вы уверены, что хотите это сделать?
+ *[all]
+ Предупреждение: Это сбросит все ваши настройки до значений по умолчанию.
+ Вы уверены, что хотите это сделать?
+ }
+settings-utils-advanced-reset_warning-reset = Сброс настроек
+settings-utils-advanced-reset_warning-cancel = Отмена
+settings-utils-advanced-open_data = Папка данных
+settings-utils-advanced-open_data-description = Откройте в проводнике папку данных SlimeVR, содержащую файлы конфигурации и логи.
+settings-utils-advanced-open_data-label = Открыть папку
+
## Setup/onboarding menu
onboarding-skip = Пропустить установку
@@ -725,6 +796,7 @@ onboarding-calibration_tutorial-status-waiting = Ждем вас
onboarding-calibration_tutorial-status-calibrating = Калибровка
onboarding-calibration_tutorial-status-success = Хорошо!
onboarding-calibration_tutorial-status-error = Трекер был перемещен
+onboarding-calibration_tutorial-skip = Пропуск туториала
## Tracker assignment tutorial
@@ -851,11 +923,11 @@ onboarding-choose_mounting = Какой метод калибровки креп
# Multiline text
onboarding-choose_mounting-description = Ориентация крепления корректирует размещение трекеров на вашем теле.
onboarding-choose_mounting-auto_mounting = Автоматическая привязка
-# Italized text
+# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = Рекомендуется
onboarding-choose_mounting-auto_mounting-description = Это автоматически определит направления монтажа для всех ваших трекеров из 2 поз
onboarding-choose_mounting-manual_mounting = Ручная привязка
-# Italized text
+# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = Может быть недостаточно точным
onboarding-choose_mounting-manual_mounting-description = Это позволит вам выбрать направление монтажа вручную для каждого трекера
# Multiline text
@@ -904,14 +976,14 @@ onboarding-choose_proportions-description-v1 =
Когда пропорции вашего тела не совпадают с сохраненными, точность отслеживания будет хуже, и вы заметите такие вещи, как скольжение или дрифт, или ваше тело не очень хорошо соответствует вашему аватару.
Вам нужно измерить свое тело только один раз! Если они не неправильны или ваше тело не изменилось, то вам не нужно делать их снова.
onboarding-choose_proportions-auto_proportions = Автоматическая привязка
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Рекомендуется
onboarding-choose_proportions-auto_proportions-descriptionv3 =
Это попробует угадать ваши пропорции, записывая образец ваших движений и пропуская его через алгоритм.
Для этого необходимо, чтобы ваш Шлем (HMD) был подключен к SlimeVR и был надет на голову!
onboarding-choose_proportions-manual_proportions = Ручные пропорции
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = Для небольших штрихов
onboarding-choose_proportions-manual_proportions-description = Это позволит вам настроить пропорции вручную, изменив их напрямую.
onboarding-choose_proportions-export = Экспорт пропорций
@@ -991,9 +1063,10 @@ onboarding-automatic_proportions-verify_results-redo = Перезаписать
onboarding-automatic_proportions-verify_results-confirm = Они правильные
onboarding-automatic_proportions-done-title = Тело измерено и сохранено.
onboarding-automatic_proportions-done-description = Калибровка пропорций вашего тела завершена!
-onboarding-automatic_proportions-error_modal =
- Предупреждение: Была обнаружена ошибка при расчёте пропорций!
- Пожалуйста, ознакомьтесь с документацией, или присоединитесь к нашему Discord серверу для получения помощи ^_^
+onboarding-automatic_proportions-error_modal-v2 =
+ Внимание: Произошла ошибка при оценке пропорций!
+ Скорее всего, это проблема с калибровкой крепления. Прежде чем повторить попытку, убедитесь, что отслеживание работает правильно.
+ Пожалуйста, проверьте документацию или присоединитесь к нашему Discord для получения помощи ^_^
onboarding-automatic_proportions-error_modal-confirm = Принято!
## Home
diff --git a/gui/public/i18n/vi/translation.ftl b/gui/public/i18n/vi/translation.ftl
index d89641f1d..2bf15fda8 100644
--- a/gui/public/i18n/vi/translation.ftl
+++ b/gui/public/i18n/vi/translation.ftl
@@ -81,6 +81,8 @@ skeleton_bone-ELBOW_OFFSET = Sai số khuỷu tay
## Tracker reset buttons
reset-reset_all = Đặt lại tất cả bộ phận
+reset-reset_all_warning-reset = Đặt lại tỷ lệ
+reset-reset_all_warning-cancel = Hủy
reset-full = Đặt lại
reset-mounting = Đặt lại hướng gắn tracker
reset-yaw = Đặt lại chiều quay lệch
@@ -142,9 +144,12 @@ widget-developer_mode-more_info = Thêm thông tin
## Widget: IMU Visualizer
widget-imu_visualizer = Góc quay
+widget-imu_visualizer-preview = Xem trước
+widget-imu_visualizer-hide = Ẩn
widget-imu_visualizer-rotation_raw = Gốc
widget-imu_visualizer-rotation_preview = Qua xử lí
-widget-imu_visualizer-rotation_hide = Ẩn
+widget-imu_visualizer-acceleration = Gia tốc
+widget-imu_visualizer-position = Vị trí
## Widget: Skeleton Visualizer
@@ -296,6 +301,7 @@ settings-sidebar-utils = Công cụ
settings-sidebar-serial = Cổng Serial
settings-sidebar-appearance = Giao diện
settings-sidebar-notifications = Thông báo
+settings-sidebar-advanced = Cài đặt mở rộng
## SteamVR settings
@@ -350,6 +356,10 @@ settings-general-tracker_mechanics-drift_compensation-description =
Bù trừ sai lệch trục ngang của cảm biến bằng cách thêm một sai lệch chống lại nó
Thay đổi mức độ bù trừ và số lần đặt lại được áp dụng bù trừ
settings-general-tracker_mechanics-drift_compensation-enabled-label = Bù trừ sai số
+settings-general-tracker_mechanics-drift_compensation-prediction = Dự đoán bù trôi (drift compensation)
+settings-general-tracker_mechanics-drift_compensation-prediction-label = Dự đoán bù trôi (drift compensation)
+settings-general-tracker_mechanics-drift_compensation_warning-cancel = Hủy
+settings-general-tracker_mechanics-drift_compensation_warning-done = Tôi hiểu
settings-general-tracker_mechanics-drift_compensation-amount-label = Mức độ bù trừ
settings-general-tracker_mechanics-drift_compensation-max_resets-label = Số lần đặt lại được áp dụng bù trừ
settings-general-tracker_mechanics-save_mounting_reset = Lưu thiết bị đã giao tự động
@@ -605,6 +615,17 @@ settings-osc-vmc-mirror_tracking = Phản chiếu ngược theo dõi cơ thể
settings-osc-vmc-mirror_tracking-description = Phản chiếu theo dõi theo chiều ngang.
settings-osc-vmc-mirror_tracking-label = Phản chiếu ngược theo dõi cơ thể
+## Advanced settings
+
+settings-utils-advanced = Cài đặt mở rộng
+settings-utils-advanced-reset-gui = Đặt lại cài đặt GUI
+settings-utils-advanced-reset-all-label = Đặt lại tất cả
+settings-utils-advanced-reset_warning-reset = Đặt lại cài đặt
+settings-utils-advanced-reset_warning-cancel = Hủy
+settings-utils-advanced-open_data = Thư mục dữ liệu
+settings-utils-advanced-open_data-description = Mở thư mục dữ liệu của SlimeVR trong tệp, chứa các tệp cấu hình và logs.
+settings-utils-advanced-open_data-label = Mở thư mục
+
## Setup/onboarding menu
onboarding-skip = Bỏ qua cài đặt
@@ -716,6 +737,7 @@ onboarding-calibration_tutorial-status-waiting = Đang chờ bạn hoàn thành
onboarding-calibration_tutorial-status-calibrating = Đang hiệu chuẩn
onboarding-calibration_tutorial-status-success = Nice!
onboarding-calibration_tutorial-status-error = Thiết bị đã di chuyển
+onboarding-calibration_tutorial-skip = Bỏ qua hướng dẫn
## Tracker assignment tutorial
@@ -835,11 +857,11 @@ onboarding-choose_mounting = Bạn muốn dùng phương pháp hiểu chuần n
# Multiline text
onboarding-choose_mounting-description = Hướng lắp đặt chính xác cho vị trí của thiết bị theo dõi trên cơ thể của bạn.
onboarding-choose_mounting-auto_mounting = Cân chỉnh tự động
-# Italized text
+# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = Khuyến khích dùng
onboarding-choose_mounting-auto_mounting-description = Điều này sẽ tự động phát hiện các hướng lắp đặt cho tất cả các thiết bị của bạn từ 2 tư thế
onboarding-choose_mounting-manual_mounting = Cân chỉnh thủ công
-# Italized text
+# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = Có thể không đủ chính xác
onboarding-choose_mounting-manual_mounting-description = Điều này sẽ cho phép bạn chọn hướng lắp theo cách thủ công cho từng thiết bị
# Multiline text
@@ -888,14 +910,14 @@ onboarding-choose_proportions-description-v1 =
Khi tỷ lệ cơ thể của bạn không khớp với tỷ lệ được lưu, độ chính xác theo dõi của bạn sẽ kém hơn và bạn sẽ nhận thấy những thứ như trượt băng hoặc trượt, hoặc cơ thể của bạn không khớp với hình đại diện của bạn.
Bạn chỉ cần đo cơ thể của bạn một lần! Trừ khi chúng sai hoặc cơ thể bạn đã thay đổi, thì bạn không cần phải làm lại.
onboarding-choose_proportions-auto_proportions = Đo kích thước cơ thể tự động
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Khuyến khích dùng
onboarding-choose_proportions-auto_proportions-descriptionv3 =
Tính năng này sẽ đoán tỷ lệ cơ thể của bạn bằng cách ghi lại một mẫu chuyển động của bạn và chuyển nó qua một thuật toán.
Tính năng này sẽ yêu cầu headset của bạn (HMD) được kết nối với SlimeVR và đang nằm ở trên đầu của bạn!
onboarding-choose_proportions-manual_proportions = Đo kích thước cơ thể thủ công
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = Cho chính xác
onboarding-choose_proportions-manual_proportions-description = Tính năng này sẽ cho phép bạn điều chỉnh tỉ lệ cơ thể của mình theo cách thủ công bằng cách chỉnh sửa các con số một cách trực tiếp
onboarding-choose_proportions-export = Xuất tỉ lệ cơ thể
diff --git a/gui/public/i18n/zh-Hans/translation.ftl b/gui/public/i18n/zh-Hans/translation.ftl
index 561617507..34ee40134 100644
--- a/gui/public/i18n/zh-Hans/translation.ftl
+++ b/gui/public/i18n/zh-Hans/translation.ftl
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = 肘部偏移
## Tracker reset buttons
reset-reset_all = 重置身体比例
+reset-reset_all_warning =
+ 警告: 这会将您的身体比例重置为仅基于身高的默认比例。
+ 您确定要执行此操作吗?
+reset-reset_all_warning-reset = 重置身体比例
+reset-reset_all_warning-cancel = 取消
reset-full = 完整重置
reset-mounting = 重置佩戴
reset-yaw = 重置航向轴
@@ -142,9 +147,12 @@ widget-developer_mode-more_info = 显示更多信息
## Widget: IMU Visualizer
widget-imu_visualizer = 旋转
+widget-imu_visualizer-preview = 预览
+widget-imu_visualizer-hide = 隐藏
widget-imu_visualizer-rotation_raw = 原始旋转
widget-imu_visualizer-rotation_preview = 预览
-widget-imu_visualizer-rotation_hide = 隐藏
+widget-imu_visualizer-acceleration = 加速度
+widget-imu_visualizer-position = 位置
## Widget: Skeleton Visualizer
@@ -296,6 +304,7 @@ settings-sidebar-utils = 工具
settings-sidebar-serial = 串口控制台
settings-sidebar-appearance = 外观
settings-sidebar-notifications = 通知
+settings-sidebar-advanced = 高级选项
## SteamVR settings
@@ -350,6 +359,20 @@ settings-general-tracker_mechanics-drift_compensation-description =
应用反向旋转以补偿IMU的偏航角漂移。
更改补偿量和使用多少次的重置结果用于计算补偿量。
settings-general-tracker_mechanics-drift_compensation-enabled-label = 漂移补偿
+settings-general-tracker_mechanics-drift_compensation-prediction = 预测式漂移补偿
+# This cares about multilines
+settings-general-tracker_mechanics-drift_compensation-prediction-description =
+ 预测超过先前测量范围的偏航角漂移,并进行补偿。
+ 适用于追踪器在偏航轴上持续旋转的场景。
+settings-general-tracker_mechanics-drift_compensation-prediction-label = 预测式漂移补偿
+settings-general-tracker_mechanics-drift_compensation_warning =
+ 警告: 仅在需要经常重置偏航角
+ (大概5~10分钟左右需要重置一次) 时使用漂移补偿。
+
+ 一些可能需要此补偿的 IMU 包括:
+ Joy-Cons、owoTrack 和 MPU(使用旧DMP固件)。
+settings-general-tracker_mechanics-drift_compensation_warning-cancel = 取消
+settings-general-tracker_mechanics-drift_compensation_warning-done = 了解
settings-general-tracker_mechanics-drift_compensation-amount-label = 补偿量
settings-general-tracker_mechanics-drift_compensation-max_resets-label = 使用几次的重置结果?
settings-general-tracker_mechanics-save_mounting_reset = 保存佩戴重置结果
@@ -383,6 +406,9 @@ settings-general-fk_settings-leg_fk-reset_mounting_feet = 脚部佩戴重置
settings-general-fk_settings-arm_fk = 手臂追踪
settings-general-fk_settings-arm_fk-description = 即使有手臂位置数据可用,也强制使用头显的数据追踪手臂。
settings-general-fk_settings-arm_fk-force_arms = 强制使用头显数据追踪手臂
+settings-general-fk_settings-reset_settings = 重置设置
+settings-general-fk_settings-reset_settings-reset_hmd_pitch-description = 在进行完整重置时重置头显的俯仰角(垂直旋转)。适合将头显斜戴在头上进行直播或动捕的场景。作为VR使用时不要开启此选项。
+settings-general-fk_settings-reset_settings-reset_hmd_pitch = 重置头显俯仰
settings-general-fk_settings-arm_fk-reset_mode-description = 更改佩戴重置时使用的手臂姿势。
settings-general-fk_settings-arm_fk-back = 向后弯折
settings-general-fk_settings-arm_fk-back-description = 默认,重置时大臂向后,小臂向前,类似滑雪。
@@ -446,6 +472,9 @@ settings-general-interface-dev_mode = 开发者模式
settings-general-interface-dev_mode-description = 如果你需要深入的资料或对连接的追踪器进行进阶调整,开启此模式将会非常有用。
settings-general-interface-dev_mode-label = 开发者模式
settings-general-interface-theme = 主题颜色
+settings-general-interface-show-navbar-onboarding = 在导航栏上显示 “{ navbar-onboarding }”
+settings-general-interface-show-navbar-onboarding-description = 本选项设置是否将 "{ navbar-onboarding }" 按钮显示在导航栏上。
+settings-general-interface-show-navbar-onboarding-label = 显示 “{ navbar-onboarding }”
settings-general-interface-lang = 选择语言
settings-general-interface-lang-description = 更改要使用的默认语言
settings-general-interface-lang-placeholder = 选择要使用的语言
@@ -457,6 +486,9 @@ settings-interface-appearance-font-os_font = 系统字体
settings-interface-appearance-font-slime_font = 默认字体
settings-interface-appearance-font_size = 字体缩放
settings-interface-appearance-font_size-description = 这会影响除此设置面板外所有界面的字体大小。
+settings-interface-appearance-decorations = 使用系统原生窗口标题栏
+settings-interface-appearance-decorations-description = 这个选项开启后,将不会显示SlimeVR的标题栏,而是显示使用系统原生标题栏。
+settings-interface-appearance-decorations-label = 使用系统原生窗口标题栏
## Notification settings
@@ -474,6 +506,14 @@ settings-general-interface-connected_trackers_warning-label = 退出时,有追
settings-general-interface-use_tray = 最小化至任务栏
settings-general-interface-use_tray-description = 关闭 SlimeVR 窗口时,SlimeVR 服务器将会隐藏至任务栏图标而不会直接退出,可以继续使用。
settings-general-interface-use_tray-label = 最小化至任务栏
+settings-general-interface-discord_presence = 向Discord发送状态
+settings-general-interface-discord_presence-description = 告诉你的Discord客户端你正在使用SlimeVR,同时显示你正在使用的IMU追踪器数量。
+settings-general-interface-discord_presence-label = 向Discord发送状态
+settings-general-interface-discord_presence-message =
+ { $amount ->
+ [0] { "" }
+ *[other] 正在使用 { $amount } 个追踪器
+ }
## Serial settings
@@ -496,6 +536,8 @@ settings-serial-get_infos = 获取信息
settings-serial-serial_select = 选择串行端口
settings-serial-auto_dropdown_item = 自动
settings-serial-get_wifi_scan = 扫描可用WiFi
+settings-serial-file_type = 纯文本
+settings-serial-save_logs = 保存到文件
## OSC router settings
@@ -526,14 +568,16 @@ settings-osc-router-network-address-placeholder = IPV4 地址
settings-osc-vrchat = VRChat OSC Trackers
# This cares about multilines
-settings-osc-vrchat-description =
- 改变 VRChat 的特定设置以接收和发送头显数据。
- 用于全身追踪的追踪器数据(在 Quest 端生效)。
+settings-osc-vrchat-description-v1 =
+ 修改与OSC追踪器相关的设置,可用于在不使用SteamVR时传输追踪数据(如一体机模式)。
+ 在使用OSC追踪器时,请确保在VRChat的圆盘菜单中开启OSC功能(选项 > OSC > 开启)。
+ 为了从VRChat中接收到头显和控制器的数据,还需要在VRChat主菜单中设置的“动捕与IK”下,
+ 打开“通过OSC共享头显和手柄信息”。
settings-osc-vrchat-enable = 启用
settings-osc-vrchat-enable-description = 切换数据的发送和接收
settings-osc-vrchat-enable-label = 启用
settings-osc-vrchat-network = 网络端口
-settings-osc-vrchat-network-description = 设置用于监听和向 VRChat 发送数据的端口
+settings-osc-vrchat-network-description-v1 = 设置传输OSC数据的端口。用于VRChat时无需修改。
settings-osc-vrchat-network-port_in =
.label = 输入端口
.placeholder = 输入端口(默认 9001)
@@ -541,7 +585,7 @@ settings-osc-vrchat-network-port_out =
.label = 输出端口
.placeholder = 输出端口(默认 9000)
settings-osc-vrchat-network-address = 网络地址
-settings-osc-vrchat-network-address-description = 选择将数据发送到 VRChat 的地址(检查设备上的 Wi-Fi 设置)
+settings-osc-vrchat-network-address-description-v1 = 选择传输OSC数据的IP地址。用于VRChat时无需修改。
settings-osc-vrchat-network-address-placeholder = VRChat IP 地址
settings-osc-vrchat-network-trackers = 追踪器
settings-osc-vrchat-network-trackers-description = 切换数据的发送和接收
@@ -584,6 +628,39 @@ settings-osc-vmc-vrm-file_select = 拖曳文件或 浏览文件 以加载
settings-osc-vmc-anchor_hip = 髋部锚定
settings-osc-vmc-anchor_hip-description = 将追踪锚定在髋部,有利于坐姿进行虚拟直播。若本选项无法切换,请加载 VRM 模型。
settings-osc-vmc-anchor_hip-label = 髋部锚定
+settings-osc-vmc-mirror_tracking = 镜像追踪
+settings-osc-vmc-mirror_tracking-description = 水平镜像追踪结果
+settings-osc-vmc-mirror_tracking-label = 镜像追踪
+
+## Advanced settings
+
+settings-utils-advanced = 高级选项
+settings-utils-advanced-reset-gui = 重置GUI设置
+settings-utils-advanced-reset-gui-description = 恢复界面设置的初始配置。
+settings-utils-advanced-reset-gui-label = 重置GUI设置
+settings-utils-advanced-reset-server = 重置追踪设置
+settings-utils-advanced-reset-server-description = 恢复追踪设置的初始配置。
+settings-utils-advanced-reset-server-label = 重置追踪设置
+settings-utils-advanced-reset-all = 重置所有设置
+settings-utils-advanced-reset-all-description = 恢复界面设置与追踪设置的初始配置。
+settings-utils-advanced-reset-all-label = 重置所有设置
+settings-utils-advanced-reset_warning =
+ { $type ->
+ [gui]
+ 警告: 将要恢复界面设置为初始配置。
+ 是否确认进行此操作?
+ [server]
+ 警告: 将要恢复追踪设置为初始配置。
+ 是否确认进行此操作?
+ *[all]
+ 警告: 将要恢复所有设置为初始配置。
+ 是否确认进行此操作?
+ }
+settings-utils-advanced-reset_warning-reset = 重置设置
+settings-utils-advanced-reset_warning-cancel = 取消
+settings-utils-advanced-open_data = 数据文件夹
+settings-utils-advanced-open_data-description = 在文件管理器中打开SlimeVR的数据文件夹,查看配置文件与日志文件。
+settings-utils-advanced-open_data-label = 打开文件夹
## Setup/onboarding menu
@@ -695,6 +772,7 @@ onboarding-calibration_tutorial-status-waiting = 等待你的操作
onboarding-calibration_tutorial-status-calibrating = 校准中
onboarding-calibration_tutorial-status-success = 很好!
onboarding-calibration_tutorial-status-error = 追踪器被移动!
+onboarding-calibration_tutorial-skip = 跳过教程
## Tracker assignment tutorial
@@ -718,6 +796,23 @@ onboarding-assign_trackers-assigned = { $assigned }/{ $trackers } 个追踪器
onboarding-assign_trackers-advanced = 显示高级分配部位
onboarding-assign_trackers-next = 所有的追踪器都分配好了
onboarding-assign_trackers-mirror_view = 镜像显示
+onboarding-assign_trackers-option-amount = { $trackersCount } 点
+onboarding-assign_trackers-option-label =
+ { $mode ->
+ [lower-body] 下半身追踪
+ [core] 身体追踪
+ [enhanced-core] 拓展身体追踪
+ [full-body] 全身追踪
+ *[all] 所有可选追踪
+ }
+onboarding-assign_trackers-option-description =
+ { $mode ->
+ [lower-body] VR全身追踪最少需要的点数
+ [core] + 更准确的躯干追踪
+ [enhanced-core] + 脚部转动
+ [full-body] + 上臂追踪
+ *[all] 所有可用的追踪器分配
+ }
## Tracker assignment warnings
@@ -793,12 +888,12 @@ onboarding-choose_mounting = 使用哪种方法校准佩戴朝向?
# Multiline text
onboarding-choose_mounting-description = 佩戴方向校准用于确定您身上的追踪器的朝向。
onboarding-choose_mounting-auto_mounting = 自动设置佩戴方向
-# Italized text
-onboarding-choose_mounting-auto_mounting-label = 实验功能
+# Italicized text
+onboarding-choose_mounting-auto_mounting-label-v2 = 推荐使用
onboarding-choose_mounting-auto_mounting-description = 这将需要你做2个动作以自动检测所有追踪器的佩戴方向
onboarding-choose_mounting-manual_mounting = 手动设置佩戴方向
-# Italized text
-onboarding-choose_mounting-manual_mounting-label = 推荐
+# Italicized text
+onboarding-choose_mounting-manual_mounting-label-v2 = 可能不够精确
onboarding-choose_mounting-manual_mounting-description = 这将需要你手动选择每个追踪器的佩戴方向
# Multiline text
onboarding-choose_mounting-manual_modal-title = 确定要进行自动佩戴校准?
@@ -844,14 +939,14 @@ onboarding-choose_proportions-description-v1 =
如果保存的身体比例和实际身体尺寸不匹配,追踪精度将会下降,并且会出现脚在地面滑动,或是身体和虚拟形象动作不一致的情况。
身体比例设置只要进行一次! 除非身体比例存在错误或是身体尺寸发生了改变,否则不需要重复进行身体比例设置。
onboarding-choose_proportions-auto_proportions = 自动调整身体比例
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = 推荐
onboarding-choose_proportions-auto_proportions-descriptionv3 =
这将录制你的运动样本并通过算法来推测你的身体比例。
需要戴上头戴设备,并确保设备已连接到 SlimeVR!
onboarding-choose_proportions-manual_proportions = 手动调整身体比例
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = 用于精细调整
onboarding-choose_proportions-manual_proportions-description = 这将需要你手动修改以调整你的身体比例
onboarding-choose_proportions-export = 导出身体比例
@@ -954,6 +1049,7 @@ status_system-StatusSteamVRDisconnected =
*[other] 尚未通过 SlimeVR 驱动程序连接到 SteamVR
}
status_system-StatusTrackerError = { $trackerName } 追踪器发生错误
+status_system-StatusUnassignedHMD = VR头显应被分配为头部追踪器。
## Tray Menu
diff --git a/gui/public/i18n/zh-Hant/translation.ftl b/gui/public/i18n/zh-Hant/translation.ftl
index e38d84361..e345487fe 100644
--- a/gui/public/i18n/zh-Hant/translation.ftl
+++ b/gui/public/i18n/zh-Hant/translation.ftl
@@ -13,17 +13,17 @@ websocket-connection_lost = 與伺服器的連線已中斷,正在嘗試重新
## Update notification
version_update-title = 有可用的新版本:{ $version }
-version_update-description = 按下「{ version_update-update }」將為您下載 SlimeVR 安裝程式。
+version_update-description = 按下「{ version_update-update }」將為你下載 SlimeVR 安裝程式。
version_update-update = 更新
version_update-close = 關閉
## Tips
-tips-find_tracker = 若你不確定手上的追蹤器是哪一個,搖一搖它,對應的項目就會顯示出來。
-tips-do_not_move_heels = 確保你的腳跟在測量過程時不會發生移動!
-tips-file_select = 拖曳檔案或 瀏覽檔案 以使用
-tips-tap_setup = 除了從列表挑選追蹤器以外,您也可以慢慢敲擊 2 次追蹤器來選擇它。
-tips-turn_on_tracker = 您使用的是官方的 SlimeVR 追蹤器嗎?記得要在連接到電腦以後打開追蹤器的電源喔!
+tips-find_tracker = 若你不確定手上的追蹤器是哪一個,搖一搖它,對應的項目會被高亮顯示出來。
+tips-do_not_move_heels = 測量過程中,請勿移動腳跟!
+tips-file_select = 拖曳檔案或 瀏覽檔案 以使用。
+tips-tap_setup = 除了從列表挑選追蹤器以外,你也可以慢慢敲擊 2 次追蹤器來選擇它。
+tips-turn_on_tracker = 你使用的是官方的 SlimeVR 追蹤器嗎?記得要在連接到電腦以後打開追蹤器的電源喔!
tips-failed_webgl = 初始化 WebGL 失敗。
## Body parts
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = 肘部偏移
## Tracker reset buttons
reset-reset_all = 重置軀幹比例
+reset-reset_all_warning =
+ 警告: 這會將軀幹比例重置為僅基於身高的比例。
+ 你確定要執行此操作嗎?
+reset-reset_all_warning-reset = 重置軀幹比例
+reset-reset_all_warning-cancel = 取消
reset-full = 完整重置
reset-mounting = 配戴重置
reset-yaw = 左右偏擺重置
@@ -142,9 +147,12 @@ widget-developer_mode-more_info = 更多資訊
## Widget: IMU Visualizer
widget-imu_visualizer = 旋轉
+widget-imu_visualizer-preview = 預覽
+widget-imu_visualizer-hide = 隱藏
widget-imu_visualizer-rotation_raw = 原始旋轉
widget-imu_visualizer-rotation_preview = 預覽
-widget-imu_visualizer-rotation_hide = 隱藏
+widget-imu_visualizer-acceleration = 加速度
+widget-imu_visualizer-position = 位置
## Widget: Skeleton Visualizer
@@ -199,6 +207,13 @@ tracker-infos-hardware_identifier = 硬體 ID
tracker-infos-imu = 慣性測量單元 (IMU)
tracker-infos-board_type = 主板
tracker-infos-network_version = 通訊協定版本
+tracker-infos-magnetometer = 磁力計
+tracker-infos-magnetometer-status-v1 =
+ { $status ->
+ [DISABLED] 已停用
+ [ENABLED] 已啟用
+ *[NOT_SUPPORTED] 不支援
+ }
## Tracker settings
@@ -213,11 +228,19 @@ tracker-settings-mounting_section-edit = 編輯配戴方式
tracker-settings-drift_compensation_section = 偏移補償
tracker-settings-drift_compensation_section-description = 是否在此追蹤器上套用偏移補償?
tracker-settings-drift_compensation_section-edit = 允許偏移補償
+tracker-settings-use_mag = 允許使用這個追蹤器的磁力計
+# Multiline!
+tracker-settings-use_mag-description =
+ 如果「在追蹤器上啟用磁力計」功能已開啟,是否要在這個追蹤器上啟用它來減緩偏移?切換本選項時請勿關閉追蹤器的電源!
+
+ 請先開啟「在追蹤器上啟用磁力計」功能,點選此處以移動至該設定。
+tracker-settings-use_mag-label = 允許使用這個追蹤器的磁力計
# The . means it's an attribute and it's related to the top key.
# In this case that is the settings for the assignment section.
tracker-settings-name_section = 追蹤器名稱
tracker-settings-name_section-description = 給它起一個可愛的名字吧 ^^
tracker-settings-name_section-placeholder = ↖★煞氣a黑貓☆↘的美味右腿
+tracker-settings-name_section-label = 追蹤器名稱
tracker-settings-forget = 忘記追蹤器
tracker-settings-forget-description = 從 SlimeVR 伺服器程式中移除該追蹤器,且直到重新啟動伺服器前不會再次連接。該追蹤器的設定不會遺失。
tracker-settings-forget-label = 忘記追蹤器
@@ -296,6 +319,7 @@ settings-sidebar-utils = 工具
settings-sidebar-serial = 串列埠終端
settings-sidebar-appearance = 外觀
settings-sidebar-notifications = 通知
+settings-sidebar-advanced = 進階
## SteamVR settings
@@ -323,7 +347,7 @@ settings-general-steamvr-trackers-tracker_toggling-description = 根據目前的
settings-general-steamvr-trackers-tracker_toggling-label = 自動追蹤器分配
settings-general-steamvr-trackers-hands-warning =
警告:手部追蹤器將會取代控制器的追蹤。
- 您確定嗎?
+ 你確定嗎?
settings-general-steamvr-trackers-hands-warning-cancel = 取消
settings-general-steamvr-trackers-hands-warning-done = 確定
@@ -347,9 +371,23 @@ settings-general-tracker_mechanics-yaw-reset-smooth-time = 左右偏擺重置平
settings-general-tracker_mechanics-drift_compensation = 偏移補償
# This cares about multilines
settings-general-tracker_mechanics-drift_compensation-description =
- 套用逆向旋轉以補償陀螺儀的左右偏擺位移。
+ 套用逆向旋轉以補償 IMU 的左右偏擺位移。
你可以更改補償的強度,以及使用幾次以內的重置結果來進行補償。
settings-general-tracker_mechanics-drift_compensation-enabled-label = 偏移補償
+settings-general-tracker_mechanics-drift_compensation-prediction = 偏移補償預測
+# This cares about multilines
+settings-general-tracker_mechanics-drift_compensation-prediction-description =
+ 預測超過先前測量範圍的偏航角漂移補償。
+ 如果跟蹤器在偏航角上持續偏移,請啟用此選項。
+settings-general-tracker_mechanics-drift_compensation-prediction-label = 偏移補償預測
+settings-general-tracker_mechanics-drift_compensation_warning =
+ 警告: 只有在需要頻繁重置(約 5~10 分鐘重置一次)
+ 的時候才開啟此選項。
+
+ 容易頻繁重置的 IMU 包括:
+ Joy-Con、owoTrack、MPU(非近期韌體)。
+settings-general-tracker_mechanics-drift_compensation_warning-cancel = 取消
+settings-general-tracker_mechanics-drift_compensation_warning-done = 了解
settings-general-tracker_mechanics-drift_compensation-amount-label = 補償量
settings-general-tracker_mechanics-drift_compensation-max_resets-label = 使用幾次的重置結果?
settings-general-tracker_mechanics-save_mounting_reset = 儲存自動配戴重置的校正
@@ -357,6 +395,11 @@ settings-general-tracker_mechanics-save_mounting_reset-description =
儲存自動配戴重置的校正,重新啟動 SlimeVR 後不需要再進行校正。
本設定適用於動捕服,因為多次穿戴後追蹤器的位置不會變化。不建議一般使用者使用!
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = 儲存自動配戴重置的校正
+settings-general-tracker_mechanics-use_mag_on_all_trackers = 在有磁力計支援的 IMU 追蹤器上啟用磁力計
+settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
+ 在所有有韌體支援的追蹤器上使用磁力計,在磁場穩定的環境中可以減緩偏移。
+ 開啟此選項後,可以個別在追蹤器選項內停用磁力計。切換此選項時請勿關閉任何一個追蹤器的電源!
+settings-general-tracker_mechanics-use_mag_on_all_trackers-label = 在追蹤器上啟用磁力計
## FK/Tracking settings
@@ -387,27 +430,27 @@ settings-general-fk_settings-reset_settings = 重置設定
settings-general-fk_settings-reset_settings-reset_hmd_pitch-description = 進行完整重置時,也重置頭戴顯示器的仰角(垂直旋轉),適用於將頭顯戴在額頭上,以進行虛擬直播或是動作捕捉的情境。若用於 VR 請勿啟用本設定。
settings-general-fk_settings-reset_settings-reset_hmd_pitch = 重置頭戴顯示器仰角
settings-general-fk_settings-arm_fk-reset_mode-description = 更改配戴重置時,手臂需要做出的姿勢。
-settings-general-fk_settings-arm_fk-back = 收肘姿勢
-settings-general-fk_settings-arm_fk-back-description = 預設模式,重置時手肘朝後,前臂向前。
-settings-general-fk_settings-arm_fk-tpose_up = T 型姿勢(抬起)
-settings-general-fk_settings-arm_fk-tpose_up-description = 完整重置時手臂向下,呈立正姿勢;配戴重置時手臂向兩側伸展,與身體呈 90 度。
-settings-general-fk_settings-arm_fk-tpose_down = T 型姿勢(放下)
-settings-general-fk_settings-arm_fk-tpose_down-description = 完整重置時手臂向兩側伸展,與身體呈 90 度;配戴重置時手臂向下,呈立正姿勢。
-settings-general-fk_settings-arm_fk-forward = 向前伸展
-settings-general-fk_settings-arm_fk-forward-description = 重置時手臂向前伸展,與身體呈 90 度,可用於坐姿進行虛擬直播。
+settings-general-fk_settings-arm_fk-back = 向後彎折
+settings-general-fk_settings-arm_fk-back-description = 預設模式,重置時手肘朝後,前臂向前,類似滑雪。
+settings-general-fk_settings-arm_fk-tpose_up = T-pose(抬起)
+settings-general-fk_settings-arm_fk-tpose_up-description = 完整重置時手臂向下,呈立正姿勢;配戴重置時手臂向兩側伸平。
+settings-general-fk_settings-arm_fk-tpose_down = T-pose(放下)
+settings-general-fk_settings-arm_fk-tpose_down-description = 完整重置時手臂向兩側伸平;配戴重置時手臂向下,呈立正姿勢。
+settings-general-fk_settings-arm_fk-forward = 向前伸平
+settings-general-fk_settings-arm_fk-forward-description = 重置時手臂向前伸平,有利於坐姿進行虛擬直播。
settings-general-fk_settings-skeleton_settings-toggles = 骨架設定
-settings-general-fk_settings-skeleton_settings-description = 開啟或關閉骨架設定。建議保持這些設定開啟。
+settings-general-fk_settings-skeleton_settings-description = 開啟或關閉骨架設定。建議保持以下設定開啟。
settings-general-fk_settings-skeleton_settings-extended_spine_model = 延伸脊椎模型
settings-general-fk_settings-skeleton_settings-extended_pelvis_model = 延伸骨盆模型
settings-general-fk_settings-skeleton_settings-extended_knees_model = 延伸膝蓋模型
settings-general-fk_settings-skeleton_settings-ratios = 骨架比例
-settings-general-fk_settings-skeleton_settings-ratios-description = 修改骨架設定的參數,您可能需要在修改後調整軀幹比例。
+settings-general-fk_settings-skeleton_settings-ratios-description = 修改骨架設定的參數,你可能需要在修改後調整軀幹比例。
settings-general-fk_settings-skeleton_settings-impute_waist_from_chest_hip = 推算腰部定位時,胸部與臀部定位使用的比例
settings-general-fk_settings-skeleton_settings-impute_waist_from_chest_legs = 推算腰部定位時,胸部與腿部定位使用的比例
settings-general-fk_settings-skeleton_settings-impute_hip_from_chest_legs = 推算臀部定位時,胸部與腿部定位使用的比例
settings-general-fk_settings-skeleton_settings-impute_hip_from_waist_legs = 推算臀部定位時, 腰部與腿部定位使用的比例
settings-general-fk_settings-skeleton_settings-interp_hip_legs = 臀部的偏航軸與翻滾軸,與腿部定位平均的比例
-settings-general-fk_settings-skeleton_settings-interp_knee_tracker_ankle = 膝部的偏航軸與翻滾軸,與腳踝定位平均的比例
+settings-general-fk_settings-skeleton_settings-interp_knee_tracker_ankle = 膝部追蹤器的偏航軸與翻滾軸,與腳踝定位平均的比例
settings-general-fk_settings-skeleton_settings-interp_knee_ankle = 膝部的偏航軸與翻滾軸,與腳踝定位平均的比例
settings-general-fk_settings-self_localization-title = 動作捕捉模式
settings-general-fk_settings-self_localization-description = 動作捕捉模式允許在沒有頭戴顯示器或其他追蹤器時,粗略的追蹤身體骨架的定位。請注意,本功能需要腳部與頭部的追蹤器,並且本功能仍在實驗階段。
@@ -436,8 +479,8 @@ settings-general-gesture_control-fullResetEnabled = 敲擊以完整重置
settings-general-gesture_control-fullResetDelay = 完整重置延遲
settings-general-gesture_control-fullResetTaps = 完整重置敲擊次數
settings-general-gesture_control-mountingResetEnabled = 敲擊以配戴重置
-settings-general-gesture_control-mountingResetDelay = 重置佩戴延遲
-settings-general-gesture_control-mountingResetTaps = 重置佩戴敲擊次數
+settings-general-gesture_control-mountingResetDelay = 重置配戴延遲
+settings-general-gesture_control-mountingResetTaps = 重置配戴敲擊次數
# The number of trackers that can have higher acceleration before a tap is rejected
settings-general-gesture_control-numberTrackersOverThreshold = 觸發敲擊判定的最多追蹤器數量
settings-general-gesture_control-numberTrackersOverThreshold-description = 如果敲擊偵測無法作動,請嘗試增加此值以降低敲擊判定的門檻。為避免誤判,請勿設定超過所需要的數值。
@@ -449,6 +492,9 @@ settings-general-interface-dev_mode = 開發者模式
settings-general-interface-dev_mode-description = 本功能會提供更深入的資料,也能與已連線的追蹤器進行更進一步的控制。
settings-general-interface-dev_mode-label = 開發者模式
settings-general-interface-theme = 佈景主題色彩
+settings-general-interface-show-navbar-onboarding = 在導覽列上顯示「{ navbar-onboarding }」
+settings-general-interface-show-navbar-onboarding-description = 本選項變更 「{ navbar-onboarding }」 按鈕是否要顯示在導覽列上。
+settings-general-interface-show-navbar-onboarding-label = 顯示「{ navbar-onboarding }」
settings-general-interface-lang = 選擇語言
settings-general-interface-lang-description = 更改所使用的介面語言。
settings-general-interface-lang-placeholder = 選擇要使用的語言
@@ -460,6 +506,9 @@ settings-interface-appearance-font-os_font = 作業系統字體
settings-interface-appearance-font-slime_font = 預設字體
settings-interface-appearance-font_size = 文字縮放
settings-interface-appearance-font_size-description = 本設定會影響整個 UI 的文字大小,除了本設定面板以外。
+settings-interface-appearance-decorations = 使用系統原生的視窗邊框
+settings-interface-appearance-decorations-description = 不顯示標題列 UI,替換成作業系統提供的標題列。
+settings-interface-appearance-decorations-label = 使用原生的視窗邊框
## Notification settings
@@ -475,10 +524,10 @@ settings-general-interface-connected_trackers_warning = 已連接追蹤器警告
settings-general-interface-connected_trackers_warning-description = 啟用本選項後,每次當退出 SlimeVR 時仍有追蹤器連接著會顯示通知,提醒你在使用完畢時關閉追蹤器電源來節省電池電量。
settings-general-interface-connected_trackers_warning-label = 當退出程式時,有追蹤器連接中則顯示警告
settings-general-interface-use_tray = 最小化到系統列
-settings-general-interface-use_tray-description = 本選項可以讓您在關閉視窗時不會關閉 SlimeVR 的伺服器程式,讓您在不受圖形介面的打擾下繼續使用追蹤器。
+settings-general-interface-use_tray-description = 本選項可以讓你在關閉視窗時不會關閉 SlimeVR 的伺服器程式,讓你在不受圖形介面的打擾下繼續使用追蹤器。
settings-general-interface-use_tray-label = 最小化到系統列
settings-general-interface-discord_presence = 在 Discord 上分享活動
-settings-general-interface-discord_presence-description = 在 Discord 上顯示您正在使用 SlimeVR,以及使用中的追蹤器的數量。
+settings-general-interface-discord_presence-description = 在 Discord 上顯示你正在使用 SlimeVR,以及使用中的追蹤器的數量。
settings-general-interface-discord_presence-label = 在 Discord 上分享活動
settings-general-interface-discord_presence-message =
{ $amount ->
@@ -600,6 +649,36 @@ settings-osc-vmc-mirror_tracking = 鏡像追蹤
settings-osc-vmc-mirror_tracking-description = 將追蹤的結果水平鏡像。
settings-osc-vmc-mirror_tracking-label = 鏡像追蹤
+## Advanced settings
+
+settings-utils-advanced = 進階
+settings-utils-advanced-reset-gui = 重置 UI 設定
+settings-utils-advanced-reset-gui-description = 將 UI 設定恢復成預設值。
+settings-utils-advanced-reset-gui-label = 重置 UI 設定
+settings-utils-advanced-reset-server = 重置追蹤設定
+settings-utils-advanced-reset-server-description = 將追蹤設定恢復成預設值。
+settings-utils-advanced-reset-server-label = 重置追蹤設定
+settings-utils-advanced-reset-all = 重置全部設定
+settings-utils-advanced-reset-all-description = 將 UI 與追蹤設定恢復成預設值。
+settings-utils-advanced-reset-all-label = 重置全部設定
+settings-utils-advanced-reset_warning =
+ { $type ->
+ [gui]
+ 警告: 這會將 UI 設定重置為預設值。
+ 你確定要執行此操作嗎?
+ [server]
+ 警告: 這會將追蹤設定重置為預設值。
+ 你確定要執行此操作嗎?
+ *[all]
+ 警告: 這會將所有設定重置為預設值。
+ 你確定要執行此操作嗎?
+ }
+settings-utils-advanced-reset_warning-reset = 重置設定
+settings-utils-advanced-reset_warning-cancel = 取消
+settings-utils-advanced-open_data = 數據資料夾
+settings-utils-advanced-open_data-description = 在檔案管理器中開啟 SlimeVR 的數據資料夾,該資料夾包含設定與記錄檔。
+settings-utils-advanced-open_data-label = 打開資料夾
+
## Setup/onboarding menu
onboarding-skip = 跳過設定
@@ -608,7 +687,7 @@ onboarding-wip = 施工中
onboarding-previous_step = 上一步
onboarding-setup_warning =
警告:若要有良好的追蹤效果,必須進行初始設定,
- 如果這是您是第一次使用 SlimeVR,請繼續進行設定。
+ 若是第一次使用 SlimeVR,請繼續進行設定。
onboarding-setup_warning-skip = 跳過設定
onboarding-setup_warning-cancel = 繼續設定
@@ -633,7 +712,7 @@ onboarding-wifi_creds-password =
onboarding-reset_tutorial-back = 返回到配戴校正
onboarding-reset_tutorial = 重置教學
-onboarding-reset_tutorial-explanation = 當您使用追蹤器時追蹤器可能會跑位,原因來自於慣性測量單元 (IMU) 產生了左右飄移,或是您移動了追蹤器的實體位置。您有幾種方法來修正這個問題。
+onboarding-reset_tutorial-explanation = 當你使用追蹤器時追蹤器可能會跑位,原因來自於慣性測量單元 (IMU) 產生了左右飄移,或是你移動了追蹤器的實體位置。你有幾種方法來修正這個問題。
onboarding-reset_tutorial-skip = 跳過本步驟
# Cares about multiline
onboarding-reset_tutorial-0 =
@@ -650,7 +729,7 @@ onboarding-reset_tutorial-1 =
onboarding-reset_tutorial-2 =
對所標記之追蹤器敲擊 { $taps } 次即可觸發配戴重置。
- 配戴重置能對追蹤器實際的配戴方式進行調整,因此若您不小心移動到追蹤器,或是大幅度的變更配戴方向,這個功能會有所幫助。
+ 配戴重置能對追蹤器實際的配戴方式進行調整,因此若你不小心移動到追蹤器,或是大幅度的變更配戴方向,這個功能會有所幫助。
做此校正時需要進行滑雪姿勢,如自動配戴校正的畫面所示。在觸發 3 秒後(可修改)才會真正進行重置。
@@ -676,7 +755,7 @@ onboarding-done-close = 關閉設定
onboarding-connect_tracker-back = 返回到 Wi-Fi 認證資訊設定
onboarding-connect_tracker-title = 連接追蹤器
-onboarding-connect_tracker-description-p0-v1 = 來到了我第二喜歡的環節,連接追蹤器!
+onboarding-connect_tracker-description-p0-v1 = 現在來到有趣的部分,連接追蹤器!
onboarding-connect_tracker-description-p1-v1 = 透過 USB 埠,一次連接一個追蹤器。
onboarding-connect_tracker-issue-serial = 我在連接時碰到問題了!
onboarding-connect_tracker-usb = USB 追蹤器
@@ -704,12 +783,13 @@ onboarding-connect_tracker-next = 所有的追蹤器都連接好了
onboarding-calibration_tutorial = IMU 校正教學
onboarding-calibration_tutorial-subtitle = 進行這項操作可以有效減少追蹤器發生飄移的機會
-onboarding-calibration_tutorial-description = 每次在打開追蹤器的開關時,需要將追蹤器放置在平面一會兒來進行自動校正。您也可以透過按下「{ onboarding-calibration_tutorial-calibrate }」按鈕來進行手動校正,校正過程中請勿移動追蹤器。
+onboarding-calibration_tutorial-description = 每次在打開追蹤器的開關時,需要將追蹤器平置一下來進行自動校正。你也可以透過按下「{ onboarding-calibration_tutorial-calibrate }」按鈕來進行手動校正,校正過程中請勿移動追蹤器。
onboarding-calibration_tutorial-calibrate = 追蹤器已經放置在桌上了
-onboarding-calibration_tutorial-status-waiting = 正在等待您完成動作
+onboarding-calibration_tutorial-status-waiting = 正在等待你完成動作
onboarding-calibration_tutorial-status-calibrating = 校正中
onboarding-calibration_tutorial-status-success = 很好,校正完成了!
onboarding-calibration_tutorial-status-error = 追蹤器移動了
+onboarding-calibration_tutorial-skip = 跳過導覽
## Tracker assignment tutorial
@@ -757,66 +837,66 @@ onboarding-assign_trackers-option-description =
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-LEFT_FOOT =
{ $unassigned ->
- [0] 左腳已分配,但您還需要分配左腳踝、左大腿和胸部、臀部或腰部!
- [1] 左腳已分配,但您還需要分配左大腿和胸部、臀部或腰部!
- [2] 左腳已分配,但您還需要分配左腳踝和胸部、臀部或腰部!
- [3] 左腳已分配,但您還需要分配胸部、臀部或腰部!
- [4] 左腳已分配,但您還需要分配左腳踝和左大腿!
- [5] 左腳已分配,但您還需要分配左大腿!
- [6] 左腳已分配,但您還需要分配左腳踝!
- *[unknown] 左腳已分配,但您還需要分配其它未分配的身體部位!
+ [0] 左腳已分配,但你還需要分配左腳踝、左大腿和胸部、臀部或腰部!
+ [1] 左腳已分配,但你還需要分配左大腿和胸部、臀部或腰部!
+ [2] 左腳已分配,但你還需要分配左腳踝和胸部、臀部或腰部!
+ [3] 左腳已分配,但你還需要分配胸部、臀部或腰部!
+ [4] 左腳已分配,但你還需要分配左腳踝和左大腿!
+ [5] 左腳已分配,但你還需要分配左大腿!
+ [6] 左腳已分配,但你還需要分配左腳踝!
+ *[unknown] 左腳已分配,但你還需要分配其它未分配的身體部位!
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-RIGHT_FOOT =
{ $unassigned ->
- [0] 右腳已分配,但您還需要分配右腳踝、右大腿以及胸部、臀部或腰部!
- [1] 右腳已分配,但您還需要分配右大腿和胸部、臀部或腰部!
- [2] 右腳已分配,但您還需要分配右腳踝和胸部、臀部或腰部!
- [3] 右腳已分配,但您還需要分配胸部、臀部或腰部!
- [4] 右腳已分配,但您還需要分配右腳踝和右大腿!
- [5] 右腳已分配,但您還需要分配右大腿!
- [6] 右腳已分配,但您還需要分配右腳踝!
- *[unknown] 右腳已分配,但您還需要分配其它未分配的身體部位!
+ [0] 右腳已分配,但你還需要分配右腳踝、右大腿以及胸部、臀部或腰部!
+ [1] 右腳已分配,但你還需要分配右大腿和胸部、臀部或腰部!
+ [2] 右腳已分配,但你還需要分配右腳踝和胸部、臀部或腰部!
+ [3] 右腳已分配,但你還需要分配胸部、臀部或腰部!
+ [4] 右腳已分配,但你還需要分配右腳踝和右大腿!
+ [5] 右腳已分配,但你還需要分配右大腿!
+ [6] 右腳已分配,但你還需要分配右腳踝!
+ *[unknown] 右腳已分配,但你還需要分配其它未分配的身體部位!
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-LEFT_LOWER_LEG =
{ $unassigned ->
- [0] 左腳踝已分配,但您還需要分配左大腿和胸部、臀部或腰部!
- [1] 左腳踝已分配,但您還需要分配胸部、臀部或腰部!
- [2] 左腳踝已分配,但您還需要分配左大腿!
- *[unknown] 左腳踝已分配,但您還需要分配其它未分配的身體部位!
+ [0] 左腳踝已分配,但你還需要分配左大腿和胸部、臀部或腰部!
+ [1] 左腳踝已分配,但你還需要分配胸部、臀部或腰部!
+ [2] 左腳踝已分配,但你還需要分配左大腿!
+ *[unknown] 左腳踝已分配,但你還需要分配其它未分配的身體部位!
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-RIGHT_LOWER_LEG =
{ $unassigned ->
- [0] 右腳踝已分配,但您還需要分配右大腿和胸部、臀部或腰部!
- [1] 右腳踝已分配,但您還需要分配胸部、臀部或腰部!
- [2] 右腳踝已分配,但您還需要分配右大腿!
- *[unknown] 右腳踝已分配,但您還需要分配其它未分配的身體部位!
+ [0] 右腳踝已分配,但你還需要分配右大腿和胸部、臀部或腰部!
+ [1] 右腳踝已分配,但你還需要分配胸部、臀部或腰部!
+ [2] 右腳踝已分配,但你還需要分配右大腿!
+ *[unknown] 右腳踝已分配,但你還需要分配其它未分配的身體部位!
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-LEFT_UPPER_LEG =
{ $unassigned ->
- [0] 左大腿已分配,但您還需要分配胸部、臀部或腰部!
- *[unknown] 左大腿已分配,但您還需要分配其它未分配的身體部位!
+ [0] 左大腿已分配,但你還需要分配胸部、臀部或腰部!
+ *[unknown] 左大腿已分配,但你還需要分配其它未分配的身體部位!
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-RIGHT_UPPER_LEG =
{ $unassigned ->
- [0] 右大腿已分配,但您還需要分配胸部、臀部或腰部!
- *[unknown] 右大腿已分配,但您還需要分配其它未分配的身體部位!
+ [0] 右大腿已分配,但你還需要分配胸部、臀部或腰部!
+ *[unknown] 右大腿已分配,但你還需要分配其它未分配的身體部位!
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-HIP =
{ $unassigned ->
- [0] 臀部已分配,但您還需要分配胸部!
- *[unknown] 臀部已分配,但您還需要分配其它未分配的身體部位!
+ [0] 臀部已分配,但你還需要分配胸部!
+ *[unknown] 臀部已分配,但你還需要分配其它未分配的身體部位!
}
# $unassigned (Number) - Bits are based on BodyAssignment.ASSIGNMENT_RULES order
onboarding-assign_trackers-warning-WAIST =
{ $unassigned ->
- [0] 腰部已分配,但您還需要分配胸部!
- *[unknown] 腰部已分配,但您還需要分配其它未分配的身體部位!
+ [0] 腰部已分配,但你還需要分配胸部!
+ *[unknown] 腰部已分配,但你還需要分配其它未分配的身體部位!
}
## Tracker mounting method choose
@@ -825,11 +905,11 @@ onboarding-choose_mounting = 要使用哪一種配戴校正方式?
# Multiline text
onboarding-choose_mounting-description = 配戴校正可以校正追蹤器放在身上的位置。
onboarding-choose_mounting-auto_mounting = 自動配戴校正
-# Italized text
+# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = 推薦使用
onboarding-choose_mounting-auto_mounting-description = 本選項會透過兩個身體姿勢,判斷所有追蹤器的配戴方位
onboarding-choose_mounting-manual_mounting = 手動配戴校正
-# Italized text
+# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = 可能不夠精確
onboarding-choose_mounting-manual_mounting-description = 本選項可以讓你選擇每個追蹤器的配戴方位
# Multiline text
@@ -850,7 +930,7 @@ onboarding-manual_mounting-next = 下一步
onboarding-automatic_mounting-back = 返回到進入 VR
onboarding-automatic_mounting-title = 配戴校正
-onboarding-automatic_mounting-description = 為了讓 SlimeVR 追蹤器正常運作,我們需要為每個追蹤器設定配戴方向,以符合您實際的追蹤器配戴方式。
+onboarding-automatic_mounting-description = 為了讓 SlimeVR 追蹤器正常運作,我們需要為每個追蹤器設定配戴方向,以符合你實際的追蹤器配戴方式。
onboarding-automatic_mounting-manual_mounting = 進行手動設定
onboarding-automatic_mounting-next = 下一步
onboarding-automatic_mounting-prev_step = 上一步
@@ -873,17 +953,17 @@ onboarding-choose_proportions = 要使用哪一種軀幹比例的校正方式?
# Multiline string
onboarding-choose_proportions-description-v1 =
軀幹比例用於取得身體各個部位的長短,為計算追蹤器的位置而有所必要。
- 當您的軀幹比例與設定的比例有差異時,追蹤精確度會變差,您可能會注意到出現腳滑溜冰的情形,或者你的身體與你的虛擬角色對不太上。
+ 當你的軀幹比例與設定的比例有差異時,追蹤精確度會變差,你可能會注意到出現腳滑溜冰的情形,或者你的身體與你的虛擬角色對不太上。
軀幹比例的測量只需要進行一次!除非設定有誤,或是身材有明顯變化,本設定不需要重複進行。
onboarding-choose_proportions-auto_proportions = 自動軀幹比例校正
-# Italized text
+# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = 推薦使用
onboarding-choose_proportions-auto_proportions-descriptionv3 =
- 本選項會從您的身體動作錄製一段樣本,並通過演算法來推算您的軀幹比例。
+ 本選項會從你的身體動作錄製一段樣本,並通過演算法來推算你的軀幹比例。
使用本功能需要連接頭戴顯示器到 SlimeVR,並且配戴在頭部!
onboarding-choose_proportions-manual_proportions = 手動軀幹比例校正
-# Italized text
+# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = 適合進行微調
onboarding-choose_proportions-manual_proportions-description = 本選項可以讓你直接修改軀幹比例的設定值
onboarding-choose_proportions-export = 匯出軀幹比例
@@ -921,18 +1001,18 @@ onboarding-automatic_proportions-requirements-descriptionv2 =
頭戴顯示器會回報定位資料給 SlimeVR 伺服器(通常為執行 SteamVR 並透過 SlimeVR 的 SteamVR 驅動程式來連接 SlimeVR)。
追蹤狀態正常且能反映你的移動姿態(例如,進行完全重置後,踢腿、彎曲、坐下時的肢體方向是正確的)。
onboarding-automatic_proportions-requirements-next = 我已閱讀使用需求
-onboarding-automatic_proportions-check_height-title = 檢查您的身高
-onboarding-automatic_proportions-check_height-description = 我們會透過頭戴顯示器回報的高度來推算您的實際身高,但仍建議檢查數值是否正確。
+onboarding-automatic_proportions-check_height-title = 檢查你的身高
+onboarding-automatic_proportions-check_height-description = 我們會透過頭戴顯示器回報的高度來推算你的實際身高,但仍建議檢查數值是否正確。
# All the text is in bold!
-onboarding-automatic_proportions-check_height-calculation_warning = 請站直並按下按鈕以計算身高,按下按鈕後您有 3 秒鐘來調整姿勢。
-onboarding-automatic_proportions-check_height-guardian_tip = 如果您使用的是一體式 VR 頭顯,請確認頭盔的守護神/邊界設定已經開啟,以確保身高能正確測量。
+onboarding-automatic_proportions-check_height-calculation_warning = 請站直並按下按鈕以計算身高,按下按鈕後你有 3 秒鐘來調整姿勢。
+onboarding-automatic_proportions-check_height-guardian_tip = 如果你使用的是一體式 VR 頭顯,請確認頭盔的守護神/邊界設定已經開啟,以確保身高能正確測量。
onboarding-automatic_proportions-check_height-fetch_height = 我站著了!
# Context is that the height is unknown
onboarding-automatic_proportions-check_height-unknown = 不明
# Shows an element below it
-onboarding-automatic_proportions-check_height-hmd_height1 = 您的頭戴顯示器高度是
+onboarding-automatic_proportions-check_height-hmd_height1 = 你的頭戴顯示器高度是
# Shows an element below it
-onboarding-automatic_proportions-check_height-height1 = 所以您的實際身高是
+onboarding-automatic_proportions-check_height-height1 = 所以你的實際身高是
onboarding-automatic_proportions-check_height-next_step = 數值沒問題
onboarding-automatic_proportions-start_recording-title = 準備擺動作囉
onboarding-automatic_proportions-start_recording-description = 我們現在要記錄一些特定的姿勢和動作,將會在下一個畫面中提示。當按鈕被按下時,準備好開始!
@@ -959,9 +1039,10 @@ onboarding-automatic_proportions-verify_results-redo = 重新錄製
onboarding-automatic_proportions-verify_results-confirm = 看起來沒問題
onboarding-automatic_proportions-done-title = 身體資料已測量並儲存。
onboarding-automatic_proportions-done-description = 你的身體比例校正已完成!
-onboarding-automatic_proportions-error_modal =
- 警告: 推算軀幹比例時發生錯誤。
- 請閱讀文件或加入我們的 Discord 伺服器以尋求協助 ^_^
+onboarding-automatic_proportions-error_modal-v2 =
+ 警告:推算軀幹比例時發生錯誤!
+ 這有可能是配戴校正的問題,請確保追蹤功能運作正常之後再試一次。
+ 請檢閱文件或加入我們的 Discord 以尋求幫助 ^_^
onboarding-automatic_proportions-error_modal-confirm = 瞭解!
## Home
@@ -985,7 +1066,7 @@ status_system-StatusSteamVRDisconnected =
[steamvr_feeder] 尚未連接 SlimeVR 資料迴送程式。
*[other] 尚未透過 SlimeVR 驅動程式連接到 SteamVR。
}
-status_system-StatusTrackerError = { $trackerName } 追蹤器發生錯誤
+status_system-StatusTrackerError = 追蹤器{ $trackerName }發生錯誤
status_system-StatusUnassignedHMD = VR 頭戴顯示器應被分配為頭部追蹤器。
## Tray Menu
@@ -999,7 +1080,7 @@ tray_menu-quit = 離開
tray_or_exit_modal-title = 關閉視窗的動作是什麼?
# Multiline text
tray_or_exit_modal-description =
- 您可以選擇在關閉視窗時,一併退出伺服器程式,或是將視窗最小化到系統列圖示中。
+ 你可以選擇在關閉視窗時,一併退出伺服器程式,或是將視窗最小化到系統列圖示中。
本設定之後也可以在使用者介面設定中更改。
tray_or_exit_modal-radio-exit = 退出 SlimeVR
diff --git a/gui/src/components/commons/BodyPartIcon.tsx b/gui/src/components/commons/BodyPartIcon.tsx
index 8bfbbde48..87a01ea47 100644
--- a/gui/src/components/commons/BodyPartIcon.tsx
+++ b/gui/src/components/commons/BodyPartIcon.tsx
@@ -15,6 +15,7 @@ import { UpperArmIcon } from './icon/UpperArmIcon';
import { UpperLegIcon } from './icon/UpperLegIcon';
import { WaistIcon } from './icon/WaistIcon';
import { UpperChestIcon } from './icon/UpperChestIcon';
+import { FingersIcon } from './icon/FingersIcon';
// All body parts that are right or left, are by default left!
export const mapPart: Record<
@@ -86,6 +87,96 @@ export const mapPart: Record<
),
[BodyPart.WAIST]: ({ width }) => ,
+ [BodyPart.LEFT_THUMB_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_THUMB_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_THUMB_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_INDEX_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_INDEX_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_INDEX_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_MIDDLE_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_MIDDLE_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_MIDDLE_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_RING_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_RING_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_RING_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_LITTLE_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_LITTLE_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_LITTLE_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_THUMB_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_THUMB_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_THUMB_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_INDEX_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_INDEX_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_INDEX_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_MIDDLE_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_MIDDLE_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_MIDDLE_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_RING_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_RING_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_RING_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_LITTLE_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_LITTLE_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_LITTLE_DISTAL]: ({ width }) => (
+
+ ),
};
export function BodyPartIcon({
diff --git a/gui/src/components/commons/icon/FingersIcon.tsx b/gui/src/components/commons/icon/FingersIcon.tsx
new file mode 100644
index 000000000..bd25c88ee
--- /dev/null
+++ b/gui/src/components/commons/icon/FingersIcon.tsx
@@ -0,0 +1,15 @@
+export function FingersIcon({ width = 28 }: { width?: number }) {
+ return (
+
+ );
+}
diff --git a/gui/src/components/onboarding/pages/mounting/MountingSelectionMenu.tsx b/gui/src/components/onboarding/pages/mounting/MountingSelectionMenu.tsx
index 11609f618..292b275b3 100644
--- a/gui/src/components/onboarding/pages/mounting/MountingSelectionMenu.tsx
+++ b/gui/src/components/onboarding/pages/mounting/MountingSelectionMenu.tsx
@@ -10,6 +10,7 @@ import { SlimeUpIcon } from '@/components/commons/icon/SlimeUpIcon';
import { BodyPart } from 'solarxr-protocol';
import { PawIcon } from '@/components/commons/icon/PawIcon';
import { useLocaleConfig } from '@/i18n/config';
+import { FingersIcon } from '@/components/commons/icon/FingersIcon';
// All body parts that are right or left, are by default left!
export const mapPart: Record<
@@ -97,6 +98,96 @@ export const mapPart: Record<
),
[BodyPart.WAIST]: ({ width }) => ,
+ [BodyPart.LEFT_THUMB_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_THUMB_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_THUMB_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_INDEX_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_INDEX_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_INDEX_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_MIDDLE_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_MIDDLE_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_MIDDLE_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_RING_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_RING_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_RING_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_LITTLE_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_LITTLE_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.LEFT_LITTLE_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_THUMB_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_THUMB_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_THUMB_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_INDEX_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_INDEX_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_INDEX_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_MIDDLE_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_MIDDLE_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_MIDDLE_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_RING_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_RING_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_RING_DISTAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_LITTLE_PROXIMAL]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_LITTLE_INTERMEDIATE]: ({ width }) => (
+
+ ),
+ [BodyPart.RIGHT_LITTLE_DISTAL]: ({ width }) => (
+
+ ),
};
export function MountingBodyPartIcon({
diff --git a/gui/src/utils/skeletonHelper.ts b/gui/src/utils/skeletonHelper.ts
index 578174b75..4f93a8203 100644
--- a/gui/src/utils/skeletonHelper.ts
+++ b/gui/src/utils/skeletonHelper.ts
@@ -223,6 +223,37 @@ export class BoneKind extends Bone {
case BodyPart.LEFT_HIP:
case BodyPart.RIGHT_HIP:
return new Color('pink');
+ case BodyPart.LEFT_THUMB_PROXIMAL:
+ case BodyPart.LEFT_THUMB_INTERMEDIATE:
+ case BodyPart.LEFT_THUMB_DISTAL:
+ case BodyPart.LEFT_INDEX_PROXIMAL:
+ case BodyPart.LEFT_INDEX_INTERMEDIATE:
+ case BodyPart.LEFT_INDEX_DISTAL:
+ case BodyPart.LEFT_MIDDLE_PROXIMAL:
+ case BodyPart.LEFT_MIDDLE_INTERMEDIATE:
+ case BodyPart.LEFT_MIDDLE_DISTAL:
+ case BodyPart.LEFT_RING_PROXIMAL:
+ case BodyPart.LEFT_RING_INTERMEDIATE:
+ case BodyPart.LEFT_RING_DISTAL:
+ case BodyPart.LEFT_LITTLE_PROXIMAL:
+ case BodyPart.LEFT_LITTLE_INTERMEDIATE:
+ case BodyPart.LEFT_LITTLE_DISTAL:
+ case BodyPart.RIGHT_THUMB_PROXIMAL:
+ case BodyPart.RIGHT_THUMB_INTERMEDIATE:
+ case BodyPart.RIGHT_THUMB_DISTAL:
+ case BodyPart.RIGHT_INDEX_PROXIMAL:
+ case BodyPart.RIGHT_INDEX_INTERMEDIATE:
+ case BodyPart.RIGHT_INDEX_DISTAL:
+ case BodyPart.RIGHT_MIDDLE_PROXIMAL:
+ case BodyPart.RIGHT_MIDDLE_INTERMEDIATE:
+ case BodyPart.RIGHT_MIDDLE_DISTAL:
+ case BodyPart.RIGHT_RING_PROXIMAL:
+ case BodyPart.RIGHT_RING_INTERMEDIATE:
+ case BodyPart.RIGHT_RING_DISTAL:
+ case BodyPart.RIGHT_LITTLE_PROXIMAL:
+ case BodyPart.RIGHT_LITTLE_INTERMEDIATE:
+ case BodyPart.RIGHT_LITTLE_DISTAL:
+ return new Color('pink');
}
}
@@ -275,8 +306,81 @@ export class BoneKind extends Bone {
case BodyPart.RIGHT_LOWER_ARM:
return [BodyPart.RIGHT_HAND];
case BodyPart.LEFT_HAND:
- return [];
+ return [
+ BodyPart.LEFT_THUMB_PROXIMAL,
+ BodyPart.LEFT_INDEX_PROXIMAL,
+ BodyPart.LEFT_MIDDLE_PROXIMAL,
+ BodyPart.LEFT_RING_PROXIMAL,
+ BodyPart.LEFT_LITTLE_PROXIMAL,
+ ];
case BodyPart.RIGHT_HAND:
+ return [
+ BodyPart.RIGHT_THUMB_PROXIMAL,
+ BodyPart.RIGHT_INDEX_PROXIMAL,
+ BodyPart.RIGHT_MIDDLE_PROXIMAL,
+ BodyPart.RIGHT_RING_PROXIMAL,
+ BodyPart.RIGHT_LITTLE_PROXIMAL,
+ ];
+
+ case BodyPart.LEFT_THUMB_PROXIMAL:
+ return [BodyPart.LEFT_THUMB_INTERMEDIATE];
+ case BodyPart.LEFT_THUMB_INTERMEDIATE:
+ return [BodyPart.LEFT_THUMB_DISTAL];
+ case BodyPart.LEFT_THUMB_DISTAL:
+ return [];
+ case BodyPart.LEFT_INDEX_PROXIMAL:
+ return [BodyPart.LEFT_INDEX_INTERMEDIATE];
+ case BodyPart.LEFT_INDEX_INTERMEDIATE:
+ return [BodyPart.LEFT_INDEX_DISTAL];
+ case BodyPart.LEFT_INDEX_DISTAL:
+ return [];
+ case BodyPart.LEFT_MIDDLE_PROXIMAL:
+ return [BodyPart.LEFT_MIDDLE_INTERMEDIATE];
+ case BodyPart.LEFT_MIDDLE_INTERMEDIATE:
+ return [BodyPart.LEFT_MIDDLE_DISTAL];
+ case BodyPart.LEFT_MIDDLE_DISTAL:
+ return [];
+ case BodyPart.LEFT_RING_PROXIMAL:
+ return [BodyPart.LEFT_RING_INTERMEDIATE];
+ case BodyPart.LEFT_RING_INTERMEDIATE:
+ return [BodyPart.LEFT_RING_DISTAL];
+ case BodyPart.LEFT_RING_DISTAL:
+ return [];
+ case BodyPart.LEFT_LITTLE_PROXIMAL:
+ return [BodyPart.LEFT_LITTLE_INTERMEDIATE];
+ case BodyPart.LEFT_LITTLE_INTERMEDIATE:
+ return [BodyPart.LEFT_LITTLE_DISTAL];
+ case BodyPart.LEFT_LITTLE_DISTAL:
+ return [];
+ case BodyPart.RIGHT_THUMB_PROXIMAL:
+ return [BodyPart.RIGHT_THUMB_INTERMEDIATE];
+ case BodyPart.RIGHT_THUMB_INTERMEDIATE:
+ return [BodyPart.RIGHT_THUMB_DISTAL];
+ case BodyPart.RIGHT_THUMB_DISTAL:
+ return [];
+ case BodyPart.RIGHT_INDEX_PROXIMAL:
+ return [BodyPart.RIGHT_INDEX_INTERMEDIATE];
+ case BodyPart.RIGHT_INDEX_INTERMEDIATE:
+ return [BodyPart.RIGHT_INDEX_DISTAL];
+ case BodyPart.RIGHT_INDEX_DISTAL:
+ return [];
+ case BodyPart.RIGHT_MIDDLE_PROXIMAL:
+ return [BodyPart.RIGHT_MIDDLE_INTERMEDIATE];
+ case BodyPart.RIGHT_MIDDLE_INTERMEDIATE:
+ return [BodyPart.RIGHT_MIDDLE_DISTAL];
+ case BodyPart.RIGHT_MIDDLE_DISTAL:
+ return [];
+ case BodyPart.RIGHT_RING_PROXIMAL:
+ return [BodyPart.RIGHT_RING_INTERMEDIATE];
+ case BodyPart.RIGHT_RING_INTERMEDIATE:
+ return [BodyPart.RIGHT_RING_DISTAL];
+ case BodyPart.RIGHT_RING_DISTAL:
+ return [];
+ case BodyPart.RIGHT_LITTLE_PROXIMAL:
+ return [BodyPart.RIGHT_LITTLE_INTERMEDIATE];
+ case BodyPart.RIGHT_LITTLE_INTERMEDIATE:
+ return [BodyPart.RIGHT_LITTLE_DISTAL];
+ case BodyPart.RIGHT_LITTLE_DISTAL:
return [];
}
}
@@ -329,6 +433,67 @@ export class BoneKind extends Bone {
return BodyPart.LEFT_LOWER_ARM;
case BodyPart.RIGHT_HAND:
return BodyPart.RIGHT_LOWER_ARM;
+
+ case BodyPart.LEFT_THUMB_PROXIMAL:
+ return BodyPart.LEFT_HAND;
+ case BodyPart.LEFT_THUMB_INTERMEDIATE:
+ return BodyPart.LEFT_THUMB_PROXIMAL;
+ case BodyPart.LEFT_THUMB_DISTAL:
+ return BodyPart.LEFT_THUMB_INTERMEDIATE;
+ case BodyPart.LEFT_INDEX_PROXIMAL:
+ return BodyPart.LEFT_HAND;
+ case BodyPart.LEFT_INDEX_INTERMEDIATE:
+ return BodyPart.LEFT_INDEX_PROXIMAL;
+ case BodyPart.LEFT_INDEX_DISTAL:
+ return BodyPart.LEFT_INDEX_INTERMEDIATE;
+ case BodyPart.LEFT_MIDDLE_PROXIMAL:
+ return BodyPart.LEFT_HAND;
+ case BodyPart.LEFT_MIDDLE_INTERMEDIATE:
+ return BodyPart.LEFT_MIDDLE_PROXIMAL;
+ case BodyPart.LEFT_MIDDLE_DISTAL:
+ return BodyPart.LEFT_MIDDLE_INTERMEDIATE;
+ case BodyPart.LEFT_RING_PROXIMAL:
+ return BodyPart.LEFT_HAND;
+ case BodyPart.LEFT_RING_INTERMEDIATE:
+ return BodyPart.LEFT_RING_PROXIMAL;
+ case BodyPart.LEFT_RING_DISTAL:
+ return BodyPart.LEFT_RING_INTERMEDIATE;
+ case BodyPart.LEFT_LITTLE_PROXIMAL:
+ return BodyPart.LEFT_HAND;
+ case BodyPart.LEFT_LITTLE_INTERMEDIATE:
+ return BodyPart.LEFT_LITTLE_PROXIMAL;
+ case BodyPart.LEFT_LITTLE_DISTAL:
+ return BodyPart.LEFT_LITTLE_INTERMEDIATE;
+ case BodyPart.RIGHT_THUMB_PROXIMAL:
+ return BodyPart.RIGHT_HAND;
+ case BodyPart.RIGHT_THUMB_INTERMEDIATE:
+ return BodyPart.RIGHT_THUMB_PROXIMAL;
+ case BodyPart.RIGHT_THUMB_DISTAL:
+ return BodyPart.RIGHT_THUMB_INTERMEDIATE;
+ case BodyPart.RIGHT_INDEX_PROXIMAL:
+ return BodyPart.RIGHT_HAND;
+ case BodyPart.RIGHT_INDEX_INTERMEDIATE:
+ return BodyPart.RIGHT_INDEX_PROXIMAL;
+ case BodyPart.RIGHT_INDEX_DISTAL:
+ return BodyPart.RIGHT_INDEX_INTERMEDIATE;
+ case BodyPart.RIGHT_MIDDLE_PROXIMAL:
+ return BodyPart.RIGHT_HAND;
+ case BodyPart.RIGHT_MIDDLE_INTERMEDIATE:
+ return BodyPart.RIGHT_MIDDLE_PROXIMAL;
+ case BodyPart.RIGHT_MIDDLE_DISTAL:
+ return BodyPart.RIGHT_MIDDLE_INTERMEDIATE;
+ case BodyPart.RIGHT_RING_PROXIMAL:
+ return BodyPart.RIGHT_HAND;
+ case BodyPart.RIGHT_RING_INTERMEDIATE:
+ return BodyPart.RIGHT_RING_PROXIMAL;
+ case BodyPart.RIGHT_RING_DISTAL:
+ return BodyPart.RIGHT_RING_INTERMEDIATE;
+ case BodyPart.RIGHT_LITTLE_PROXIMAL:
+ return BodyPart.RIGHT_HAND;
+ case BodyPart.RIGHT_LITTLE_INTERMEDIATE:
+ return BodyPart.RIGHT_LITTLE_PROXIMAL;
+ case BodyPart.RIGHT_LITTLE_DISTAL:
+ return BodyPart.RIGHT_LITTLE_INTERMEDIATE;
}
}
}
diff --git a/package.json b/package.json
index acf4d8ea2..f3204639d 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
"skipbundler": "cd gui && pnpm run skipbundler",
"build": "pnpm run tauri build",
"update-solarxr": "cd solarxr-protocol && pnpm run build",
- "prepare": "husky install && pnpm run update-solarxr",
+ "prepare": "husky && pnpm run update-solarxr",
"preinstall": "npx only-allow pnpm"
},
"devDependencies": {
diff --git a/server/.gitignore b/server/.gitignore
index e97171823..89916e7f5 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -19,3 +19,7 @@ Load AutoBone Recordings
*.log.lck
*.log
logs/
+
+android/release
+android/debug
+
diff --git a/server/android/build.gradle.kts b/server/android/build.gradle.kts
index 27d8b99f3..7dd94c33a 100644
--- a/server/android/build.gradle.kts
+++ b/server/android/build.gradle.kts
@@ -124,11 +124,14 @@ android {
// Specifies the API level used to test the app.
targetSdk = 35
+ // adds an offset of the version code as we might do apk releases in the middle of actual
+ // releases if we failed on bundling or stuff
+ val versionCodeOffset = 1
// Defines the version number of your app.
- versionCode = extra["gitVersionCode"] as? Int
+ versionCode = (extra["gitVersionCode"] as? Int)?.plus(versionCodeOffset) ?: 0
// Defines a user-friendly version name for your app.
- versionName = extra["gitVersionName"] as? String
+ versionName = extra["gitVersionName"] as? String ?: "v0.0.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/server/android/proguard-rules.pro b/server/android/proguard-rules.pro
index d2177735e..d57ca20d4 100644
--- a/server/android/proguard-rules.pro
+++ b/server/android/proguard-rules.pro
@@ -1,16 +1,3 @@
--dontwarn io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod
--dontwarn io.netty.internal.tcnative.AsyncTask
--dontwarn io.netty.internal.tcnative.Buffer
--dontwarn io.netty.internal.tcnative.CertificateCallback
--dontwarn io.netty.internal.tcnative.CertificateCompressionAlgo
--dontwarn io.netty.internal.tcnative.CertificateVerifier
--dontwarn io.netty.internal.tcnative.Library
--dontwarn io.netty.internal.tcnative.SSL
--dontwarn io.netty.internal.tcnative.SSLContext
--dontwarn io.netty.internal.tcnative.SSLPrivateKeyMethod
--dontwarn io.netty.internal.tcnative.SSLSessionCache
--dontwarn io.netty.internal.tcnative.SessionTicketKey
--dontwarn io.netty.internal.tcnative.SniHostNameMatcher
-dontwarn java.awt.Color
-dontwarn java.beans.BeanInfo
-dontwarn java.beans.IntrospectionException
@@ -37,3 +24,12 @@
-dontwarn org.jetbrains.annotations.Async$Execute
-dontwarn org.jetbrains.annotations.Async$Schedule
-dontwarn reactor.blockhound.integration.BlockHoundIntegration
+
+-keep class io.ktor.** { *; }
+-keep class io.netty.** {*; }
+-keep class kotlin.reflect.jvm.internal.** { *; }
+-keep class kotlinx.coroutines.** { *; }
+-dontwarn kotlinx.atomicfu.**
+-dontwarn io.netty.**
+-dontwarn com.typesafe.**
+-dontwarn org.slf4j.**
diff --git a/server/core/src/main/java/dev/slimevr/VRServer.kt b/server/core/src/main/java/dev/slimevr/VRServer.kt
index 4bd35390e..6ae919fe8 100644
--- a/server/core/src/main/java/dev/slimevr/VRServer.kt
+++ b/server/core/src/main/java/dev/slimevr/VRServer.kt
@@ -102,8 +102,6 @@ class VRServer @JvmOverloads constructor(
init {
// UwU
- instance = this
-
configManager = ConfigManager(configPath)
configManager.loadConfig()
deviceManager = DeviceManager(this)
@@ -163,6 +161,7 @@ class VRServer @JvmOverloads constructor(
for (tracker in computedTrackers) {
registerTracker(tracker)
}
+ instance = this
}
fun hasBridge(bridgeClass: Class): Boolean {
diff --git a/server/core/src/main/java/dev/slimevr/config/ConfigManager.java b/server/core/src/main/java/dev/slimevr/config/ConfigManager.java
index 33638cc97..574696b99 100644
--- a/server/core/src/main/java/dev/slimevr/config/ConfigManager.java
+++ b/server/core/src/main/java/dev/slimevr/config/ConfigManager.java
@@ -16,6 +16,8 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.*;
+import java.util.Comparator;
+import java.util.stream.Stream;
public class ConfigManager {
@@ -115,8 +117,28 @@ public class ConfigManager {
// Serialize config
try {
- var file = cfgFile.toFile();
- if (!file.getAbsoluteFile().getParentFile().exists() && !file.mkdirs()) {
+ // delete accidental folder caused by PR
+ // https://github.com/SlimeVR/SlimeVR-Server/pull/1176
+ var cfgFileMaybeFolder = cfgFile.toFile();
+ if (cfgFileMaybeFolder.isDirectory()) {
+ try (Stream pathStream = Files.walk(cfgFile)) {
+ var list = pathStream.sorted(Comparator.reverseOrder()).toList();
+ for (var path : list) {
+ Files.delete(path);
+ }
+ } catch (IOException e) {
+ LogManager
+ .severe(
+ "Unable to delete folder that has same name as the config file on path \""
+ + cfgFile
+ + "\""
+ );
+ return;
+ }
+
+ }
+ var cfgFolder = cfgFile.toAbsolutePath().getParent().toFile();
+ if (!cfgFolder.exists() && !cfgFolder.mkdirs()) {
LogManager
.severe("Unable to create folders for config on path \"" + cfgFile + "\"");
return;
diff --git a/server/core/src/main/java/dev/slimevr/filtering/QuaternionMovingAverage.kt b/server/core/src/main/java/dev/slimevr/filtering/QuaternionMovingAverage.kt
index f31b77f1b..f86c4525d 100644
--- a/server/core/src/main/java/dev/slimevr/filtering/QuaternionMovingAverage.kt
+++ b/server/core/src/main/java/dev/slimevr/filtering/QuaternionMovingAverage.kt
@@ -1,5 +1,6 @@
package dev.slimevr.filtering
+import com.jme3.system.NanoTimer
import dev.slimevr.VRServer
import io.github.axisangles.ktmath.Quaternion
import io.github.axisangles.ktmath.Quaternion.Companion.IDENTITY
@@ -17,18 +18,18 @@ private const val PREDICT_BUFFER = 6
class QuaternionMovingAverage(
val type: TrackerFilters,
- var amount: Float,
- initialRotation: Quaternion,
+ var amount: Float = 0f,
+ initialRotation: Quaternion = IDENTITY,
) {
- var filteredQuaternion = IDENTITY
private var smoothFactor = 0f
private var predictFactor = 0f
private lateinit var rotBuffer: CircularArrayList
private var latestQuaternion = IDENTITY
private var smoothingQuaternion = IDENTITY
- private val fpsTimer = VRServer.instance.fpsTimer
+ private val fpsTimer = if (VRServer.instanceInitialized) VRServer.instance.fpsTimer else NanoTimer()
private var frameCounter = 0
private var lastAmt = 0f
+ var filteredQuaternion = IDENTITY
init {
// amount should range from 0 to 1.
@@ -48,9 +49,7 @@ class QuaternionMovingAverage(
predictFactor = PREDICT_MULTIPLIER * amount + PREDICT_MIN
rotBuffer = CircularArrayList(PREDICT_BUFFER)
}
- filteredQuaternion = initialRotation
- latestQuaternion = initialRotation
- smoothingQuaternion = initialRotation
+ resetQuats(initialRotation)
}
// Runs at up to 1000hz. We use a timer to make it framerate-independent
@@ -70,7 +69,7 @@ class QuaternionMovingAverage(
// Slerps the target rotation to that predicted rotation by amt
filteredQuaternion = filteredQuaternion.interpR(quatBuf, amt)
}
- } else { // Smoothing
+ } else if (type == TrackerFilters.SMOOTHING) {
// Increase every update for linear interpolation
frameCounter++
@@ -90,6 +89,9 @@ class QuaternionMovingAverage(
// Smooth towards the target rotation by the slerp factor
filteredQuaternion = smoothingQuaternion.interpR(latestQuaternion, amt)
+ } else {
+ // No filtering; just keep track of rotations (for going over 180 degrees)
+ filteredQuaternion = latestQuaternion.twinNearest(smoothingQuaternion)
}
}
@@ -102,12 +104,20 @@ class QuaternionMovingAverage(
// Gets and stores the rotation between the last 2 quaternions
rotBuffer.add(latestQuaternion.inv().times(q))
- } else { // Smoothing
+ } else if (type == TrackerFilters.SMOOTHING) {
frameCounter = 0
lastAmt = 0f
smoothingQuaternion = filteredQuaternion
+ } else {
+ smoothingQuaternion = filteredQuaternion
}
latestQuaternion = q
}
+
+ fun resetQuats(q: Quaternion) {
+ filteredQuaternion = q
+ latestQuaternion = q
+ smoothingQuaternion = q
+ }
}
diff --git a/server/core/src/main/java/dev/slimevr/osc/UnityArmature.kt b/server/core/src/main/java/dev/slimevr/osc/UnityArmature.kt
index b8fd79f42..36916f85c 100644
--- a/server/core/src/main/java/dev/slimevr/osc/UnityArmature.kt
+++ b/server/core/src/main/java/dev/slimevr/osc/UnityArmature.kt
@@ -12,9 +12,12 @@ import io.github.axisangles.ktmath.Vector3
*/
class UnityArmature(localRot: Boolean) {
+ // Head
private val headNode = TransformNode(localRotation = localRot)
private val neckTailNode = TransformNode(localRotation = localRot)
private val neckHeadNode = TransformNode(localRotation = localRot)
+
+ // Spine
private val upperChestNode = TransformNode(localRotation = localRot)
private val chestNode = TransformNode(localRotation = localRot)
private val spineTailNode = TransformNode(localRotation = localRot)
@@ -22,12 +25,16 @@ class UnityArmature(localRot: Boolean) {
private val hipsNode = TransformNode(localRotation = localRot)
private val leftHipNode = TransformNode(localRotation = localRot)
private val rightHipNode = TransformNode(localRotation = localRot)
+
+ // Legs
private val leftKneeNode = TransformNode(localRotation = localRot)
private val leftAnkleNode = TransformNode(localRotation = localRot)
private val leftFootNode = TransformNode(localRotation = localRot)
private val rightKneeNode = TransformNode(localRotation = localRot)
private val rightAnkleNode = TransformNode(localRotation = localRot)
private val rightFootNode = TransformNode(localRotation = localRot)
+
+ // Arms
private val leftShoulderHeadNode = TransformNode(localRotation = localRot)
private val rightShoulderHeadNode = TransformNode(localRotation = localRot)
private val leftShoulderTailNode = TransformNode(localRotation = localRot)
@@ -36,8 +43,50 @@ class UnityArmature(localRot: Boolean) {
private val rightElbowNode = TransformNode(localRotation = localRot)
private val leftWristNode = TransformNode(localRotation = localRot)
private val rightWristNode = TransformNode(localRotation = localRot)
- private val leftHandNode = TransformNode(localRotation = localRot)
- private val rightHandNode = TransformNode(localRotation = localRot)
+ private val leftHandNode = TransformNode(localRotation = !localRot)
+ private val rightHandNode = TransformNode(localRotation = !localRot)
+
+ // Fingers
+ val leftThumbProximalHeadNode = TransformNode(localRotation = localRot)
+ val leftThumbProximalTailNode = TransformNode(localRotation = localRot)
+ val leftThumbIntermediateNode = TransformNode(localRotation = localRot)
+ val leftThumbDistalNode = TransformNode(localRotation = localRot)
+ val leftIndexProximalHeadNode = TransformNode(localRotation = localRot)
+ val leftIndexProximalTailNode = TransformNode(localRotation = localRot)
+ val leftIndexIntermediateNode = TransformNode(localRotation = localRot)
+ val leftIndexDistalNode = TransformNode(localRotation = localRot)
+ val leftMiddleProximalHeadNode = TransformNode(localRotation = localRot)
+ val leftMiddleProximalTailNode = TransformNode(localRotation = localRot)
+ val leftMiddleIntermediateNode = TransformNode(localRotation = localRot)
+ val leftMiddleDistalNode = TransformNode(localRotation = localRot)
+ val leftRingProximalHeadNode = TransformNode(localRotation = localRot)
+ val leftRingProximalTailNode = TransformNode(localRotation = localRot)
+ val leftRingIntermediateNode = TransformNode(localRotation = localRot)
+ val leftRingDistalNode = TransformNode(localRotation = localRot)
+ val leftLittleProximalHeadNode = TransformNode(localRotation = localRot)
+ val leftLittleProximalTailNode = TransformNode(localRotation = localRot)
+ val leftLittleIntermediateNode = TransformNode(localRotation = localRot)
+ val leftLittleDistalNode = TransformNode(localRotation = localRot)
+ val rightThumbProximalHeadNode = TransformNode(localRotation = localRot)
+ val rightThumbProximalTailNode = TransformNode(localRotation = localRot)
+ val rightThumbIntermediateNode = TransformNode(localRotation = localRot)
+ val rightThumbDistalNode = TransformNode(localRotation = localRot)
+ val rightIndexProximalHeadNode = TransformNode(localRotation = localRot)
+ val rightIndexProximalTailNode = TransformNode(localRotation = localRot)
+ val rightIndexIntermediateNode = TransformNode(localRotation = localRot)
+ val rightIndexDistalNode = TransformNode(localRotation = localRot)
+ val rightMiddleProximalHeadNode = TransformNode(localRotation = localRot)
+ val rightMiddleProximalTailNode = TransformNode(localRotation = localRot)
+ val rightMiddleIntermediateNode = TransformNode(localRotation = localRot)
+ val rightMiddleDistalNode = TransformNode(localRotation = localRot)
+ val rightRingProximalHeadNode = TransformNode(localRotation = localRot)
+ val rightRingProximalTailNode = TransformNode(localRotation = localRot)
+ val rightRingIntermediateNode = TransformNode(localRotation = localRot)
+ val rightRingDistalNode = TransformNode(localRotation = localRot)
+ val rightLittleProximalHeadNode = TransformNode(localRotation = localRot)
+ val rightLittleProximalTailNode = TransformNode(localRotation = localRot)
+ val rightLittleIntermediateNode = TransformNode(localRotation = localRot)
+ val rightLittleDistalNode = TransformNode(localRotation = localRot)
private var rootPosition = Vector3.NULL
private var rootRotation = Quaternion.IDENTITY
@@ -74,6 +123,48 @@ class UnityArmature(localRot: Boolean) {
rightElbowNode.attachChild(rightWristNode)
leftWristNode.attachChild(leftHandNode)
rightWristNode.attachChild(rightHandNode)
+
+ // Fingers
+ leftHandNode.attachChild(leftThumbProximalHeadNode)
+ leftThumbProximalHeadNode.attachChild(leftThumbProximalTailNode)
+ leftThumbProximalTailNode.attachChild(leftThumbIntermediateNode)
+ leftThumbIntermediateNode.attachChild(leftThumbDistalNode)
+ leftHandNode.attachChild(leftIndexProximalHeadNode)
+ leftIndexProximalHeadNode.attachChild(leftIndexProximalTailNode)
+ leftIndexProximalTailNode.attachChild(leftIndexIntermediateNode)
+ leftIndexIntermediateNode.attachChild(leftIndexDistalNode)
+ leftHandNode.attachChild(leftMiddleProximalHeadNode)
+ leftMiddleProximalHeadNode.attachChild(leftMiddleProximalTailNode)
+ leftMiddleProximalTailNode.attachChild(leftMiddleIntermediateNode)
+ leftMiddleIntermediateNode.attachChild(leftMiddleDistalNode)
+ leftHandNode.attachChild(leftRingProximalHeadNode)
+ leftRingProximalHeadNode.attachChild(leftRingProximalTailNode)
+ leftRingProximalTailNode.attachChild(leftRingIntermediateNode)
+ leftRingIntermediateNode.attachChild(leftRingDistalNode)
+ leftHandNode.attachChild(leftLittleProximalHeadNode)
+ leftLittleProximalHeadNode.attachChild(leftLittleProximalTailNode)
+ leftLittleProximalTailNode.attachChild(leftLittleIntermediateNode)
+ leftLittleIntermediateNode.attachChild(leftLittleDistalNode)
+ rightHandNode.attachChild(rightThumbProximalHeadNode)
+ rightThumbProximalHeadNode.attachChild(rightThumbProximalTailNode)
+ rightThumbProximalTailNode.attachChild(rightThumbIntermediateNode)
+ rightThumbIntermediateNode.attachChild(rightThumbDistalNode)
+ rightHandNode.attachChild(rightIndexProximalHeadNode)
+ rightIndexProximalHeadNode.attachChild(rightIndexProximalTailNode)
+ rightIndexProximalTailNode.attachChild(rightIndexIntermediateNode)
+ rightIndexIntermediateNode.attachChild(rightIndexDistalNode)
+ rightHandNode.attachChild(rightMiddleProximalHeadNode)
+ rightMiddleProximalHeadNode.attachChild(rightMiddleProximalTailNode)
+ rightMiddleProximalTailNode.attachChild(rightMiddleIntermediateNode)
+ rightMiddleIntermediateNode.attachChild(rightMiddleDistalNode)
+ rightHandNode.attachChild(rightRingProximalHeadNode)
+ rightRingProximalHeadNode.attachChild(rightRingProximalTailNode)
+ rightRingProximalTailNode.attachChild(rightRingIntermediateNode)
+ rightRingIntermediateNode.attachChild(rightRingDistalNode)
+ rightHandNode.attachChild(rightLittleProximalHeadNode)
+ rightLittleProximalHeadNode.attachChild(rightLittleProximalTailNode)
+ rightLittleProximalTailNode.attachChild(rightLittleIntermediateNode)
+ rightLittleIntermediateNode.attachChild(rightLittleDistalNode)
}
fun update() {
@@ -91,10 +182,12 @@ class UnityArmature(localRot: Boolean) {
fun setGlobalRotationForBone(unityBone: UnityBone, globalRot: Quaternion) {
val node = getHeadNodeOfBone(unityBone)
if (node != null) {
- node.localTransform.rotation = when (unityBone) {
- UnityBone.LEFT_UPPER_ARM, UnityBone.LEFT_LOWER_ARM, UnityBone.LEFT_HAND -> globalRot * LEFT_SHOULDER_OFFSET
- UnityBone.RIGHT_UPPER_ARM, UnityBone.RIGHT_LOWER_ARM, UnityBone.RIGHT_HAND -> globalRot * RIGHT_SHOULDER_OFFSET
- else -> globalRot
+ node.localTransform.rotation = if (UnityBone.isLeftArmBone(unityBone)) {
+ globalRot * LEFT_SHOULDER_OFFSET
+ } else if (UnityBone.isRightArmBone(unityBone)) {
+ globalRot * RIGHT_SHOULDER_OFFSET
+ } else {
+ globalRot
}
}
}
@@ -105,10 +198,12 @@ class UnityArmature(localRot: Boolean) {
if (unityBone == UnityBone.HIPS) {
node.worldTransform.rotation = localRot
} else {
- node.localTransform.rotation = when (unityBone) {
- UnityBone.LEFT_UPPER_ARM -> localRot * RIGHT_SHOULDER_OFFSET
- UnityBone.RIGHT_UPPER_ARM -> localRot * LEFT_SHOULDER_OFFSET
- else -> localRot
+ node.localTransform.rotation = if (UnityBone.isLeftStartOfArmOrFingerBone(unityBone)) {
+ localRot * RIGHT_SHOULDER_OFFSET
+ } else if (UnityBone.isRightStartOfArmOrFingerBone(unityBone)) {
+ localRot * LEFT_SHOULDER_OFFSET
+ } else {
+ localRot
}
}
}
@@ -194,6 +289,36 @@ class UnityArmature(localRot: Boolean) {
UnityBone.RIGHT_LOWER_ARM -> rightElbowNode
UnityBone.LEFT_HAND -> leftWristNode
UnityBone.RIGHT_HAND -> rightWristNode
+ UnityBone.LEFT_THUMB_PROXIMAL -> leftThumbProximalHeadNode
+ UnityBone.LEFT_THUMB_INTERMEDIATE -> leftThumbProximalTailNode
+ UnityBone.LEFT_THUMB_DISTAL -> leftThumbIntermediateNode
+ UnityBone.LEFT_INDEX_PROXIMAL -> leftIndexProximalHeadNode
+ UnityBone.LEFT_INDEX_INTERMEDIATE -> leftIndexProximalTailNode
+ UnityBone.LEFT_INDEX_DISTAL -> leftIndexIntermediateNode
+ UnityBone.LEFT_MIDDLE_PROXIMAL -> leftMiddleProximalHeadNode
+ UnityBone.LEFT_MIDDLE_INTERMEDIATE -> leftMiddleProximalTailNode
+ UnityBone.LEFT_MIDDLE_DISTAL -> leftMiddleIntermediateNode
+ UnityBone.LEFT_RING_PROXIMAL -> leftRingProximalHeadNode
+ UnityBone.LEFT_RING_INTERMEDIATE -> leftRingProximalTailNode
+ UnityBone.LEFT_RING_DISTAL -> leftRingIntermediateNode
+ UnityBone.LEFT_LITTLE_PROXIMAL -> leftLittleProximalHeadNode
+ UnityBone.LEFT_LITTLE_INTERMEDIATE -> leftLittleProximalTailNode
+ UnityBone.LEFT_LITTLE_DISTAL -> leftLittleIntermediateNode
+ UnityBone.RIGHT_THUMB_PROXIMAL -> rightThumbProximalHeadNode
+ UnityBone.RIGHT_THUMB_INTERMEDIATE -> rightThumbProximalTailNode
+ UnityBone.RIGHT_THUMB_DISTAL -> rightThumbIntermediateNode
+ UnityBone.RIGHT_INDEX_PROXIMAL -> rightIndexProximalHeadNode
+ UnityBone.RIGHT_INDEX_INTERMEDIATE -> rightIndexProximalTailNode
+ UnityBone.RIGHT_INDEX_DISTAL -> rightIndexIntermediateNode
+ UnityBone.RIGHT_MIDDLE_PROXIMAL -> rightMiddleProximalHeadNode
+ UnityBone.RIGHT_MIDDLE_INTERMEDIATE -> rightMiddleProximalTailNode
+ UnityBone.RIGHT_MIDDLE_DISTAL -> rightMiddleIntermediateNode
+ UnityBone.RIGHT_RING_PROXIMAL -> rightRingProximalHeadNode
+ UnityBone.RIGHT_RING_INTERMEDIATE -> rightRingProximalTailNode
+ UnityBone.RIGHT_RING_DISTAL -> rightRingIntermediateNode
+ UnityBone.RIGHT_LITTLE_PROXIMAL -> rightLittleProximalHeadNode
+ UnityBone.RIGHT_LITTLE_INTERMEDIATE -> rightLittleProximalTailNode
+ UnityBone.RIGHT_LITTLE_DISTAL -> rightLittleIntermediateNode
else -> null
}
}
diff --git a/server/core/src/main/java/dev/slimevr/osc/UnityBone.kt b/server/core/src/main/java/dev/slimevr/osc/UnityBone.kt
index fe549bd4a..f84e882bd 100644
--- a/server/core/src/main/java/dev/slimevr/osc/UnityBone.kt
+++ b/server/core/src/main/java/dev/slimevr/osc/UnityBone.kt
@@ -38,36 +38,36 @@ enum class UnityBone(
LEFT_EYE("LeftEye", null, null),
RIGHT_EYE("RightEye", null, null),
JAW("Jaw", null, null),
- LEFT_THUMB_PROXIMAL("LeftThumbProximal", null, null),
- LEFT_THUMB_INTERMEDIATE("LeftThumbIntermediate", null, null),
- LEFT_THUMB_DISTAL("LeftThumbDistal", null, null),
- LEFT_INDEX_PROXIMAL("LeftIndexProximal", null, null),
- LEFT_INDEX_INTERMEDIATE("LeftIndexIntermediate", null, null),
- LEFT_INDEX_DISTAL("LeftIndexDistal", null, null),
- LEFT_MIDDLE_PROXIMAL("LeftMiddleProximal", null, null),
- LEFT_MIDDLE_INTERMEDIATE("LeftMiddleIntermediate", null, null),
- LEFT_MIDDLE_DISTAL("LeftMiddleDistal", null, null),
- LEFT_RING_PROXIMAL("LeftRingProximal", null, null),
- LEFT_RING_INTERMEDIATE("LeftRingIntermediate", null, null),
- LEFT_RING_DISTAL("LeftRingDistal", null, null),
- LEFT_LITTLE_PROXIMAL("LeftLittleProximal", null, null),
- LEFT_LITTLE_INTERMEDIATE("LeftLittleIntermediate", null, null),
- LEFT_LITTLE_DISTAL("LeftLittleDistal", null, null),
- RIGHT_THUMB_PROXIMAL("RightThumbProximal", null, null),
- RIGHT_THUMB_INTERMEDIATE("RightThumbIntermediate", null, null),
- RIGHT_THUMB_DISTAL("RightThumbDistal", null, null),
- RIGHT_INDEX_PROXIMAL("RightIndexProximal", null, null),
- RIGHT_INDEX_INTERMEDIATE("RightIndexIntermediate", null, null),
- RIGHT_INDEX_DISTAL("RightIndexDistal", null, null),
- RIGHT_MIDDLE_PROXIMAL("RightMiddleProximal", null, null),
- RIGHT_MIDDLE_INTERMEDIATE("RightMiddleIntermediate", null, null),
- RIGHT_MIDDLE_DISTAL("RightMiddleDistal", null, null),
- RIGHT_RING_PROXIMAL("RightRingProximal", null, null),
- RIGHT_RING_INTERMEDIATE("RightRingIntermediate", null, null),
- RIGHT_RING_DISTAL("RightRingDistal", null, null),
- RIGHT_LITTLE_PROXIMAL("RightLittleProximal", null, null),
- RIGHT_LITTLE_INTERMEDIATE("RightLittleIntermediate", null, null),
- RIGHT_LITTLE_DISTAL("RightLittleDistal", null, null),
+ LEFT_THUMB_PROXIMAL("LeftThumbProximal", BoneType.LEFT_THUMB_PROXIMAL, TrackerPosition.LEFT_THUMB_PROXIMAL),
+ LEFT_THUMB_INTERMEDIATE("LeftThumbIntermediate", BoneType.LEFT_THUMB_INTERMEDIATE, TrackerPosition.LEFT_THUMB_INTERMEDIATE),
+ LEFT_THUMB_DISTAL("LeftThumbDistal", BoneType.LEFT_THUMB_DISTAL, TrackerPosition.LEFT_THUMB_DISTAL),
+ LEFT_INDEX_PROXIMAL("LeftIndexProximal", BoneType.LEFT_INDEX_PROXIMAL, TrackerPosition.LEFT_INDEX_PROXIMAL),
+ LEFT_INDEX_INTERMEDIATE("LeftIndexIntermediate", BoneType.LEFT_INDEX_INTERMEDIATE, TrackerPosition.LEFT_INDEX_INTERMEDIATE),
+ LEFT_INDEX_DISTAL("LeftIndexDistal", BoneType.LEFT_INDEX_DISTAL, TrackerPosition.LEFT_INDEX_DISTAL),
+ LEFT_MIDDLE_PROXIMAL("LeftMiddleProximal", BoneType.LEFT_MIDDLE_PROXIMAL, TrackerPosition.LEFT_MIDDLE_PROXIMAL),
+ LEFT_MIDDLE_INTERMEDIATE("LeftMiddleIntermediate", BoneType.LEFT_MIDDLE_INTERMEDIATE, TrackerPosition.LEFT_MIDDLE_INTERMEDIATE),
+ LEFT_MIDDLE_DISTAL("LeftMiddleDistal", BoneType.LEFT_MIDDLE_DISTAL, TrackerPosition.LEFT_MIDDLE_DISTAL),
+ LEFT_RING_PROXIMAL("LeftRingProximal", BoneType.LEFT_RING_PROXIMAL, TrackerPosition.LEFT_RING_PROXIMAL),
+ LEFT_RING_INTERMEDIATE("LeftRingIntermediate", BoneType.LEFT_RING_INTERMEDIATE, TrackerPosition.LEFT_RING_INTERMEDIATE),
+ LEFT_RING_DISTAL("LeftRingDistal", BoneType.LEFT_RING_DISTAL, TrackerPosition.LEFT_RING_DISTAL),
+ LEFT_LITTLE_PROXIMAL("LeftLittleProximal", BoneType.LEFT_LITTLE_PROXIMAL, TrackerPosition.LEFT_LITTLE_PROXIMAL),
+ LEFT_LITTLE_INTERMEDIATE("LeftLittleIntermediate", BoneType.LEFT_LITTLE_INTERMEDIATE, TrackerPosition.LEFT_LITTLE_INTERMEDIATE),
+ LEFT_LITTLE_DISTAL("LeftLittleDistal", BoneType.LEFT_LITTLE_DISTAL, TrackerPosition.LEFT_LITTLE_DISTAL),
+ RIGHT_THUMB_PROXIMAL("RightThumbProximal", BoneType.RIGHT_THUMB_PROXIMAL, TrackerPosition.RIGHT_THUMB_PROXIMAL),
+ RIGHT_THUMB_INTERMEDIATE("RightThumbIntermediate", BoneType.RIGHT_THUMB_INTERMEDIATE, TrackerPosition.RIGHT_THUMB_INTERMEDIATE),
+ RIGHT_THUMB_DISTAL("RightThumbDistal", BoneType.RIGHT_THUMB_DISTAL, TrackerPosition.RIGHT_THUMB_DISTAL),
+ RIGHT_INDEX_PROXIMAL("RightIndexProximal", BoneType.RIGHT_INDEX_PROXIMAL, TrackerPosition.RIGHT_INDEX_PROXIMAL),
+ RIGHT_INDEX_INTERMEDIATE("RightIndexIntermediate", BoneType.RIGHT_INDEX_INTERMEDIATE, TrackerPosition.RIGHT_INDEX_INTERMEDIATE),
+ RIGHT_INDEX_DISTAL("RightIndexDistal", BoneType.RIGHT_INDEX_DISTAL, TrackerPosition.RIGHT_INDEX_DISTAL),
+ RIGHT_MIDDLE_PROXIMAL("RightMiddleProximal", BoneType.RIGHT_MIDDLE_PROXIMAL, TrackerPosition.RIGHT_MIDDLE_PROXIMAL),
+ RIGHT_MIDDLE_INTERMEDIATE("RightMiddleIntermediate", BoneType.RIGHT_MIDDLE_INTERMEDIATE, TrackerPosition.RIGHT_MIDDLE_INTERMEDIATE),
+ RIGHT_MIDDLE_DISTAL("RightMiddleDistal", BoneType.RIGHT_MIDDLE_DISTAL, TrackerPosition.RIGHT_MIDDLE_DISTAL),
+ RIGHT_RING_PROXIMAL("RightRingProximal", BoneType.RIGHT_RING_PROXIMAL, TrackerPosition.RIGHT_RING_PROXIMAL),
+ RIGHT_RING_INTERMEDIATE("RightRingIntermediate", BoneType.RIGHT_RING_INTERMEDIATE, TrackerPosition.RIGHT_RING_INTERMEDIATE),
+ RIGHT_RING_DISTAL("RightRingDistal", BoneType.RIGHT_RING_DISTAL, TrackerPosition.RIGHT_RING_DISTAL),
+ RIGHT_LITTLE_PROXIMAL("RightLittleProximal", BoneType.RIGHT_LITTLE_PROXIMAL, TrackerPosition.RIGHT_LITTLE_PROXIMAL),
+ RIGHT_LITTLE_INTERMEDIATE("RightLittleIntermediate", BoneType.RIGHT_LITTLE_INTERMEDIATE, TrackerPosition.RIGHT_LITTLE_INTERMEDIATE),
+ RIGHT_LITTLE_DISTAL("RightLittleDistal", BoneType.RIGHT_LITTLE_DISTAL, TrackerPosition.RIGHT_LITTLE_DISTAL),
LAST_BONE("LastBone", null, null),
;
@@ -76,5 +76,107 @@ enum class UnityBone(
@JvmStatic
fun getByStringVal(stringVal: String): UnityBone? = byStringVal[stringVal.lowercase()]
+
+ /**
+ * Returns the bone on the opposite limb, or the original bone if
+ * it not a limb bone.
+ */
+ fun tryGetOppositeArmBone(bone: UnityBone): UnityBone = when (bone) {
+ LEFT_SHOULDER -> RIGHT_SHOULDER
+ LEFT_UPPER_ARM -> RIGHT_UPPER_ARM
+ LEFT_LOWER_ARM -> RIGHT_LOWER_ARM
+ LEFT_HAND -> RIGHT_HAND
+ RIGHT_SHOULDER -> LEFT_SHOULDER
+ RIGHT_UPPER_ARM -> LEFT_UPPER_ARM
+ RIGHT_LOWER_ARM -> LEFT_LOWER_ARM
+ RIGHT_HAND -> LEFT_HAND
+ LEFT_UPPER_LEG -> RIGHT_UPPER_LEG
+ LEFT_LOWER_LEG -> RIGHT_LOWER_LEG
+ LEFT_FOOT -> RIGHT_FOOT
+ RIGHT_UPPER_LEG -> LEFT_UPPER_LEG
+ RIGHT_LOWER_LEG -> LEFT_LOWER_LEG
+ RIGHT_FOOT -> LEFT_FOOT
+ LEFT_THUMB_PROXIMAL -> RIGHT_THUMB_PROXIMAL
+ LEFT_THUMB_INTERMEDIATE -> RIGHT_THUMB_INTERMEDIATE
+ LEFT_THUMB_DISTAL -> RIGHT_THUMB_DISTAL
+ LEFT_INDEX_PROXIMAL -> RIGHT_INDEX_PROXIMAL
+ LEFT_INDEX_INTERMEDIATE -> RIGHT_INDEX_INTERMEDIATE
+ LEFT_INDEX_DISTAL -> RIGHT_INDEX_DISTAL
+ LEFT_MIDDLE_PROXIMAL -> RIGHT_MIDDLE_PROXIMAL
+ LEFT_MIDDLE_INTERMEDIATE -> RIGHT_MIDDLE_INTERMEDIATE
+ LEFT_MIDDLE_DISTAL -> RIGHT_MIDDLE_DISTAL
+ LEFT_RING_PROXIMAL -> RIGHT_RING_PROXIMAL
+ LEFT_RING_INTERMEDIATE -> RIGHT_RING_INTERMEDIATE
+ LEFT_RING_DISTAL -> RIGHT_RING_DISTAL
+ LEFT_LITTLE_PROXIMAL -> RIGHT_LITTLE_PROXIMAL
+ LEFT_LITTLE_INTERMEDIATE -> RIGHT_LITTLE_INTERMEDIATE
+ LEFT_LITTLE_DISTAL -> RIGHT_LITTLE_DISTAL
+ RIGHT_THUMB_PROXIMAL -> LEFT_THUMB_PROXIMAL
+ RIGHT_THUMB_INTERMEDIATE -> LEFT_THUMB_INTERMEDIATE
+ RIGHT_THUMB_DISTAL -> LEFT_THUMB_DISTAL
+ RIGHT_INDEX_PROXIMAL -> LEFT_INDEX_PROXIMAL
+ RIGHT_INDEX_INTERMEDIATE -> LEFT_INDEX_INTERMEDIATE
+ RIGHT_INDEX_DISTAL -> LEFT_INDEX_DISTAL
+ RIGHT_MIDDLE_PROXIMAL -> LEFT_MIDDLE_PROXIMAL
+ RIGHT_MIDDLE_INTERMEDIATE -> LEFT_MIDDLE_INTERMEDIATE
+ RIGHT_MIDDLE_DISTAL -> LEFT_MIDDLE_DISTAL
+ RIGHT_RING_PROXIMAL -> LEFT_RING_PROXIMAL
+ RIGHT_RING_INTERMEDIATE -> LEFT_RING_INTERMEDIATE
+ RIGHT_RING_DISTAL -> LEFT_RING_DISTAL
+ RIGHT_LITTLE_PROXIMAL -> LEFT_LITTLE_PROXIMAL
+ RIGHT_LITTLE_INTERMEDIATE -> LEFT_LITTLE_INTERMEDIATE
+ RIGHT_LITTLE_DISTAL -> LEFT_LITTLE_DISTAL
+ else -> bone
+ }
+
+ /**
+ * Returns true if the bone is part of the left arm (incl. fingers, excl. shoulder)
+ */
+ fun isLeftArmBone(bone: UnityBone): Boolean = bone == LEFT_UPPER_ARM || bone == LEFT_LOWER_ARM || bone == LEFT_HAND ||
+ bone == LEFT_THUMB_PROXIMAL || bone == LEFT_THUMB_INTERMEDIATE || bone == LEFT_THUMB_DISTAL ||
+ bone == LEFT_INDEX_PROXIMAL || bone == LEFT_INDEX_INTERMEDIATE || bone == LEFT_INDEX_DISTAL ||
+ bone == LEFT_MIDDLE_PROXIMAL || bone == LEFT_MIDDLE_INTERMEDIATE || bone == LEFT_MIDDLE_DISTAL ||
+ bone == LEFT_RING_PROXIMAL || bone == LEFT_RING_INTERMEDIATE || bone == LEFT_RING_DISTAL ||
+ bone == LEFT_LITTLE_PROXIMAL || bone == LEFT_LITTLE_INTERMEDIATE || bone == LEFT_LITTLE_DISTAL
+
+ /**
+ * Returns true if the bone is part of the right arm (incl. fingers, excl. shoulder)
+ */
+ fun isRightArmBone(bone: UnityBone): Boolean = bone == RIGHT_UPPER_ARM || bone == RIGHT_LOWER_ARM || bone == RIGHT_HAND ||
+ bone == RIGHT_THUMB_PROXIMAL || bone == RIGHT_THUMB_INTERMEDIATE || bone == RIGHT_THUMB_DISTAL ||
+ bone == RIGHT_INDEX_PROXIMAL || bone == RIGHT_INDEX_INTERMEDIATE || bone == RIGHT_INDEX_DISTAL ||
+ bone == RIGHT_MIDDLE_PROXIMAL || bone == RIGHT_MIDDLE_INTERMEDIATE || bone == RIGHT_MIDDLE_DISTAL ||
+ bone == RIGHT_RING_PROXIMAL || bone == RIGHT_RING_INTERMEDIATE || bone == RIGHT_RING_DISTAL ||
+ bone == RIGHT_LITTLE_PROXIMAL || bone == RIGHT_LITTLE_INTERMEDIATE || bone == RIGHT_LITTLE_DISTAL
+
+ /**
+ * Returns true if the bone is the left upper arm or proximal left finger bone
+ */
+ fun isLeftStartOfArmOrFingerBone(bone: UnityBone): Boolean = bone == LEFT_UPPER_ARM || bone == LEFT_THUMB_PROXIMAL ||
+ bone == LEFT_INDEX_PROXIMAL || bone == LEFT_MIDDLE_PROXIMAL || bone == LEFT_RING_PROXIMAL || bone == LEFT_LITTLE_PROXIMAL
+
+ /**
+ * Returns true if the bone is the right upper arm or proximal right finger bone
+ */
+ fun isRightStartOfArmOrFingerBone(bone: UnityBone): Boolean = bone == RIGHT_UPPER_ARM || bone == RIGHT_THUMB_PROXIMAL ||
+ bone == RIGHT_INDEX_PROXIMAL || bone == RIGHT_MIDDLE_PROXIMAL || bone == RIGHT_RING_PROXIMAL || bone == RIGHT_LITTLE_PROXIMAL
+
+ /**
+ * Returns true if the bone is part of the left fingers
+ */
+ fun isLeftFingerBone(bone: UnityBone): Boolean = bone == LEFT_THUMB_PROXIMAL || bone == LEFT_THUMB_INTERMEDIATE || bone == LEFT_THUMB_DISTAL ||
+ bone == LEFT_INDEX_PROXIMAL || bone == LEFT_INDEX_INTERMEDIATE || bone == LEFT_INDEX_DISTAL ||
+ bone == LEFT_MIDDLE_PROXIMAL || bone == LEFT_MIDDLE_INTERMEDIATE || bone == LEFT_MIDDLE_DISTAL ||
+ bone == LEFT_RING_PROXIMAL || bone == LEFT_RING_INTERMEDIATE || bone == LEFT_RING_DISTAL ||
+ bone == LEFT_LITTLE_PROXIMAL || bone == LEFT_LITTLE_INTERMEDIATE || bone == LEFT_LITTLE_DISTAL
+
+ /**
+ * Returns true if the bone part of the right fingers
+ */
+ fun isRightFingerBone(bone: UnityBone): Boolean = bone == RIGHT_THUMB_PROXIMAL || bone == RIGHT_THUMB_INTERMEDIATE || bone == RIGHT_THUMB_DISTAL ||
+ bone == RIGHT_INDEX_PROXIMAL || bone == RIGHT_INDEX_INTERMEDIATE || bone == RIGHT_INDEX_DISTAL ||
+ bone == RIGHT_MIDDLE_PROXIMAL || bone == RIGHT_MIDDLE_INTERMEDIATE || bone == RIGHT_MIDDLE_DISTAL ||
+ bone == RIGHT_RING_PROXIMAL || bone == RIGHT_RING_INTERMEDIATE || bone == RIGHT_RING_DISTAL ||
+ bone == RIGHT_LITTLE_PROXIMAL || bone == RIGHT_LITTLE_INTERMEDIATE || bone == RIGHT_LITTLE_DISTAL
}
}
diff --git a/server/core/src/main/java/dev/slimevr/osc/VMCHandler.kt b/server/core/src/main/java/dev/slimevr/osc/VMCHandler.kt
index 07625d3aa..473a94a25 100644
--- a/server/core/src/main/java/dev/slimevr/osc/VMCHandler.kt
+++ b/server/core/src/main/java/dev/slimevr/osc/VMCHandler.kt
@@ -345,13 +345,13 @@ class VMCHandler(
oscBundle.addPacket(OSCMessage("/VMC/Ext/Root/Pos", oscArgs.clone()))
for (unityBone in UnityBone.entries) {
- if (unityBone.boneType == null) continue
-
// Get opposite bone if tracking must be mirrored
- val boneType = (if (mirrorTracking) tryGetOppositeArmBone(unityBone) else unityBone).boneType
+ val boneType = (if (mirrorTracking) UnityBone.tryGetOppositeArmBone(unityBone) else unityBone).boneType
+
+ if (boneType == null) continue
// Get SlimeVR bone
- val bone = humanPoseManager.getBone(boneType!!)
+ val bone = humanPoseManager.getBone(boneType)
// Update unity hierarchy from bone's global rotation
val boneRotation = if (mirrorTracking) {
@@ -384,20 +384,28 @@ class VMCHandler(
}
// Update Unity skeleton
- outputUnityArmature!!.update()
+ outputUnityArmature?.update()
// Add Unity humanoid bones transforms
- for (bone in UnityBone.entries) {
- if (bone.boneType != null &&
- !(humanPoseManager.isTrackingLeftArmFromController && isLeftArmUnityBone(bone)) &&
- !(humanPoseManager.isTrackingRightArmFromController && isRightArmUnityBone(bone))
+ for (unityBone in UnityBone.entries) {
+ // Don't send bones for which we don't have an equivalent
+ // Don't send fingers if we don't have any tracker for them
+ // Don't send arm bones if we're tracking from the controller
+ if (unityBone.boneType != null &&
+ (!UnityBone.isLeftFingerBone(unityBone) || humanPoseManager.skeleton.hasLeftFingerTracker || (mirrorTracking && humanPoseManager.skeleton.hasRightFingerTracker)) &&
+ (!UnityBone.isRightFingerBone(unityBone) || humanPoseManager.skeleton.hasRightFingerTracker || (mirrorTracking && humanPoseManager.skeleton.hasLeftFingerTracker)) &&
+ !(humanPoseManager.isTrackingLeftArmFromController && (UnityBone.isLeftArmBone(unityBone) || unityBone == UnityBone.LEFT_SHOULDER)) &&
+ !(humanPoseManager.isTrackingRightArmFromController && (UnityBone.isRightArmBone(unityBone) || unityBone == UnityBone.RIGHT_SHOULDER))
) {
oscArgs.clear()
- oscArgs.add(bone.stringVal)
- addTransformToArgs(
- outputUnityArmature!!.getLocalTranslationForBone(bone),
- outputUnityArmature!!.getLocalRotationForBone(bone),
- )
+ oscArgs.add(unityBone.stringVal)
+ outputUnityArmature?.let {
+ addTransformToArgs(
+ it.getLocalTranslationForBone(unityBone),
+ it.getLocalRotationForBone(unityBone),
+ )
+ }
+
oscBundle.addPacket(OSCMessage("/VMC/Ext/Bone/Pos", oscArgs.clone()))
}
}
@@ -491,32 +499,6 @@ class VMCHandler(
oscArgs.add(-rot.w)
}
- /**
- * Returns the bone on the opposite limb, or the original bone if
- * it not a limb bone.
- */
- private fun tryGetOppositeArmBone(bone: UnityBone): UnityBone = when (bone) {
- UnityBone.LEFT_SHOULDER -> UnityBone.RIGHT_SHOULDER
- UnityBone.LEFT_UPPER_ARM -> UnityBone.RIGHT_UPPER_ARM
- UnityBone.LEFT_LOWER_ARM -> UnityBone.RIGHT_LOWER_ARM
- UnityBone.LEFT_HAND -> UnityBone.RIGHT_HAND
- UnityBone.RIGHT_SHOULDER -> UnityBone.LEFT_SHOULDER
- UnityBone.RIGHT_UPPER_ARM -> UnityBone.LEFT_UPPER_ARM
- UnityBone.RIGHT_LOWER_ARM -> UnityBone.LEFT_LOWER_ARM
- UnityBone.RIGHT_HAND -> UnityBone.LEFT_HAND
- UnityBone.LEFT_UPPER_LEG -> UnityBone.RIGHT_UPPER_LEG
- UnityBone.LEFT_LOWER_LEG -> UnityBone.RIGHT_LOWER_LEG
- UnityBone.LEFT_FOOT -> UnityBone.RIGHT_FOOT
- UnityBone.RIGHT_UPPER_LEG -> UnityBone.LEFT_UPPER_LEG
- UnityBone.RIGHT_LOWER_LEG -> UnityBone.LEFT_LOWER_LEG
- UnityBone.RIGHT_FOOT -> UnityBone.LEFT_FOOT
- else -> bone
- }
-
- private fun isLeftArmUnityBone(bone: UnityBone): Boolean = bone == UnityBone.LEFT_SHOULDER || bone == UnityBone.LEFT_UPPER_ARM || bone == UnityBone.LEFT_LOWER_ARM || bone == UnityBone.LEFT_HAND
-
- private fun isRightArmUnityBone(bone: UnityBone): Boolean = bone == UnityBone.RIGHT_SHOULDER || bone == UnityBone.RIGHT_UPPER_ARM || bone == UnityBone.RIGHT_LOWER_ARM || bone == UnityBone.RIGHT_HAND
-
override fun getOscSender(): OSCPortOut = oscSender!!
override fun getPortOut(): Int = lastPortOut
diff --git a/server/core/src/main/java/dev/slimevr/tracking/processor/BoneType.java b/server/core/src/main/java/dev/slimevr/tracking/processor/BoneType.java
index 146311747..0794cf7a9 100644
--- a/server/core/src/main/java/dev/slimevr/tracking/processor/BoneType.java
+++ b/server/core/src/main/java/dev/slimevr/tracking/processor/BoneType.java
@@ -39,7 +39,37 @@ public enum BoneType {
LEFT_HAND(BodyPart.LEFT_HAND),
RIGHT_HAND(BodyPart.RIGHT_HAND),
LEFT_HAND_TRACKER,
- RIGHT_HAND_TRACKER;
+ RIGHT_HAND_TRACKER,
+ LEFT_THUMB_PROXIMAL(BodyPart.LEFT_THUMB_PROXIMAL),
+ LEFT_THUMB_INTERMEDIATE(BodyPart.LEFT_THUMB_INTERMEDIATE),
+ LEFT_THUMB_DISTAL(BodyPart.LEFT_THUMB_DISTAL),
+ LEFT_INDEX_PROXIMAL(BodyPart.LEFT_INDEX_PROXIMAL),
+ LEFT_INDEX_INTERMEDIATE(BodyPart.LEFT_INDEX_INTERMEDIATE),
+ LEFT_INDEX_DISTAL(BodyPart.LEFT_INDEX_DISTAL),
+ LEFT_MIDDLE_PROXIMAL(BodyPart.LEFT_MIDDLE_PROXIMAL),
+ LEFT_MIDDLE_INTERMEDIATE(BodyPart.LEFT_MIDDLE_INTERMEDIATE),
+ LEFT_MIDDLE_DISTAL(BodyPart.LEFT_MIDDLE_DISTAL),
+ LEFT_RING_PROXIMAL(BodyPart.LEFT_RING_PROXIMAL),
+ LEFT_RING_INTERMEDIATE(BodyPart.LEFT_RING_INTERMEDIATE),
+ LEFT_RING_DISTAL(BodyPart.LEFT_RING_DISTAL),
+ LEFT_LITTLE_PROXIMAL(BodyPart.LEFT_LITTLE_PROXIMAL),
+ LEFT_LITTLE_INTERMEDIATE(BodyPart.LEFT_LITTLE_INTERMEDIATE),
+ LEFT_LITTLE_DISTAL(BodyPart.LEFT_LITTLE_DISTAL),
+ RIGHT_THUMB_PROXIMAL(BodyPart.RIGHT_THUMB_PROXIMAL),
+ RIGHT_THUMB_INTERMEDIATE(BodyPart.RIGHT_THUMB_INTERMEDIATE),
+ RIGHT_THUMB_DISTAL(BodyPart.RIGHT_THUMB_DISTAL),
+ RIGHT_INDEX_PROXIMAL(BodyPart.RIGHT_INDEX_PROXIMAL),
+ RIGHT_INDEX_INTERMEDIATE(BodyPart.RIGHT_INDEX_INTERMEDIATE),
+ RIGHT_INDEX_DISTAL(BodyPart.RIGHT_INDEX_DISTAL),
+ RIGHT_MIDDLE_PROXIMAL(BodyPart.RIGHT_MIDDLE_PROXIMAL),
+ RIGHT_MIDDLE_INTERMEDIATE(BodyPart.RIGHT_MIDDLE_INTERMEDIATE),
+ RIGHT_MIDDLE_DISTAL(BodyPart.RIGHT_MIDDLE_DISTAL),
+ RIGHT_RING_PROXIMAL(BodyPart.RIGHT_RING_PROXIMAL),
+ RIGHT_RING_INTERMEDIATE(BodyPart.RIGHT_RING_INTERMEDIATE),
+ RIGHT_RING_DISTAL(BodyPart.RIGHT_RING_DISTAL),
+ RIGHT_LITTLE_PROXIMAL(BodyPart.RIGHT_LITTLE_PROXIMAL),
+ RIGHT_LITTLE_INTERMEDIATE(BodyPart.RIGHT_LITTLE_INTERMEDIATE),
+ RIGHT_LITTLE_DISTAL(BodyPart.RIGHT_LITTLE_DISTAL);
public static final BoneType[] values = values();
diff --git a/server/core/src/main/java/dev/slimevr/tracking/processor/config/SkeletonConfigManager.kt b/server/core/src/main/java/dev/slimevr/tracking/processor/config/SkeletonConfigManager.kt
index f1130d85a..392a4ec84 100644
--- a/server/core/src/main/java/dev/slimevr/tracking/processor/config/SkeletonConfigManager.kt
+++ b/server/core/src/main/java/dev/slimevr/tracking/processor/config/SkeletonConfigManager.kt
@@ -287,6 +287,51 @@ class SkeletonConfigManager(
0f,
)
+ BoneType.LEFT_THUMB_PROXIMAL, BoneType.LEFT_THUMB_INTERMEDIATE, BoneType.LEFT_THUMB_DISTAL,
+ BoneType.RIGHT_THUMB_PROXIMAL, BoneType.RIGHT_THUMB_INTERMEDIATE, BoneType.RIGHT_THUMB_DISTAL,
+ -> setNodeOffset(
+ nodeOffset,
+ 0f,
+ -getOffset(SkeletonConfigOffsets.HAND_Y) * 0.2f,
+ -getOffset(SkeletonConfigOffsets.HAND_Y) * 0.1f,
+ )
+
+ BoneType.LEFT_INDEX_PROXIMAL, BoneType.LEFT_INDEX_INTERMEDIATE, BoneType.LEFT_INDEX_DISTAL,
+ BoneType.RIGHT_INDEX_PROXIMAL, BoneType.RIGHT_INDEX_INTERMEDIATE, BoneType.RIGHT_INDEX_DISTAL,
+ -> setNodeOffset(
+ nodeOffset,
+ 0f,
+ -getOffset(SkeletonConfigOffsets.HAND_Y) * 0.25f,
+ 0f,
+ )
+
+ BoneType.LEFT_MIDDLE_PROXIMAL, BoneType.LEFT_MIDDLE_INTERMEDIATE, BoneType.LEFT_MIDDLE_DISTAL,
+ BoneType.RIGHT_MIDDLE_PROXIMAL, BoneType.RIGHT_MIDDLE_INTERMEDIATE, BoneType.RIGHT_MIDDLE_DISTAL,
+ -> setNodeOffset(
+ nodeOffset,
+ 0f,
+ -getOffset(SkeletonConfigOffsets.HAND_Y) * 0.3f,
+ 0f,
+ )
+
+ BoneType.LEFT_RING_PROXIMAL, BoneType.LEFT_RING_INTERMEDIATE, BoneType.LEFT_RING_DISTAL,
+ BoneType.RIGHT_RING_PROXIMAL, BoneType.RIGHT_RING_INTERMEDIATE, BoneType.RIGHT_RING_DISTAL,
+ -> setNodeOffset(
+ nodeOffset,
+ 0f,
+ -getOffset(SkeletonConfigOffsets.HAND_Y) * 0.28f,
+ 0f,
+ )
+
+ BoneType.LEFT_LITTLE_PROXIMAL, BoneType.LEFT_LITTLE_INTERMEDIATE, BoneType.LEFT_LITTLE_DISTAL,
+ BoneType.RIGHT_LITTLE_PROXIMAL, BoneType.RIGHT_LITTLE_INTERMEDIATE, BoneType.RIGHT_LITTLE_DISTAL,
+ -> setNodeOffset(
+ nodeOffset,
+ 0f,
+ -getOffset(SkeletonConfigOffsets.HAND_Y) * 0.2f,
+ 0f,
+ )
+
else -> {}
}
}
diff --git a/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt b/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt
index ac8fc42aa..6aad01cb5 100644
--- a/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt
+++ b/server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt
@@ -61,6 +61,38 @@ class HumanSkeleton(
val leftHandBone = Bone(BoneType.LEFT_HAND)
val rightHandBone = Bone(BoneType.RIGHT_HAND)
+ // Finger bones
+ val leftThumbProximalBone = Bone(BoneType.LEFT_THUMB_PROXIMAL)
+ val leftThumbIntermediateBone = Bone(BoneType.LEFT_THUMB_INTERMEDIATE)
+ val leftThumbDistalBone = Bone(BoneType.LEFT_THUMB_DISTAL)
+ val leftIndexProximalBone = Bone(BoneType.LEFT_INDEX_PROXIMAL)
+ val leftIndexIntermediateBone = Bone(BoneType.LEFT_INDEX_INTERMEDIATE)
+ val leftIndexDistalBone = Bone(BoneType.LEFT_INDEX_DISTAL)
+ val leftMiddleProximalBone = Bone(BoneType.LEFT_MIDDLE_PROXIMAL)
+ val leftMiddleIntermediateBone = Bone(BoneType.LEFT_MIDDLE_INTERMEDIATE)
+ val leftMiddleDistalBone = Bone(BoneType.LEFT_MIDDLE_DISTAL)
+ val leftRingProximalBone = Bone(BoneType.LEFT_RING_PROXIMAL)
+ val leftRingIntermediateBone = Bone(BoneType.LEFT_RING_INTERMEDIATE)
+ val leftRingDistalBone = Bone(BoneType.LEFT_RING_DISTAL)
+ val leftLittleProximalBone = Bone(BoneType.LEFT_LITTLE_PROXIMAL)
+ val leftLittleIntermediateBone = Bone(BoneType.LEFT_LITTLE_INTERMEDIATE)
+ val leftLittleDistalBone = Bone(BoneType.LEFT_LITTLE_DISTAL)
+ val rightThumbProximalBone = Bone(BoneType.RIGHT_THUMB_PROXIMAL)
+ val rightThumbIntermediateBone = Bone(BoneType.RIGHT_THUMB_INTERMEDIATE)
+ val rightThumbDistalBone = Bone(BoneType.RIGHT_THUMB_DISTAL)
+ val rightIndexProximalBone = Bone(BoneType.RIGHT_INDEX_PROXIMAL)
+ val rightIndexIntermediateBone = Bone(BoneType.RIGHT_INDEX_INTERMEDIATE)
+ val rightIndexDistalBone = Bone(BoneType.RIGHT_INDEX_DISTAL)
+ val rightMiddleProximalBone = Bone(BoneType.RIGHT_MIDDLE_PROXIMAL)
+ val rightMiddleIntermediateBone = Bone(BoneType.RIGHT_MIDDLE_INTERMEDIATE)
+ val rightMiddleDistalBone = Bone(BoneType.RIGHT_MIDDLE_DISTAL)
+ val rightRingProximalBone = Bone(BoneType.RIGHT_RING_PROXIMAL)
+ val rightRingIntermediateBone = Bone(BoneType.RIGHT_RING_INTERMEDIATE)
+ val rightRingDistalBone = Bone(BoneType.RIGHT_RING_DISTAL)
+ val rightLittleProximalBone = Bone(BoneType.RIGHT_LITTLE_PROXIMAL)
+ val rightLittleIntermediateBone = Bone(BoneType.RIGHT_LITTLE_INTERMEDIATE)
+ val rightLittleDistalBone = Bone(BoneType.RIGHT_LITTLE_DISTAL)
+
// Tracker bones
val headTrackerBone = Bone(BoneType.HEAD_TRACKER)
val chestTrackerBone = Bone(BoneType.CHEST_TRACKER)
@@ -77,12 +109,10 @@ class HumanSkeleton(
// Buffers
var hasSpineTracker = false
var hasKneeTrackers = false
- var hasLeftLegTracker = false
- var hasRightLegTracker = false
- var hasLeftFootTracker = false
- var hasRightFootTracker = false
var hasLeftArmTracker = false
var hasRightArmTracker = false
+ var hasLeftFingerTracker = false
+ var hasRightFingerTracker = false
// Input trackers
var headTracker: Tracker? by Delegates.observable(null) { _, old, new ->
@@ -110,6 +140,36 @@ class HumanSkeleton(
var rightHandTracker: Tracker? = null
var leftShoulderTracker: Tracker? = null
var rightShoulderTracker: Tracker? = null
+ var leftThumbProximalTracker: Tracker? = null
+ var leftThumbIntermediateTracker: Tracker? = null
+ var leftThumbDistalTracker: Tracker? = null
+ var leftIndexProximalTracker: Tracker? = null
+ var leftIndexIntermediateTracker: Tracker? = null
+ var leftIndexDistalTracker: Tracker? = null
+ var leftMiddleProximalTracker: Tracker? = null
+ var leftMiddleIntermediateTracker: Tracker? = null
+ var leftMiddleDistalTracker: Tracker? = null
+ var leftRingProximalTracker: Tracker? = null
+ var leftRingIntermediateTracker: Tracker? = null
+ var leftRingDistalTracker: Tracker? = null
+ var leftLittleProximalTracker: Tracker? = null
+ var leftLittleIntermediateTracker: Tracker? = null
+ var leftLittleDistalTracker: Tracker? = null
+ var rightThumbProximalTracker: Tracker? = null
+ var rightThumbIntermediateTracker: Tracker? = null
+ var rightThumbDistalTracker: Tracker? = null
+ var rightIndexProximalTracker: Tracker? = null
+ var rightIndexIntermediateTracker: Tracker? = null
+ var rightIndexDistalTracker: Tracker? = null
+ var rightMiddleProximalTracker: Tracker? = null
+ var rightMiddleIntermediateTracker: Tracker? = null
+ var rightMiddleDistalTracker: Tracker? = null
+ var rightRingProximalTracker: Tracker? = null
+ var rightRingIntermediateTracker: Tracker? = null
+ var rightRingDistalTracker: Tracker? = null
+ var rightLittleProximalTracker: Tracker? = null
+ var rightLittleIntermediateTracker: Tracker? = null
+ var rightLittleDistalTracker: Tracker? = null
// Output trackers
var computedHeadTracker: Tracker? = null
@@ -259,24 +319,63 @@ class HumanSkeleton(
rightLowerArmBone.attachChild(rightHandBone)
rightHandBone.attachChild(rightHandTrackerBone)
}
+
+ // Fingers
+ leftHandBone.attachChild(leftThumbProximalBone)
+ leftThumbProximalBone.attachChild(leftThumbIntermediateBone)
+ leftThumbIntermediateBone.attachChild(leftThumbDistalBone)
+ leftHandBone.attachChild(leftIndexProximalBone)
+ leftIndexProximalBone.attachChild(leftIndexIntermediateBone)
+ leftIndexIntermediateBone.attachChild(leftIndexDistalBone)
+ leftHandBone.attachChild(leftMiddleProximalBone)
+ leftMiddleProximalBone.attachChild(leftMiddleIntermediateBone)
+ leftMiddleIntermediateBone.attachChild(leftMiddleDistalBone)
+ leftHandBone.attachChild(leftRingProximalBone)
+ leftRingProximalBone.attachChild(leftRingIntermediateBone)
+ leftRingIntermediateBone.attachChild(leftRingDistalBone)
+ leftHandBone.attachChild(leftLittleProximalBone)
+ leftLittleProximalBone.attachChild(leftLittleIntermediateBone)
+ leftLittleIntermediateBone.attachChild(leftLittleDistalBone)
+ rightHandBone.attachChild(rightThumbProximalBone)
+ rightThumbProximalBone.attachChild(rightThumbIntermediateBone)
+ rightThumbIntermediateBone.attachChild(rightThumbDistalBone)
+ rightHandBone.attachChild(rightIndexProximalBone)
+ rightIndexProximalBone.attachChild(rightIndexIntermediateBone)
+ rightIndexIntermediateBone.attachChild(rightIndexDistalBone)
+ rightHandBone.attachChild(rightMiddleProximalBone)
+ rightMiddleProximalBone.attachChild(rightMiddleIntermediateBone)
+ rightMiddleIntermediateBone.attachChild(rightMiddleDistalBone)
+ rightHandBone.attachChild(rightRingProximalBone)
+ rightRingProximalBone.attachChild(rightRingIntermediateBone)
+ rightRingIntermediateBone.attachChild(rightRingDistalBone)
+ rightHandBone.attachChild(rightLittleProximalBone)
+ rightLittleProximalBone.attachChild(rightLittleIntermediateBone)
+ rightLittleIntermediateBone.attachChild(rightLittleDistalBone)
}
/**
* Set input trackers from a list
*/
fun setTrackersFromList(trackers: List) {
+ // Head
headTracker = getTrackerForSkeleton(trackers, TrackerPosition.HEAD)
neckTracker = getTrackerForSkeleton(trackers, TrackerPosition.NECK)
+
+ // Spine
upperChestTracker = getTrackerForSkeleton(trackers, TrackerPosition.UPPER_CHEST)
chestTracker = getTrackerForSkeleton(trackers, TrackerPosition.CHEST)
waistTracker = getTrackerForSkeleton(trackers, TrackerPosition.WAIST)
hipTracker = getTrackerForSkeleton(trackers, TrackerPosition.HIP)
+
+ // Legs
leftUpperLegTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_UPPER_LEG)
leftLowerLegTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_LOWER_LEG)
leftFootTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_FOOT)
rightUpperLegTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_UPPER_LEG)
rightLowerLegTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_LOWER_LEG)
rightFootTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_FOOT)
+
+ // Arms
leftLowerArmTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_LOWER_ARM)
rightLowerArmTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_LOWER_ARM)
leftUpperArmTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_UPPER_ARM)
@@ -286,15 +385,53 @@ class HumanSkeleton(
leftShoulderTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_SHOULDER)
rightShoulderTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_SHOULDER)
- // Check for specific conditions and store them in booleans.
+ // Fingers
+ leftThumbProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_THUMB_PROXIMAL)
+ leftThumbIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_THUMB_INTERMEDIATE)
+ leftThumbDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_THUMB_DISTAL)
+ leftIndexProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_INDEX_PROXIMAL)
+ leftIndexIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_INDEX_INTERMEDIATE)
+ leftIndexDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_INDEX_DISTAL)
+ leftMiddleProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_MIDDLE_PROXIMAL)
+ leftMiddleIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_MIDDLE_INTERMEDIATE)
+ leftMiddleDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_MIDDLE_DISTAL)
+ leftRingProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_RING_PROXIMAL)
+ leftRingIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_RING_INTERMEDIATE)
+ leftRingDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_RING_DISTAL)
+ leftLittleProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_LITTLE_PROXIMAL)
+ leftLittleIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_LITTLE_INTERMEDIATE)
+ leftLittleDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.LEFT_LITTLE_DISTAL)
+ rightThumbProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_THUMB_PROXIMAL)
+ rightThumbIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_THUMB_INTERMEDIATE)
+ rightThumbDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_THUMB_DISTAL)
+ rightIndexProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_INDEX_PROXIMAL)
+ rightIndexIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_INDEX_INTERMEDIATE)
+ rightIndexDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_INDEX_DISTAL)
+ rightMiddleProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_MIDDLE_PROXIMAL)
+ rightMiddleIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_MIDDLE_INTERMEDIATE)
+ rightMiddleDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_MIDDLE_DISTAL)
+ rightRingProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_RING_PROXIMAL)
+ rightRingIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_RING_INTERMEDIATE)
+ rightRingDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_RING_DISTAL)
+ rightLittleProximalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_LITTLE_PROXIMAL)
+ rightLittleIntermediateTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_LITTLE_INTERMEDIATE)
+ rightLittleDistalTracker = getTrackerForSkeleton(trackers, TrackerPosition.RIGHT_LITTLE_DISTAL)
+
+ // Check for specific conditions and cache them
hasSpineTracker = upperChestTracker != null || chestTracker != null || waistTracker != null || hipTracker != null
hasKneeTrackers = leftUpperLegTracker != null && rightUpperLegTracker != null
- hasLeftLegTracker = leftUpperLegTracker != null || leftLowerLegTracker != null || leftFootTracker != null
- hasRightLegTracker = rightUpperLegTracker != null || rightLowerLegTracker != null || rightFootTracker != null
- hasLeftFootTracker = leftFootTracker != null
- hasRightFootTracker = rightFootTracker != null
hasLeftArmTracker = leftLowerArmTracker != null || leftUpperArmTracker != null
hasRightArmTracker = rightLowerArmTracker != null || rightUpperArmTracker != null
+ hasLeftFingerTracker = leftThumbProximalTracker != null || leftThumbIntermediateTracker != null || leftThumbDistalTracker != null ||
+ leftIndexProximalTracker != null || leftIndexIntermediateTracker != null || leftIndexDistalTracker != null ||
+ leftMiddleProximalTracker != null || leftMiddleIntermediateTracker != null || leftMiddleDistalTracker != null ||
+ leftRingProximalTracker != null || leftRingIntermediateTracker != null || leftRingDistalTracker != null ||
+ leftLittleProximalTracker != null || leftLittleIntermediateTracker != null || leftLittleDistalTracker != null
+ hasRightFingerTracker = rightThumbProximalTracker != null || rightThumbIntermediateTracker != null || rightThumbDistalTracker != null ||
+ rightIndexProximalTracker != null || rightIndexIntermediateTracker != null || rightIndexDistalTracker != null ||
+ rightMiddleProximalTracker != null || rightMiddleIntermediateTracker != null || rightMiddleDistalTracker != null ||
+ rightRingProximalTracker != null || rightRingIntermediateTracker != null || rightRingDistalTracker != null ||
+ rightLittleProximalTracker != null || rightLittleIntermediateTracker != null || rightLittleDistalTracker != null
// Rebuilds the arm skeleton nodes attachments
assembleSkeletonArms(true)
@@ -394,6 +531,7 @@ class HumanSkeleton(
// Spine
updateSpineTransforms()
+
// Left leg
updateLegTransforms(
leftUpperLegBone,
@@ -405,6 +543,7 @@ class HumanSkeleton(
leftLowerLegTracker,
leftFootTracker,
)
+
// Right leg
updateLegTransforms(
rightUpperLegBone,
@@ -416,6 +555,7 @@ class HumanSkeleton(
rightLowerLegTracker,
rightFootTracker,
)
+
// Left arm
updateArmTransforms(
isTrackingLeftArmFromController,
@@ -430,6 +570,7 @@ class HumanSkeleton(
leftLowerArmTracker,
leftHandTracker,
)
+
// Right arm
updateArmTransforms(
isTrackingRightArmFromController,
@@ -444,6 +585,116 @@ class HumanSkeleton(
rightLowerArmTracker,
rightHandTracker,
)
+
+ // Left thumb
+ updateFingerTransforms(
+ leftHandBone.getGlobalRotation(),
+ leftThumbProximalBone,
+ leftThumbIntermediateBone,
+ leftThumbDistalBone,
+ leftThumbProximalTracker,
+ leftThumbIntermediateTracker,
+ leftThumbDistalTracker,
+ )
+
+ // Left index
+ updateFingerTransforms(
+ leftHandBone.getGlobalRotation(),
+ leftIndexProximalBone,
+ leftIndexIntermediateBone,
+ leftIndexDistalBone,
+ leftIndexProximalTracker,
+ leftIndexIntermediateTracker,
+ leftIndexDistalTracker,
+ )
+
+ // Left middle
+ updateFingerTransforms(
+ leftHandBone.getGlobalRotation(),
+ leftMiddleProximalBone,
+ leftMiddleIntermediateBone,
+ leftMiddleDistalBone,
+ leftMiddleProximalTracker,
+ leftMiddleIntermediateTracker,
+ leftMiddleDistalTracker,
+ )
+
+ // Left ring
+ updateFingerTransforms(
+ leftHandBone.getGlobalRotation(),
+ leftRingProximalBone,
+ leftRingIntermediateBone,
+ leftRingDistalBone,
+ leftRingProximalTracker,
+ leftRingIntermediateTracker,
+ leftRingDistalTracker,
+ )
+
+ // Left little
+ updateFingerTransforms(
+ leftHandBone.getGlobalRotation(),
+ leftLittleProximalBone,
+ leftLittleIntermediateBone,
+ leftLittleDistalBone,
+ leftLittleProximalTracker,
+ leftLittleIntermediateTracker,
+ leftLittleDistalTracker,
+ )
+
+ // Right thumb
+ updateFingerTransforms(
+ rightHandBone.getGlobalRotation(),
+ rightThumbProximalBone,
+ rightThumbIntermediateBone,
+ rightThumbDistalBone,
+ rightThumbProximalTracker,
+ rightThumbIntermediateTracker,
+ rightThumbDistalTracker,
+ )
+
+ // Right index
+ updateFingerTransforms(
+ rightHandBone.getGlobalRotation(),
+ rightIndexProximalBone,
+ rightIndexIntermediateBone,
+ rightIndexDistalBone,
+ rightIndexProximalTracker,
+ rightIndexIntermediateTracker,
+ rightIndexDistalTracker,
+ )
+
+ // Right middle
+ updateFingerTransforms(
+ rightHandBone.getGlobalRotation(),
+ rightMiddleProximalBone,
+ rightMiddleIntermediateBone,
+ rightMiddleDistalBone,
+ rightMiddleProximalTracker,
+ rightMiddleIntermediateTracker,
+ rightMiddleDistalTracker,
+ )
+
+ // Right ring
+ updateFingerTransforms(
+ rightHandBone.getGlobalRotation(),
+ rightRingProximalBone,
+ rightRingIntermediateBone,
+ rightRingDistalBone,
+ rightRingProximalTracker,
+ rightRingIntermediateTracker,
+ rightRingDistalTracker,
+ )
+
+ // Right little
+ updateFingerTransforms(
+ rightHandBone.getGlobalRotation(),
+ rightLittleProximalBone,
+ rightLittleIntermediateBone,
+ rightLittleDistalBone,
+ rightLittleProximalTracker,
+ rightLittleIntermediateTracker,
+ rightLittleDistalTracker,
+ )
}
/**
@@ -767,6 +1018,46 @@ class HumanSkeleton(
}
}
+ /**
+ * Update a finger's 3 bones' transforms
+ */
+ private fun updateFingerTransforms(
+ handRotation: Quaternion,
+ proximalBone: Bone,
+ intermediateBone: Bone,
+ distalBone: Bone,
+ proximalTracker: Tracker?,
+ intermediateTracker: Tracker?,
+ distalTracker: Tracker?,
+ ) {
+ if (distalTracker == null && intermediateTracker == null && proximalTracker == null) {
+ // Set fingers' rotations to the hand's if no finger tracker
+ proximalBone.setRotation(handRotation)
+ intermediateBone.setRotation(handRotation)
+ distalBone.setRotation(handRotation)
+ }
+
+ // Note: we use interpQ instead of interpR in order to slerp over 180 degrees.
+ // Start of finger
+ proximalTracker?.let {
+ proximalBone.setRotation(it.getRotation())
+ if (intermediateTracker == null) intermediateBone.setRotation(handRotation.interpQ(it.getRotation(), 2.12f))
+ if (distalTracker == null) distalBone.setRotation(handRotation.interpQ(it.getRotation(), 3.03f))
+ }
+ // Middle of finger
+ intermediateTracker?.let {
+ if (proximalTracker == null) proximalBone.setRotation(handRotation.interpQ(it.getRotation(), 0.47f))
+ intermediateBone.setRotation(it.getRotation())
+ if (distalTracker == null) distalBone.setRotation(handRotation.interpQ(it.getRotation(), 1.43f))
+ }
+ // Tip of finger
+ distalTracker?.let {
+ if (proximalTracker == null && intermediateTracker == null) proximalBone.setRotation(handRotation.interpQ(it.getRotation(), 0.33f))
+ if (intermediateTracker == null) intermediateBone.setRotation(handRotation.interpQ(it.getRotation(), 0.7f))
+ distalBone.setRotation(it.getRotation())
+ }
+ }
+
/**
* Rotates the first Quaternion to match its yaw and roll to the rotation of
* the second Quaternion
@@ -959,6 +1250,36 @@ class HumanSkeleton(
BoneType.RIGHT_HAND -> rightHandBone
BoneType.LEFT_HAND_TRACKER -> leftHandTrackerBone
BoneType.RIGHT_HAND_TRACKER -> rightHandTrackerBone
+ BoneType.LEFT_THUMB_PROXIMAL -> leftThumbProximalBone
+ BoneType.LEFT_THUMB_INTERMEDIATE -> leftThumbIntermediateBone
+ BoneType.LEFT_THUMB_DISTAL -> leftThumbDistalBone
+ BoneType.LEFT_INDEX_PROXIMAL -> leftIndexProximalBone
+ BoneType.LEFT_INDEX_INTERMEDIATE -> leftIndexIntermediateBone
+ BoneType.LEFT_INDEX_DISTAL -> leftIndexDistalBone
+ BoneType.LEFT_MIDDLE_PROXIMAL -> leftMiddleProximalBone
+ BoneType.LEFT_MIDDLE_INTERMEDIATE -> leftMiddleIntermediateBone
+ BoneType.LEFT_MIDDLE_DISTAL -> leftMiddleDistalBone
+ BoneType.LEFT_RING_PROXIMAL -> leftRingProximalBone
+ BoneType.LEFT_RING_INTERMEDIATE -> leftRingIntermediateBone
+ BoneType.LEFT_RING_DISTAL -> leftRingDistalBone
+ BoneType.LEFT_LITTLE_PROXIMAL -> leftLittleProximalBone
+ BoneType.LEFT_LITTLE_INTERMEDIATE -> leftLittleIntermediateBone
+ BoneType.LEFT_LITTLE_DISTAL -> leftLittleDistalBone
+ BoneType.RIGHT_THUMB_PROXIMAL -> rightThumbProximalBone
+ BoneType.RIGHT_THUMB_INTERMEDIATE -> rightThumbIntermediateBone
+ BoneType.RIGHT_THUMB_DISTAL -> rightThumbDistalBone
+ BoneType.RIGHT_INDEX_PROXIMAL -> rightIndexProximalBone
+ BoneType.RIGHT_INDEX_INTERMEDIATE -> rightIndexIntermediateBone
+ BoneType.RIGHT_INDEX_DISTAL -> rightIndexDistalBone
+ BoneType.RIGHT_MIDDLE_PROXIMAL -> rightMiddleProximalBone
+ BoneType.RIGHT_MIDDLE_INTERMEDIATE -> rightMiddleIntermediateBone
+ BoneType.RIGHT_MIDDLE_DISTAL -> rightMiddleDistalBone
+ BoneType.RIGHT_RING_PROXIMAL -> rightRingProximalBone
+ BoneType.RIGHT_RING_INTERMEDIATE -> rightRingIntermediateBone
+ BoneType.RIGHT_RING_DISTAL -> rightRingDistalBone
+ BoneType.RIGHT_LITTLE_PROXIMAL -> rightLittleProximalBone
+ BoneType.RIGHT_LITTLE_INTERMEDIATE -> rightLittleIntermediateBone
+ BoneType.RIGHT_LITTLE_DISTAL -> rightLittleDistalBone
}
/**
@@ -988,6 +1309,36 @@ class HumanSkeleton(
rightLowerArmBone,
leftHandBone,
rightHandBone,
+ leftThumbProximalBone,
+ leftThumbIntermediateBone,
+ leftThumbDistalBone,
+ leftIndexProximalBone,
+ leftIndexIntermediateBone,
+ leftIndexDistalBone,
+ leftMiddleProximalBone,
+ leftMiddleIntermediateBone,
+ leftMiddleDistalBone,
+ leftRingProximalBone,
+ leftRingIntermediateBone,
+ leftRingDistalBone,
+ leftLittleProximalBone,
+ leftLittleIntermediateBone,
+ leftLittleDistalBone,
+ rightThumbProximalBone,
+ rightThumbIntermediateBone,
+ rightThumbDistalBone,
+ rightIndexProximalBone,
+ rightIndexIntermediateBone,
+ rightIndexDistalBone,
+ rightMiddleProximalBone,
+ rightMiddleIntermediateBone,
+ rightMiddleDistalBone,
+ rightRingProximalBone,
+ rightRingIntermediateBone,
+ rightRingDistalBone,
+ rightLittleProximalBone,
+ rightLittleIntermediateBone,
+ rightLittleDistalBone,
)
/**
@@ -1007,6 +1358,36 @@ class HumanSkeleton(
rightHandBone,
leftHandTrackerBone,
rightHandTrackerBone,
+ leftThumbProximalBone,
+ leftThumbIntermediateBone,
+ leftThumbDistalBone,
+ leftIndexProximalBone,
+ leftIndexIntermediateBone,
+ leftIndexDistalBone,
+ leftMiddleProximalBone,
+ leftMiddleIntermediateBone,
+ leftMiddleDistalBone,
+ leftRingProximalBone,
+ leftRingIntermediateBone,
+ leftRingDistalBone,
+ leftLittleProximalBone,
+ leftLittleIntermediateBone,
+ leftLittleDistalBone,
+ rightThumbProximalBone,
+ rightThumbIntermediateBone,
+ rightThumbDistalBone,
+ rightIndexProximalBone,
+ rightIndexIntermediateBone,
+ rightIndexDistalBone,
+ rightMiddleProximalBone,
+ rightMiddleIntermediateBone,
+ rightMiddleDistalBone,
+ rightRingProximalBone,
+ rightRingIntermediateBone,
+ rightRingDistalBone,
+ rightLittleProximalBone,
+ rightLittleIntermediateBone,
+ rightLittleDistalBone,
)
val hmdHeight: Float
@@ -1053,6 +1434,36 @@ class HumanSkeleton(
rightHandTracker,
leftShoulderTracker,
rightShoulderTracker,
+ leftThumbProximalTracker,
+ leftThumbIntermediateTracker,
+ leftThumbDistalTracker,
+ leftIndexProximalTracker,
+ leftIndexIntermediateTracker,
+ leftIndexDistalTracker,
+ leftMiddleProximalTracker,
+ leftMiddleIntermediateTracker,
+ leftMiddleDistalTracker,
+ leftRingProximalTracker,
+ leftRingIntermediateTracker,
+ leftRingDistalTracker,
+ leftLittleProximalTracker,
+ leftLittleIntermediateTracker,
+ leftLittleDistalTracker,
+ rightThumbProximalTracker,
+ rightThumbIntermediateTracker,
+ rightThumbDistalTracker,
+ rightIndexProximalTracker,
+ rightIndexIntermediateTracker,
+ rightIndexDistalTracker,
+ rightMiddleProximalTracker,
+ rightMiddleIntermediateTracker,
+ rightMiddleDistalTracker,
+ rightRingProximalTracker,
+ rightRingIntermediateTracker,
+ rightRingDistalTracker,
+ rightLittleProximalTracker,
+ rightLittleIntermediateTracker,
+ rightLittleDistalTracker,
)
fun resetTrackersFull(resetSourceName: String?) {
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/Tracker.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/Tracker.kt
index e5d8ab2f5..569028926 100644
--- a/server/core/src/main/java/dev/slimevr/tracking/trackers/Tracker.kt
+++ b/server/core/src/main/java/dev/slimevr/tracking/trackers/Tracker.kt
@@ -319,12 +319,12 @@ class Tracker @JvmOverloads constructor(
* it too much should be avoided for performance reasons.
*/
fun getRotation(): Quaternion {
- var rot = if (allowFiltering && filteringHandler.enabled) {
+ var rot = if (allowFiltering && filteringHandler.filteringEnabled) {
// Get filtered rotation
filteringHandler.getFilteredRotation()
} else {
// Get unfiltered rotation
- _rotation
+ filteringHandler.getTrackedRotation()
}
// Reset if needed and is not computed and internal
@@ -351,12 +351,12 @@ class Tracker @JvmOverloads constructor(
* This is used for debugging/visualizing tracker data
*/
fun getIdentityAdjustedRotation(): Quaternion {
- var rot = if (filteringHandler.enabled) {
+ var rot = if (filteringHandler.filteringEnabled) {
// Get filtered rotation
filteringHandler.getFilteredRotation()
} else {
// Get unfiltered rotation
- _rotation
+ filteringHandler.getTrackedRotation()
}
// Reset if needed or is a computed tracker besides head
@@ -372,7 +372,7 @@ class Tracker @JvmOverloads constructor(
* Gets the raw (unadjusted) rotation of the tracker.
* If this is an IMU, this will be the raw sensor rotation.
*/
- fun getRawRotation(): Quaternion = _rotation
+ fun getRawRotation() = _rotation
/**
* Sets the raw (unadjusted) rotation of the tracker.
@@ -406,4 +406,11 @@ class Tracker @JvmOverloads constructor(
*/
val tps: Float
get() = timer.averageFPS
+
+ /**
+ * Call when doing a full reset to reset the tracking of rotations >180 degrees
+ */
+ fun resetFilteringQuats() {
+ filteringHandler.resetQuats(_rotation)
+ }
}
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerFilteringHandler.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerFilteringHandler.kt
index 5e7a8ca12..e00f06b8a 100644
--- a/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerFilteringHandler.kt
+++ b/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerFilteringHandler.kt
@@ -12,8 +12,9 @@ import io.github.axisangles.ktmath.Quaternion
*/
class TrackerFilteringHandler {
- private var movingAverage: QuaternionMovingAverage? = null
- var enabled = false
+ private var filteringMovingAverage: QuaternionMovingAverage? = null
+ private var trackingMovingAverage = QuaternionMovingAverage(TrackerFilters.NONE)
+ var filteringEnabled = false
/**
* Reads/loads filtering settings from given config
@@ -21,15 +22,15 @@ class TrackerFilteringHandler {
fun readFilteringConfig(config: FiltersConfig, currentRawRotation: Quaternion) {
val type = TrackerFilters.getByConfigkey(config.type)
if (type == TrackerFilters.SMOOTHING || type == TrackerFilters.PREDICTION) {
- movingAverage = QuaternionMovingAverage(
+ filteringMovingAverage = QuaternionMovingAverage(
type,
config.amount,
currentRawRotation,
)
- enabled = true
+ filteringEnabled = true
} else {
- movingAverage = null
- enabled = false
+ filteringMovingAverage = null
+ filteringEnabled = false
}
}
@@ -37,18 +38,33 @@ class TrackerFilteringHandler {
* Update the moving average to make it smooth
*/
fun update() {
- movingAverage?.update()
+ trackingMovingAverage.update()
+ filteringMovingAverage?.update()
}
/**
* Updates the latest rotation
*/
fun dataTick(currentRawRotation: Quaternion) {
- movingAverage?.addQuaternion(currentRawRotation)
+ trackingMovingAverage.addQuaternion(currentRawRotation)
+ filteringMovingAverage?.addQuaternion(currentRawRotation)
}
+ /**
+ * Call when doing a full reset to reset the tracking of rotations >180 degrees
+ */
+ fun resetQuats(currentRawRotation: Quaternion) {
+ trackingMovingAverage.resetQuats(currentRawRotation)
+ filteringMovingAverage?.resetQuats(currentRawRotation)
+ }
+
+ /**
+ * Gets the tracked rotation from the moving average (allows >180 degrees)
+ */
+ fun getTrackedRotation() = trackingMovingAverage.filteredQuaternion
+
/**
* Get the filtered rotation from the moving average
*/
- fun getFilteredRotation(): Quaternion = movingAverage?.filteredQuaternion ?: Quaternion.IDENTITY
+ fun getFilteredRotation() = filteringMovingAverage?.filteredQuaternion ?: Quaternion.IDENTITY
}
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerPosition.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerPosition.kt
index 559aea899..bc4d1f554 100644
--- a/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerPosition.kt
+++ b/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerPosition.kt
@@ -36,16 +36,64 @@ enum class TrackerPosition(
RIGHT_HAND("body:right_hand", TrackerRole.RIGHT_HAND, BodyPart.RIGHT_HAND),
LEFT_SHOULDER("body:left_shoulder", TrackerRole.LEFT_SHOULDER, BodyPart.LEFT_SHOULDER),
RIGHT_SHOULDER("body:right_shoulder", TrackerRole.RIGHT_SHOULDER, BodyPart.RIGHT_SHOULDER),
+ LEFT_THUMB_PROXIMAL("body:left_thumb_proximal", null, BodyPart.LEFT_THUMB_PROXIMAL),
+ LEFT_THUMB_INTERMEDIATE("body:left_thumb_intermediate", null, BodyPart.LEFT_THUMB_INTERMEDIATE),
+ LEFT_THUMB_DISTAL("body:left_thumb_distal", null, BodyPart.LEFT_THUMB_DISTAL),
+ LEFT_INDEX_PROXIMAL("body:left_index_proximal", null, BodyPart.LEFT_INDEX_PROXIMAL),
+ LEFT_INDEX_INTERMEDIATE("body:left_index_intermediate", null, BodyPart.LEFT_INDEX_INTERMEDIATE),
+ LEFT_INDEX_DISTAL("body:left_index_distal", null, BodyPart.LEFT_INDEX_DISTAL),
+ LEFT_MIDDLE_PROXIMAL("body:left_middle_proximal", null, BodyPart.LEFT_MIDDLE_PROXIMAL),
+ LEFT_MIDDLE_INTERMEDIATE("body:left_middle_intermediate", null, BodyPart.LEFT_MIDDLE_INTERMEDIATE),
+ LEFT_MIDDLE_DISTAL("body:left_middle_distal", null, BodyPart.LEFT_MIDDLE_DISTAL),
+ LEFT_RING_PROXIMAL("body:left_ring_proximal", null, BodyPart.LEFT_RING_PROXIMAL),
+ LEFT_RING_INTERMEDIATE("body:left_ring_intermediate", null, BodyPart.LEFT_RING_INTERMEDIATE),
+ LEFT_RING_DISTAL("body:left_ring_distal", null, BodyPart.LEFT_RING_DISTAL),
+ LEFT_LITTLE_PROXIMAL("body:left_little_proximal", null, BodyPart.LEFT_LITTLE_PROXIMAL),
+ LEFT_LITTLE_INTERMEDIATE("body:left_little_intermediate", null, BodyPart.LEFT_LITTLE_INTERMEDIATE),
+ LEFT_LITTLE_DISTAL("body:left_little_distal", null, BodyPart.LEFT_LITTLE_DISTAL),
+ RIGHT_THUMB_PROXIMAL("body:right_thumb_proximal", null, BodyPart.RIGHT_THUMB_PROXIMAL),
+ RIGHT_THUMB_INTERMEDIATE("body:right_thumb_intermediate", null, BodyPart.RIGHT_THUMB_INTERMEDIATE),
+ RIGHT_THUMB_DISTAL("body:right_thumb_distal", null, BodyPart.RIGHT_THUMB_DISTAL),
+ RIGHT_INDEX_PROXIMAL("body:right_index_proximal", null, BodyPart.RIGHT_INDEX_PROXIMAL),
+ RIGHT_INDEX_INTERMEDIATE("body:right_index_intermediate", null, BodyPart.RIGHT_INDEX_INTERMEDIATE),
+ RIGHT_INDEX_DISTAL("body:right_index_distal", null, BodyPart.RIGHT_INDEX_DISTAL),
+ RIGHT_MIDDLE_PROXIMAL("body:right_middle_proximal", null, BodyPart.RIGHT_MIDDLE_PROXIMAL),
+ RIGHT_MIDDLE_INTERMEDIATE("body:right_middle_intermediate", null, BodyPart.RIGHT_MIDDLE_INTERMEDIATE),
+ RIGHT_MIDDLE_DISTAL("body:right_middle_distal", null, BodyPart.RIGHT_MIDDLE_DISTAL),
+ RIGHT_RING_PROXIMAL("body:right_ring_proximal", null, BodyPart.RIGHT_RING_PROXIMAL),
+ RIGHT_RING_INTERMEDIATE("body:right_ring_intermediate", null, BodyPart.RIGHT_RING_INTERMEDIATE),
+ RIGHT_RING_DISTAL("body:right_ring_distal", null, BodyPart.RIGHT_RING_DISTAL),
+ RIGHT_LITTLE_PROXIMAL("body:right_little_proximal", null, BodyPart.RIGHT_LITTLE_PROXIMAL),
+ RIGHT_LITTLE_INTERMEDIATE("body:right_little_intermediate", null, BodyPart.RIGHT_LITTLE_INTERMEDIATE),
+ RIGHT_LITTLE_DISTAL("body:right_little_distal", null, BodyPart.RIGHT_LITTLE_DISTAL),
;
/**
* Returns the default mounting orientation for the body part
*/
fun defaultMounting(): Quaternion = when (this) {
- LEFT_LOWER_ARM, LEFT_HAND -> Quaternion.SLIMEVR.LEFT
- RIGHT_LOWER_ARM, RIGHT_HAND -> Quaternion.SLIMEVR.RIGHT
+ LEFT_LOWER_ARM, LEFT_HAND,
+ LEFT_INDEX_PROXIMAL, LEFT_INDEX_INTERMEDIATE,
+ LEFT_INDEX_DISTAL, LEFT_MIDDLE_PROXIMAL,
+ LEFT_MIDDLE_INTERMEDIATE, LEFT_MIDDLE_DISTAL,
+ LEFT_RING_PROXIMAL, LEFT_RING_INTERMEDIATE,
+ LEFT_RING_DISTAL, LEFT_LITTLE_PROXIMAL,
+ LEFT_LITTLE_INTERMEDIATE, LEFT_LITTLE_DISTAL,
+ -> Quaternion.SLIMEVR.LEFT
+
+ RIGHT_LOWER_ARM, RIGHT_HAND,
+ RIGHT_INDEX_PROXIMAL, RIGHT_INDEX_INTERMEDIATE,
+ RIGHT_INDEX_DISTAL, RIGHT_MIDDLE_PROXIMAL,
+ RIGHT_MIDDLE_INTERMEDIATE, RIGHT_MIDDLE_DISTAL,
+ RIGHT_RING_PROXIMAL, RIGHT_RING_INTERMEDIATE,
+ RIGHT_RING_DISTAL, RIGHT_LITTLE_PROXIMAL,
+ RIGHT_LITTLE_INTERMEDIATE, RIGHT_LITTLE_DISTAL,
+ -> Quaternion.SLIMEVR.RIGHT
+
LEFT_UPPER_ARM, LEFT_LOWER_LEG -> Quaternion.SLIMEVR.FRONT_LEFT
+
RIGHT_UPPER_ARM, RIGHT_LOWER_LEG -> Quaternion.SLIMEVR.FRONT_RIGHT
+
else -> Quaternion.SLIMEVR.FRONT
}
diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerResetsHandler.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerResetsHandler.kt
index ef0d05319..8b6fa06a6 100644
--- a/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerResetsHandler.kt
+++ b/server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerResetsHandler.kt
@@ -214,9 +214,9 @@ class TrackerResetsHandler(val tracker: Tracker) {
*/
fun resetFull(reference: Quaternion) {
// Adjust for T-Pose (down)
- tposeDownFix = if ((isLeftArmTracker() && armsResetMode == ArmsResetModes.TPOSE_DOWN)) {
+ tposeDownFix = if (((isLeftArmTracker() || isLeftFingerTracker()) && armsResetMode == ArmsResetModes.TPOSE_DOWN)) {
EulerAngles(EulerOrder.YZX, 0f, 0f, -FastMath.HALF_PI).toQuaternion()
- } else if ((isRightArmTracker() && armsResetMode == ArmsResetModes.TPOSE_DOWN)) {
+ } else if (((isRightArmTracker() || isRightFingerTracker()) && armsResetMode == ArmsResetModes.TPOSE_DOWN)) {
EulerAngles(EulerOrder.YZX, 0f, 0f, FastMath.HALF_PI).toQuaternion()
} else {
Quaternion.IDENTITY
@@ -280,6 +280,8 @@ class TrackerResetsHandler(val tracker: Tracker) {
VRServer.instance.statusSystem.removeStatus(this.tracker.lastResetStatus)
this.tracker.lastResetStatus = 0u
}
+
+ tracker.resetFilteringQuats()
}
/**
@@ -314,6 +316,8 @@ class TrackerResetsHandler(val tracker: Tracker) {
this.tracker.statusResetRecently = false
this.tracker.lastResetStatus = 0u
}
+
+ tracker.resetFilteringQuats()
}
/**
@@ -338,15 +342,17 @@ class TrackerResetsHandler(val tracker: Tracker) {
// Calculate the yaw angle using tan
var yawAngle = atan2(rotVector.x, rotVector.z)
- // Adjust for T-Pose
+ // Adjust for T-Pose and fingers
if ((isLeftArmTracker() && armsResetMode == ArmsResetModes.TPOSE_DOWN) ||
- (isRightArmTracker() && armsResetMode == ArmsResetModes.TPOSE_UP)
+ (isRightArmTracker() && armsResetMode == ArmsResetModes.TPOSE_UP) ||
+ isLeftFingerTracker()
) {
// Tracker goes right
yawAngle -= FastMath.HALF_PI
}
if ((isLeftArmTracker() && armsResetMode == ArmsResetModes.TPOSE_UP) ||
- (isRightArmTracker() && armsResetMode == ArmsResetModes.TPOSE_DOWN)
+ (isRightArmTracker() && armsResetMode == ArmsResetModes.TPOSE_DOWN) ||
+ isRightFingerTracker()
) {
// Tracker goes left
yawAngle += FastMath.HALF_PI
@@ -365,6 +371,8 @@ class TrackerResetsHandler(val tracker: Tracker) {
// save mounting reset
if (saveMountingReset) tracker.saveMountingResetOrientation(mountRotFix)
+
+ tracker.resetFilteringQuats()
}
fun clearMounting() {
@@ -573,4 +581,46 @@ class TrackerResetsHandler(val tracker: Tracker) {
}
return false
}
+
+ private fun isLeftFingerTracker(): Boolean {
+ tracker.trackerPosition?.let {
+ return it == TrackerPosition.LEFT_THUMB_PROXIMAL ||
+ it == TrackerPosition.LEFT_THUMB_INTERMEDIATE ||
+ it == TrackerPosition.LEFT_THUMB_DISTAL ||
+ it == TrackerPosition.LEFT_INDEX_PROXIMAL ||
+ it == TrackerPosition.LEFT_INDEX_INTERMEDIATE ||
+ it == TrackerPosition.LEFT_INDEX_DISTAL ||
+ it == TrackerPosition.LEFT_MIDDLE_PROXIMAL ||
+ it == TrackerPosition.LEFT_MIDDLE_INTERMEDIATE ||
+ it == TrackerPosition.LEFT_MIDDLE_DISTAL ||
+ it == TrackerPosition.LEFT_RING_PROXIMAL ||
+ it == TrackerPosition.LEFT_RING_INTERMEDIATE ||
+ it == TrackerPosition.LEFT_RING_DISTAL ||
+ it == TrackerPosition.LEFT_LITTLE_PROXIMAL ||
+ it == TrackerPosition.LEFT_LITTLE_INTERMEDIATE ||
+ it == TrackerPosition.LEFT_LITTLE_DISTAL
+ }
+ return false
+ }
+
+ private fun isRightFingerTracker(): Boolean {
+ tracker.trackerPosition?.let {
+ return it == TrackerPosition.RIGHT_THUMB_PROXIMAL ||
+ it == TrackerPosition.RIGHT_THUMB_INTERMEDIATE ||
+ it == TrackerPosition.RIGHT_THUMB_DISTAL ||
+ it == TrackerPosition.RIGHT_INDEX_PROXIMAL ||
+ it == TrackerPosition.RIGHT_INDEX_INTERMEDIATE ||
+ it == TrackerPosition.RIGHT_INDEX_DISTAL ||
+ it == TrackerPosition.RIGHT_MIDDLE_PROXIMAL ||
+ it == TrackerPosition.RIGHT_MIDDLE_INTERMEDIATE ||
+ it == TrackerPosition.RIGHT_MIDDLE_DISTAL ||
+ it == TrackerPosition.RIGHT_RING_PROXIMAL ||
+ it == TrackerPosition.RIGHT_RING_INTERMEDIATE ||
+ it == TrackerPosition.RIGHT_RING_DISTAL ||
+ it == TrackerPosition.RIGHT_LITTLE_PROXIMAL ||
+ it == TrackerPosition.RIGHT_LITTLE_INTERMEDIATE ||
+ it == TrackerPosition.RIGHT_LITTLE_DISTAL
+ }
+ return false
+ }
}
diff --git a/solarxr-protocol b/solarxr-protocol
index 73fca6300..863a38fa2 160000
--- a/solarxr-protocol
+++ b/solarxr-protocol
@@ -1 +1 @@
-Subproject commit 73fca6300d70ee5e73258ce98a7dbae4d63b9cc8
+Subproject commit 863a38fa2bf5cec6580008068e8630374d185d9b