Compare commits

..
116 Commits
Author SHA1 Message Date
Erimel f30ee3bcce Update solarxr-protocol 2024-11-14 21:24:29 -05:00
Erimel e3a99cdcf5 Merge branch 'main' into flex 2024-11-14 21:19:33 -05:00
Uriel 67df399f14 Fix ktor crashing because proguard minifies for Android (#1240) 2024-11-14 02:25:49 +03:00
Uriel 222359692e Support not having git for making android builds (#1237) 2024-11-13 18:08:56 -03:00
Uriel 288db165a7 Repair husky migration to v9 2024-11-11 22:55:27 +01:00
Uriel 5c5636aa24 New Pontoon translations (#1228) 2024-11-06 12:25:32 +01:00
Meow Wei 8e449763a1 Pontoon: Update Traditional Chinese (zh-Hant) localization of GUI
Co-authored-by: Meow Wei <[email protected]>
2024-11-06 12:14:41 +01:00
002de7bcef Pontoon: Update German (de) localization of GUI
Co-authored-by: TheDevMinerTV <[email protected]>
Co-authored-by: unlogisch <[email protected]>
Co-authored-by: antonyscherrer <[email protected]>
2024-11-06 12:14:25 +01:00
Uriel db616eaa95 dont create vrconfig.yml folder (#1229) 2024-11-06 12:12:21 +01:00
Uriel 8eaa59f0ce tested and improved the code 2024-11-06 12:07:26 +01:00
Uriel d121973e85 delete folder if it already exists 2024-11-06 11:42:01 +01:00
Uriel 30367a9204 dont create `vrconfig.yml folder 2024-11-06 11:34:11 +01:00
Uriel ab10629b84 New Pontoon translations (#1171) 2024-11-05 18:27:42 +01:00
infopcgoodandKamilake f7d04365cd Pontoon: Update Korean (ko) localization of GUI
Co-authored-by: infopcgood <[email protected]>
Co-authored-by: Kamilake <[email protected]>
2024-11-05 18:17:14 +01:00
618914dbf1 Pontoon: Update Russian (ru) localization of GUI
Co-authored-by: Graphite0 <[email protected]>
Co-authored-by: Flar <[email protected]>
Co-authored-by: Sergey <[email protected]>
Co-authored-by: SummerArtz <[email protected]>
2024-11-05 18:17:08 +01:00
LavArizandUriel 2d107b1617 Pontoon: Update Spain Spanish (es-ES) localization of GUI
Co-authored-by: LavAriz <[email protected]>
Co-authored-by: Uriel <[email protected]>
2024-11-05 18:17:08 +01:00
MaxEvilandUriel 4922a84ee5 Pontoon: Update Latinamerican Spanish (es-419) localization of GUI
Co-authored-by: MaxEvil <[email protected]>
Co-authored-by: Uriel <[email protected]>
2024-11-05 18:17:03 +01:00
2dcb530bef Pontoon: Update German (de) localization of GUI
Co-authored-by: antonyscherrer <[email protected]>
Co-authored-by: Kyra <[email protected]>
Co-authored-by: unlogisch <[email protected]>
Co-authored-by: TheDevMinerTV <[email protected]>
2024-11-05 18:16:51 +01:00
Mama-GenandMitsuaky 22a357c3dd Pontoon: Update Brazilian Portuguese (pt-BR) localization of GUI
Co-authored-by: Mama-Gen <[email protected]>
Co-authored-by: Mitsuaky <[email protected]>
2024-11-05 18:16:35 +01:00
Erimel 0de869e91a Pontoon: Update French (fr) localization of GUI
Co-authored-by: Erimel <[email protected]>
2024-11-05 18:16:23 +01:00
MenacingExiler 8d58e02816 Pontoon: Update Vietnamese (vi) localization of GUI
Co-authored-by: MenacingExiler <[email protected]>
2024-11-05 18:16:19 +01:00
nekomona cfcfa3a999 Pontoon: Update Simplified Chinese (zh-Hans) localization of GUI
Co-authored-by: nekomona <[email protected]>
2024-11-05 18:16:14 +01:00
JaydenHaandMeow Wei 55a1f7a4ce Pontoon: Update Traditional Chinese (zh-Hant) localization of GUI
Co-authored-by: JaydenHa <[email protected]>
Co-authored-by: Meow Wei <[email protected]>
2024-11-05 18:16:05 +01:00
28182eb776 Pontoon: Update Polish (pl) localization of GUI
Co-authored-by: ReDoX <[email protected]>
Co-authored-by: michael091 <[email protected]>
Co-authored-by: stronzo <[email protected]>
Co-authored-by: MenacingExiler <[email protected]>
Co-authored-by: Tailsy <[email protected]>
2024-11-05 18:15:58 +01:00
Erimel 704f2157ee remove debug logs 2024-11-03 20:47:34 -05:00
Uriel fa096d627e Make label of tracker name use the translation function (#1224) 2024-11-03 16:23:39 -03:00
Uriel 662ac1fc84 Check if buffer is the size of a u16 at least before getting it (#1226) 2024-11-03 16:15:15 -03:00
Uriel e676a15609 Improve logic of magnetometer toggle (#1225) 2024-10-31 22:56:26 +03:00
Uriel 7a0292756d Add check for magnetometer not being supported on SensorConfig 2024-10-31 19:25:24 +01:00
Uriel d753926967 Fix magnetometer status bug and fix locale string plural rules (#1223) 2024-10-30 23:07:59 -03:00
Uriel 76b2803ce8 Update nix flake (#1221) 2024-10-30 21:57:06 +02:00
Uriel d26420a3e0 Fix labeler having wrong regex for GUI label 2024-10-30 20:55:06 +01:00
Uriel 6b6e0c6e22 Fix missing translation key on tracker settings for Tracker name (#1215) 2024-10-30 21:03:00 +02:00
Uriel 45c49e60be Implement magnetometer toggle for firmware (#1114) 2024-10-30 21:02:30 +02:00
Uriel 9733cf0430 Fix finishing setup wizard not make it be skipped next time (#1212) 2024-10-30 20:33:18 +02:00
Uriel c57a758ed3 Don't upload desktop.jar on CI (#1211) 2024-10-30 20:19:02 +02:00
Erimel acbf99dc4a Fix Drift compensation prediction description (#1216) 2024-10-30 20:18:30 +02:00
sctanf 11576c1e66 Hid update protocol (#1200) 2024-10-30 20:17:32 +02:00
Uriel a998797435 Auto label pull requests (#1217) 2024-10-30 19:53:55 +02:00
Butterscotch!andErimel eb9d9145f1 Clarify AutoBone error after #1185 (#1214)
Co-authored-by: Erimel <[email protected]>
2024-10-28 18:56:50 -03:00
Butterscotch! 3bbf5cb3e3 Fix style for tracker "shadow" & add to all cases (#1204) 2024-10-25 21:47:06 -03:00
Uriel 26ec95b2a7 Fix tauri not autosaving store on close anymore (#1209) 2024-10-25 21:33:24 -03:00
Uriel 7cb500abef Fix typo on OBTAINING_MAC_ADDRESS (#1206) 2024-10-25 19:41:31 +02:00
Erimel 16779364c9 Fix vmc head shift for lock head (#1208) 2024-10-25 18:06:13 +02:00
Butterscotch! e058c69192 Add asexual theme (#1207) 2024-10-22 21:37:16 -03:00
Uriel 99a4141a7d Fix spacing issues on advanced settings (#1198) 2024-10-16 13:52:06 -03:00
sctanf 5d65b807ef catch unable to find hid library (#1199) 2024-10-15 22:52:57 -03:00
Butterscotch! 9cacf993ad Remove check for port 35903 (#1195) 2024-10-15 22:39:49 -03:00
Uriel 8f9e83c231 add runtime check for appindicator on linux (#1193) 2024-10-14 18:22:08 +02:00
Uriel a0b1abed43 Update to Tauri v2 stable (#1194) 2024-10-14 13:18:43 +02:00
Erimel 95acdaf8c2 use byte and uint 2024-10-11 15:24:33 -04:00
Erimel 09c51fb5df protocolVersion and move datatype in firmwareconstants 2024-10-11 14:43:53 -04:00
Erimel d69399d471 don't add more stuff to handshake (legacy-only) 2024-10-11 11:45:53 -04:00
Uriel 066760bf79 Update all gradle dependencies we have (#1173) 2024-10-10 14:58:13 +02:00
Erimel eac4341201 Merge branch 'fingers' into flex 2024-10-09 21:54:02 -04:00
Erimel 8c0c49f57a fix rebase 2024-10-09 21:51:17 -04:00
Erimel 79fcdb3cd9 try to do what Eiren maybe meant to do 2024-10-09 21:45:46 -04:00
Eiren Rain 96651ddeb7 Update tracker position protocol 2024-10-09 21:45:24 -04:00
Erimel ee0161575b support resistance going both ways 2024-10-09 21:45:24 -04:00
Erimel 82df10be7c show data support in tracker setting 2024-10-09 21:45:23 -04:00
Erimel 5489abd754 fix and improve thumb angle and direction 2024-10-09 21:45:21 -04:00
Erimel 9c0463cc86 fix merge 2024-10-09 21:45:21 -04:00
Erimel 25bcb84ade fix fingers mirror tracking 2024-10-09 21:45:21 -04:00
Erimel c3b76ab242 Fix thumb direction and angle 2024-10-09 21:45:20 -04:00
Erimel 7ea2767227 Make direction dependent on the TrackerPosition 2024-10-09 21:45:20 -04:00
Erimel 5264e3908d fix bugs 2024-10-09 21:45:20 -04:00
Erimel d4fb3847a9 Add basic reset calibration 2024-10-09 21:44:53 -04:00
Erimel a0afa4ca94 fix udp and improve design 2024-10-09 21:43:20 -04:00
Erimel c2ee25e9d1 wip better udp stuff 2024-10-09 21:43:05 -04:00
Erimel d5997ffb99 move flex logic stuff into its own class 2024-10-09 21:42:44 -04:00
Erimel 6dca92387b Don't send fingers if we don't have any tracker for them 2024-10-09 21:42:44 -04:00
Erimel 0a18a1d8e6 move VRServer instance declaration back 2024-10-09 21:42:44 -04:00
Erimel 0b890c197b fix Unit tests 2024-10-09 21:42:44 -04:00
Erimel 81157f3c18 WIP flex resistance and angle udp support 2024-10-09 21:42:44 -04:00
Erimel beaf83f097 add finger bones translations 2024-10-09 21:41:58 -04:00
Erimel 4e02562e05 Support receiving fingers via VMC 2024-10-09 21:41:57 -04:00
Erimel 708cab9ea8 Properly track rotations over 180 degrees 2024-10-09 21:41:57 -04:00
Erimel d29109887b fine tune slerp values, use quaternion space, support tpose reset 2024-10-09 21:41:57 -04:00
Erimel bbd63923dc add preview in GUI, fix vmc mirror and localRotation for fingers 2024-10-09 21:41:57 -04:00
Erimel 14293f4842 basic finger ik in skeleton 2024-10-09 21:41:57 -04:00
Erimel 0d4921e099 add fingers to UnityArmature 2024-10-09 21:41:57 -04:00
Erimel c7aa6451f2 skeleton wip 2024-10-09 21:41:56 -04:00
Erimel a80ce41079 Add finger bones variables 2024-10-09 21:41:48 -04:00
Erimel 6c289c91f4 Update solarxr-protocol 2024-10-09 21:26:49 -04:00
Erimel 79e7b19a12 fix fingers mirror tracking 2024-10-09 21:13:39 -04:00
Erimel 2f095aeb73 Don't send fingers if we don't have any tracker for them 2024-10-09 21:13:39 -04:00
Erimel 7909a1b312 move VRServer instance declaration back 2024-10-09 21:13:39 -04:00
Erimel d404fb5a88 fix Unit tests 2024-10-09 21:13:39 -04:00
Erimel 938f708c89 add finger bones translations 2024-10-09 21:13:38 -04:00
Erimel e1d9a2cd5b Support receiving fingers via VMC 2024-10-09 21:13:38 -04:00
Erimel 98c7db658f Properly track rotations over 180 degrees 2024-10-09 21:13:38 -04:00
Erimel 75cd829a5d fine tune slerp values, use quaternion space, support tpose reset 2024-10-09 21:13:38 -04:00
Erimel c4a4016d45 add preview in GUI, fix vmc mirror and localRotation for fingers 2024-10-09 21:13:38 -04:00
Erimel 0191b421bb basic finger ik in skeleton 2024-10-09 21:13:37 -04:00
Erimel 1ec642f3b5 add fingers to UnityArmature 2024-10-09 21:13:37 -04:00
Erimel 99a2cee182 skeleton wip 2024-10-09 21:13:37 -04:00
Erimel 063a686efa Add finger bones variables 2024-10-09 21:13:19 -04:00
a2d842d8cc Add settings reset & advanced section (#1154)
Co-authored-by: Uriel <[email protected]>
Co-authored-by: Butterscotch! <[email protected]>
Co-authored-by: lucas lelievre <[email protected]>
2024-10-09 18:09:06 +02:00
Butterscotch!andlucas lelievre ca13ca5fb4 Restrict mounting reset on server by tracker reset status (#1169)
Co-authored-by: lucas lelievre <[email protected]>
2024-10-09 17:25:53 +02:00
33a213f10f Handle missing local IP (#1174)
Co-authored-by: Uriel <[email protected]>
Co-authored-by: lucas lelievre <[email protected]>
2024-10-09 16:53:57 +02:00
Butterscotch!andlucas lelievre 1a6560a9cf Block AutoBone with high error values (#1185)
Co-authored-by: lucas lelievre <[email protected]>
2024-10-09 16:28:42 +02:00
Urielandlucas lelievre 449c6f80dc add a way to skip rest calibration tutorial (#1186)
Co-authored-by: lucas lelievre <[email protected]>
2024-10-09 16:19:06 +02:00
nekomonaandloucass003 1a88eba476 Add extrapolated prediction to drift compensation (#1184)
Co-authored-by: loucass003 <[email protected]>
2024-10-09 16:07:36 +02:00
8d55440dbd Add warning to proportions reset (#1179)
Co-authored-by: Uriel <[email protected]>
Co-authored-by: Butterscotch! <[email protected]>
2024-10-09 10:51:29 -03:00
Urielandlucas lelievre 8da5d84e0a Add OS decorations toggle (#1180)
Co-authored-by: lucas lelievre <[email protected]>
2024-10-09 14:05:15 +02:00
JovannMCandlucas lelievre 027e6549b6 Add acceleration & position to tracker page (#1191)
Co-authored-by: lucas lelievre <[email protected]>
2024-10-09 13:29:20 +02:00
Urielandlucas lelievre 95c8c08f86 enforce lf with editorconfig (#1192)
Co-authored-by: lucas lelievre <[email protected]>
2024-10-08 19:15:57 +02:00
JovannMC ba3a2ce125 Hide navbar onboarding (#1152) 2024-10-08 19:15:21 +02:00
JovannMC ed34001962 Add drift compensation warning (#1160) 2024-10-08 19:05:52 +02:00
PolymoriaandUriel 1dae302b27 Tracker status box shadow color fix (#1170)
Co-authored-by: Uriel <[email protected]>
2024-10-08 18:41:22 +02:00
sctanfandlucas lelievre 505a9fc5d5 Sleep HID dataRead with devices present (#1183)
Co-authored-by: lucas lelievre <[email protected]>
2024-10-04 16:29:46 +03:00
Uriel c58209a140 use 128MB of memory for server (#1178) 2024-09-30 20:34:05 +02:00
lucas lelievreandUriel 15264526ce Move top level await to tauri.ts (#1181)
Co-authored-by: Uriel <[email protected]>
2024-09-25 20:05:56 +02:00
Uriel 136434e5c7 Config check if config path exists and create it if not (#1176) 2024-09-25 18:12:46 +02:00
Uriel 27244ff974 Update appstream data (#1177) 2024-09-23 20:14:55 +02:00
DevMiner aadf38d2a9 fix(gui): tab title (#1175) 2024-09-23 16:05:42 +02:00
136 changed files with 7111 additions and 2597 deletions

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
* text=auto
*.png binary
*.webp binary
*.gif binary
+38 -38
View File
@@ -1,38 +1,38 @@
# Global code owner
* @Eirenliel
# Make everyone be able to approve SolarXR submodule changes
/solarxr-protocol @ButterscotchV @Erimelowo @ImUrX @loucass003
# Make Loucas and Uriel the owners of all GUI stuff
/gui/ @ImUrX @loucass003
/pnpm-lock.yaml @ImUrX @loucass003
/pnpm-workspace.yaml @ImUrX @loucass003
# Uriel and Erimel responsible for i18n
/gui/public/i18n/ @ImUrX @Erimelowo
/gui/src/i18n/ @ImUrX @Erimelowo
/l10n.toml @ImUrX @Erimelowo
/gui/src/components/settings/ @Erimelowo @ImUrX
# Rust part of the GUI
/gui/src-tauri/ @ImUrX
/Cargo.lock @ImUrX
# Some server code~
/server/ @ButterscotchV @Eirenliel @Erimelowo
/server/src/main/java/dev/slimevr/autobone/ @ButterscotchV
/server/src/main/java/dev/slimevr/poserecorder/ @ButterscotchV
/server/src/main/java/dev/slimevr/posestreamer/ @ButterscotchV
/server/src/main/java/dev/slimevr/osc/ @Erimelowo
/server/src/main/java/dev/slimevr/tracking/processor/ @Erimelowo
/server/src/main/java/dev/slimevr/filtering/ @Erimelowo
# Linux files
*.nix @ImUrX
/flake.lock @ImUrX
/dev.slimevr.SlimeVR.metainfo.xml @ImUrX
/.envrc @ImUrX
# Global code owner
* @Eirenliel
# Make everyone be able to approve SolarXR submodule changes
/solarxr-protocol @ButterscotchV @Erimelowo @ImUrX @loucass003
# Make Loucas and Uriel the owners of all GUI stuff
/gui/ @ImUrX @loucass003
/pnpm-lock.yaml @ImUrX @loucass003
/pnpm-workspace.yaml @ImUrX @loucass003
# Uriel and Erimel responsible for i18n
/gui/public/i18n/ @ImUrX @Erimelowo
/gui/src/i18n/ @ImUrX @Erimelowo
/l10n.toml @ImUrX @Erimelowo
/gui/src/components/settings/ @Erimelowo @ImUrX
# Rust part of the GUI
/gui/src-tauri/ @ImUrX
/Cargo.lock @ImUrX
# Some server code~
/server/ @ButterscotchV @Eirenliel @Erimelowo
/server/src/main/java/dev/slimevr/autobone/ @ButterscotchV
/server/src/main/java/dev/slimevr/poserecorder/ @ButterscotchV
/server/src/main/java/dev/slimevr/posestreamer/ @ButterscotchV
/server/src/main/java/dev/slimevr/osc/ @Erimelowo
/server/src/main/java/dev/slimevr/tracking/processor/ @Erimelowo
/server/src/main/java/dev/slimevr/filtering/ @Erimelowo
# Linux files
*.nix @ImUrX
/flake.lock @ImUrX
/dev.slimevr.SlimeVR.metainfo.xml @ImUrX
/.envrc @ImUrX
+38
View File
@@ -0,0 +1,38 @@
"Area: Continuous Integration":
- changed-files:
- any-glob-to-any-file: ".github/**"
"Area: Application Protocol":
- changed-files:
- any-glob-to-any-file: ["solarxr-protocol"]
"Area: AutoBone":
- changed-files:
- any-glob-to-any-file: "server/core/src/main/java/dev/slimevr/autobone/**"
"Area: Documentation":
- changed-files:
- any-glob-to-any-file: "**/*.md"
"Area: GUI":
- all:
- changed-files:
- any-glob-to-any-file: "gui/**/*"
- all-globs-to-all-files: "!gui/public/i18n/**"
"Area: Hardware Protocol":
- changed-files:
- any-glob-to-any-file: "server/core/src/main/java/dev/slimevr/tracking/trackers/udp/**"
"Area: Server":
- changed-files:
- any-glob-to-any-file: ["server/**", "*gradle*", "gradle/**"]
"Area: Skeletal Model":
- changed-files:
- any-glob-to-any-file: "server/core/src/main/java/dev/slimevr/tracking/processor/**"
"Area: SteamVR Driver":
- changed-files:
- any-glob-to-any-file: "server/desktop/src/main/java/dev/slimevr/desktop/platform/**"
"Area: Translation":
- changed-files:
- any-glob-to-any-file: "gui/public/i18n/**"
"Area: VMC":
- changed-files:
- any-glob-to-any-file: ["server/core/src/main/java/dev/slimevr/osc/Unity*", "server/core/src/main/java/dev/slimevr/osc/VMC*", "server/core/src/main/java/dev/slimevr/osc/VRM*"]
"Area: VRCOSC":
- changed-files:
- any-glob-to-any-file: ["server/core/src/main/java/dev/slimevr/osc/VRC*"]
+2 -2
View File
@@ -74,7 +74,7 @@ jobs:
# Artifact name
name: "SlimeVR-Server" # optional, default is artifact
# A file, directory or wildcard pattern that describes what to upload
path: server/desktop/build/libs/*
path: server/desktop/build/libs/slimevr.jar
- name: Upload to draft release
uses: softprops/action-gh-release@v2
@@ -83,7 +83,7 @@ jobs:
draft: true
generate_release_notes: true
files: |
server/desktop/build/libs/*
server/desktop/build/libs/slimevr.jar
bundle-android:
+22
View File
@@ -0,0 +1,22 @@
# This workflow will triage pull requests and apply a label based on the
# paths that are modified in the pull request.
#
# To use this workflow, you will need to set up a .github/labeler.yml
# file with configuration. For more information, see:
# https://github.com/actions/labeler
name: Labeler
on: [pull_request_target]
jobs:
label:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
steps:
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
+5
View File
@@ -28,6 +28,8 @@
/node_modules
.husky
# kotlin stuff
/.kotlin
# ignore gradle build folder
build/
@@ -41,3 +43,6 @@ build/
# Ignore Android local properties
local.properties
# Ignore temporary config
vrconfig.yml.tmp
-3
View File
@@ -1,6 +1,3 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"
YELLOW="\033[1;33m"
GREEN="\033[1;32m"
RESET="\033[0m"
Generated
+835 -694
View File
File diff suppressed because it is too large. Load diff
+9
View File
@@ -65,6 +65,15 @@ work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
</provides>
<releases>
<release version="0.13.1" date="2024-11-05"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1</url></release>
<release version="0.13.1~rc.3" type="development" date="2024-10-31"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.3</url></release>
<release version="0.13.1~rc.2" type="development" date="2024-10-26"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.2</url></release>
<release version="0.13.1~rc.1" type="development" date="2024-10-16"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.1-rc.1</url></release>
<release version="0.13.0" date="2024-09-20"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0</url></release>
<release version="0.13.0~rc.4" type="development" date="2024-09-13"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0-rc.4</url></release>
<release version="0.13.0~rc.3" type="development" date="2024-08-14"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0-rc.3</url></release>
<release version="0.13.0~rc.2" type="development" date="2024-08-08"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0-rc.2</url></release>
<release version="0.13.0~rc.1" type="development" date="2024-08-02"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.13.0-rc.1</url></release>
<release version="0.12.1" date="2024-04-29"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.12.1</url></release>
<release version="0.12.0" date="2024-04-26"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.12.0</url></release>
<release version="0.12.0~rc.4" type="development" date="2024-04-21"><url>https://github.com/SlimeVR/SlimeVR-Server/releases/tag/v0.12.0-rc.4</url></release>
Generated
+480 -80
View File
@@ -1,22 +1,160 @@
{
"nodes": {
"devenv": {
"cachix": {
"inputs": {
"flake-compat": "flake-compat",
"nix": "nix",
"nixpkgs": "nixpkgs",
"pre-commit-hooks": "pre-commit-hooks"
"devenv": "devenv_2",
"flake-compat": [
"devenv",
"flake-compat"
],
"git-hooks": [
"devenv",
"pre-commit-hooks"
],
"nixpkgs": [
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1699541523,
"narHash": "sha256-Rv0ryuBC5KtA/3YqwIEe58Tabu71qSGnGcGRd67mMUY=",
"lastModified": 1726520618,
"narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=",
"owner": "cachix",
"repo": "devenv",
"rev": "14fdefc0bb80c3d6f3a18a491e33429b4064c371",
"repo": "cachix",
"rev": "695525f9086542dfb09fde0871dbf4174abbf634",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "cachix",
"type": "github"
}
},
"cachix_2": {
"inputs": {
"devenv": "devenv_3",
"flake-compat": [
"devenv",
"cachix",
"devenv",
"flake-compat"
],
"nixpkgs": [
"devenv",
"cachix",
"devenv",
"nixpkgs"
],
"pre-commit-hooks": [
"devenv",
"cachix",
"devenv",
"pre-commit-hooks"
]
},
"locked": {
"lastModified": 1712055811,
"narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=",
"owner": "cachix",
"repo": "cachix",
"rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "cachix",
"type": "github"
}
},
"devenv": {
"inputs": {
"cachix": "cachix",
"flake-compat": "flake-compat_2",
"nix": "nix_3",
"nixpkgs": [
"nixpkgs"
],
"pre-commit-hooks": "pre-commit-hooks_2"
},
"locked": {
"lastModified": 1730213537,
"narHash": "sha256-bWoeNdFISbGK8M0Xw4edmManGCkJ1oNqbfNY0Hlv9Vc=",
"owner": "cachix",
"repo": "devenv",
"rev": "5c046eeafd13f7a2b9fc733f70ea17571b24410f",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"devenv_2": {
"inputs": {
"cachix": "cachix_2",
"flake-compat": [
"devenv",
"cachix",
"flake-compat"
],
"nix": "nix_2",
"nixpkgs": [
"devenv",
"cachix",
"nixpkgs"
],
"pre-commit-hooks": [
"devenv",
"cachix",
"git-hooks"
]
},
"locked": {
"lastModified": 1723156315,
"narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=",
"owner": "cachix",
"repo": "devenv",
"rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"devenv_3": {
"inputs": {
"flake-compat": [
"devenv",
"cachix",
"devenv",
"cachix",
"flake-compat"
],
"nix": "nix",
"nixpkgs": "nixpkgs",
"poetry2nix": "poetry2nix",
"pre-commit-hooks": [
"devenv",
"cachix",
"devenv",
"cachix",
"pre-commit-hooks"
]
},
"locked": {
"lastModified": 1708704632,
"narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=",
"owner": "cachix",
"repo": "devenv",
"rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "python-rewrite",
"repo": "devenv",
"type": "github"
}
@@ -29,11 +167,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1699683614,
"narHash": "sha256-XT2tIoIiiv0AxRs9g76nuRhfQf7KU1dE3ho8BL5CYM4=",
"lastModified": 1730270567,
"narHash": "sha256-ZTBMwsY0i5zTT6rejotc9wqcSGkEgAeejXktJBo9Z5M=",
"owner": "nix-community",
"repo": "fenix",
"rev": "ca6415d87d2e1b5975d59b2a68ae19029de1759c",
"rev": "6535bb2a77a3bec73cc5b2d2ff63da8a479e32bd",
"type": "github"
},
"original": {
@@ -58,16 +196,54 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"devenv",
"nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
@@ -80,11 +256,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
@@ -94,15 +270,12 @@
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
@@ -112,6 +285,24 @@
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -135,11 +326,11 @@
]
},
"locked": {
"lastModified": 1660459072,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
@@ -148,19 +339,19 @@
"type": "github"
}
},
"lowdown-src": {
"libgit2": {
"flake": false,
"locked": {
"lastModified": 1633514407,
"narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
"owner": "kristapsdz",
"repo": "lowdown",
"rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
"lastModified": 1697646580,
"narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
"owner": "libgit2",
"repo": "libgit2",
"rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
"type": "github"
},
"original": {
"owner": "kristapsdz",
"repo": "lowdown",
"owner": "libgit2",
"repo": "libgit2",
"type": "github"
}
},
@@ -181,50 +372,59 @@
},
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"flake-compat": "flake-compat",
"nixpkgs": [
"devenv",
"cachix",
"devenv",
"cachix",
"devenv",
"nixpkgs"
],
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1676545802,
"narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
"lastModified": 1712911606,
"narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=",
"owner": "domenkozar",
"repo": "nix",
"rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
"rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12",
"type": "github"
},
"original": {
"owner": "domenkozar",
"ref": "relaxed-flakes",
"ref": "devenv-2.21",
"repo": "nix",
"type": "github"
}
},
"nix2container": {
"nix-github-actions": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"devenv",
"cachix",
"devenv",
"cachix",
"devenv",
"poetry2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1697285352,
"narHash": "sha256-tRGLm/DO8+anGUCgLYxTF5EPqWv8EZ9MVFWRdh285HU=",
"owner": "nlewo",
"repo": "nix2container",
"rev": "9d7f33ef0058f4df4c0912025f43c758a3289d76",
"lastModified": 1688870561,
"narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
"type": "github"
},
"original": {
"owner": "nlewo",
"repo": "nix2container",
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nixgl": {
"nix2container": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
@@ -232,11 +432,91 @@
]
},
"locked": {
"lastModified": 1685908677,
"narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=",
"lastModified": 1729339656,
"narHash": "sha256-smV7HQ/OqZeRguQxNjsb3uQDwm0p6zKDbSDbPCav/oY=",
"owner": "nlewo",
"repo": "nix2container",
"rev": "cc96df7c3747c61c584d757cfc083922b4f4b33e",
"type": "github"
},
"original": {
"owner": "nlewo",
"repo": "nix2container",
"type": "github"
}
},
"nix_2": {
"inputs": {
"flake-compat": [
"devenv",
"cachix",
"devenv",
"flake-compat"
],
"nixpkgs": [
"devenv",
"cachix",
"devenv",
"nixpkgs"
],
"nixpkgs-regression": "nixpkgs-regression_2"
},
"locked": {
"lastModified": 1712911606,
"narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=",
"owner": "domenkozar",
"repo": "nix",
"rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12",
"type": "github"
},
"original": {
"owner": "domenkozar",
"ref": "devenv-2.21",
"repo": "nix",
"type": "github"
}
},
"nix_3": {
"inputs": {
"flake-compat": [
"devenv",
"flake-compat"
],
"flake-parts": "flake-parts",
"libgit2": "libgit2",
"nixpkgs": "nixpkgs_2",
"nixpkgs-23-11": "nixpkgs-23-11",
"nixpkgs-regression": "nixpkgs-regression_3",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1727438425,
"narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=",
"owner": "domenkozar",
"repo": "nix",
"rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546",
"type": "github"
},
"original": {
"owner": "domenkozar",
"ref": "devenv-2.24",
"repo": "nix",
"type": "github"
}
},
"nixgl": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1713543440,
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
"owner": "guibou",
"repo": "nixGL",
"rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5",
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
"type": "github"
},
"original": {
@@ -247,11 +527,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1678875422,
"narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
"lastModified": 1692808169,
"narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
"rev": "9201b5ff357e781bf014d0330d18555695df7ba8",
"type": "github"
},
"original": {
@@ -261,24 +541,34 @@
"type": "github"
}
},
"nixpkgs-lib": {
"nixpkgs-23-11": {
"locked": {
"dir": "lib",
"lastModified": 1698611440,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"lastModified": 1717159533,
"narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1727825735,
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
}
},
"nixpkgs-regression": {
"locked": {
"lastModified": 1643052045,
@@ -295,29 +585,77 @@
"type": "github"
}
},
"nixpkgs-stable": {
"nixpkgs-regression_2": {
"locked": {
"lastModified": 1685801374,
"narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
"lastModified": 1643052045,
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
}
},
"nixpkgs-regression_3": {
"locked": {
"lastModified": 1643052045,
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1721562059,
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
"lastModified": 1717432640,
"narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
"rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1729880355,
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"type": "github"
},
"original": {
@@ -327,13 +665,75 @@
"type": "github"
}
},
"poetry2nix": {
"inputs": {
"flake-utils": "flake-utils",
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"devenv",
"cachix",
"devenv",
"cachix",
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1692876271,
"narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "poetry2nix",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": [
"devenv",
"nix"
],
"flake-utils": "flake-utils_2",
"gitignore": [
"devenv",
"nix"
],
"nixpkgs": [
"devenv",
"nix",
"nixpkgs"
],
"nixpkgs-stable": [
"devenv",
"nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1712897695,
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"pre-commit-hooks_2": {
"inputs": {
"flake-compat": [
"devenv",
"flake-compat"
],
"flake-utils": "flake-utils",
"gitignore": "gitignore",
"nixpkgs": [
"devenv",
@@ -342,11 +742,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1688056373,
"narHash": "sha256-2+SDlNRTKsgo3LBRiMUcoEUb6sDViRNQhzJquZ4koOI=",
"lastModified": 1726745158,
"narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "5843cf069272d92b60c3ed9e55b7a8989c01d4c7",
"rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74",
"type": "github"
},
"original": {
@@ -359,21 +759,21 @@
"inputs": {
"devenv": "devenv",
"fenix": "fenix",
"flake-parts": "flake-parts",
"flake-parts": "flake-parts_2",
"mk-shell-bin": "mk-shell-bin",
"nix2container": "nix2container",
"nixgl": "nixgl",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1699629149,
"narHash": "sha256-oDxT2FTYLRnwBRgxgWMApbgvNsbsPV4EeH4TZtp70F0=",
"lastModified": 1730197931,
"narHash": "sha256-MjYc80pHGrD6TYMHHpXniCW0egVyHiDR23xAh7MN7Ww=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "11a87c917943dac5a568579f799c2d7458324103",
"rev": "468b5cd43023d9771996b06ab7215997895a6059",
"type": "github"
},
"original": {
+5 -2
View File
@@ -3,7 +3,10 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
devenv.url = "github:cachix/devenv";
devenv = {
url = "github:cachix/devenv";
inputs.nixpkgs.follows = "nixpkgs";
};
nix2container = {
url = "github:nlewo/nix2container";
inputs.nixpkgs.follows = "nixpkgs";
@@ -125,7 +128,7 @@
enable = true;
toolchain = fenixpkgs.fromToolchainName {
name = rust_toolchain.toolchain.channel;
sha256 = "sha256-Ngiz76YP4HTY75GGdH2P+APE/DEIx2R/Dn+BwwOyzZU=";
sha256 = "sha256-VZZnlyP69+Y3crrLHQyJirqlHrTtGTsyiSnZB8jEvVo=";
};
components = rust_toolchain.toolchain.components;
};
+3 -3
View File
@@ -13,8 +13,8 @@ android.useAndroidX=true
android.nonTransitiveRClass=true
org.gradle.unsafe.configuration-cache=false
kotlinVersion=1.9.23
kotlinVersion=2.0.20
spotlessVersion=6.25.0
shadowJarVersion=8.1.1
buildconfigVersion=5.3.5
shadowJarVersion=8.3.2
buildconfigVersion=5.5.0
grgitVersion=5.2.2
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+1 -1
View File
@@ -10,7 +10,7 @@
<link rel="manifest" href="/manifest.json" />
<title>React App</title>
<title>SlimeVR GUI</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
+31 -30
View File
@@ -5,16 +5,16 @@
"dependencies": {
"@fluent/bundle": "^0.18.0",
"@fluent/react": "^0.15.2",
"@fontsource/poppins": "^5.0.14",
"@fontsource/poppins": "^5.1.0",
"@formatjs/intl-localematcher": "^0.2.32",
"@react-three/drei": "^9.107.0",
"@react-three/fiber": "^8.16.8",
"@tauri-apps/api": "2.0.0-beta.14",
"@tauri-apps/plugin-dialog": "2.0.0-beta.6",
"@tauri-apps/plugin-fs": "2.0.0-beta.6",
"@tauri-apps/plugin-os": "2.0.0-beta.6",
"@tauri-apps/plugin-shell": "2.0.0-beta.7",
"@tauri-apps/plugin-store": "2.0.0-beta.6",
"@react-three/drei": "^9.114.3",
"@react-three/fiber": "^8.17.10",
"@tauri-apps/api": "^2.0.2",
"@tauri-apps/plugin-dialog": "^2.0.0",
"@tauri-apps/plugin-fs": "^2.0.0",
"@tauri-apps/plugin-os": "^2.0.0",
"@tauri-apps/plugin-shell": "^2.0.0",
"@tauri-apps/plugin-store": "^2.0.0",
"browser-fs-access": "^0.35.0",
"classnames": "^2.5.1",
"flatbuffers": "22.10.26",
@@ -25,15 +25,16 @@
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.13",
"react-helmet": "^6.1.0",
"react-hook-form": "^7.52.0",
"react-hook-form": "^7.53.0",
"react-modal": "^3.16.1",
"react-responsive": "^10.0.0",
"react-router-dom": "^6.23.1",
"semver": "^7.6.2",
"react-router-dom": "^6.26.2",
"semver": "^7.6.3",
"solarxr-protocol": "file:../solarxr-protocol",
"three": "^0.163.0",
"ts-pattern": "^5.2.0",
"typescript": "^5.4.5"
"ts-pattern": "^5.4.0",
"typescript": "^5.6.3",
"use-double-tap": "^1.3.6"
},
"scripts": {
"start": "vite --force",
@@ -49,33 +50,33 @@
},
"devDependencies": {
"@dword-design/eslint-plugin-import-alias": "^4.0.9",
"@tailwindcss/forms": "^0.5.7",
"@tauri-apps/cli": "2.0.0-beta.21",
"@tailwindcss/forms": "^0.5.9",
"@tauri-apps/cli": "^2.0.2",
"@types/file-saver": "^2.0.7",
"@types/react": "^18.3.3",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/react-helmet": "^6.1.11",
"@types/react-modal": "3.16.3",
"@types/semver": "^7.5.8",
"@types/three": "^0.163.0",
"@typescript-eslint/eslint-plugin": "^7.13.0",
"@typescript-eslint/parser": "^7.13.0",
"@vitejs/plugin-react": "^4.3.1",
"autoprefixer": "^10.4.19",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-react": "^4.3.2",
"autoprefixer": "^10.4.20",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-config-airbnb": "^19.0.4",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.34.2",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-react-hooks": "^4.6.2",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.77.5",
"sass": "^1.79.4",
"spdx-satisfies": "^5.0.1",
"tailwind-gradient-mask-image": "^1.2.0",
"tailwindcss": "^3.4.4",
"vite": "^5.3.1"
"tailwindcss": "^3.4.13",
"vite": "^5.4.8"
}
}
+91 -10
View File
@@ -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 =
<b>Achtung:</b> 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? <b> Bitten schalten Sie den Tracker nicht aus, während Sie diese Einstellung umschalten!</b>
Sie müssen zuerst die Verwendung des Magnetometers zulassen, <magSetting>klicken Sie hier, um zu den Einstellungen zu gelangen</magSetting>.
tracker-settings-use_mag-label = Magnetometer zulassen
# The .<name> 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 =
<b>Warnung:</b> 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. <b>Für normale Benutzer nicht zu empfehlen!</b>
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. <b>Bitte schalten Sie keinen der Tracker aus, während Sie dies umschalten!</b>
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]
<b>Warnung:</b> Dadurch werden Ihre Benutzeroberfläche-Einstellungen auf die Standardeinstellungen zurückgesetzt.
Möchten Sie das wirklich tun?
[server]
<b>Warnung:</b> Dadurch werden Ihre Tracking-Einstellungen auf die Standardeinstellungen zurückgesetzt.
Möchten Sie das wirklich tun?
*[all]
<b>Warnung:</b> 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.
<b>Sie müssen Ihren Körper nur einmal messen!</b> 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.
<b>Dazu muss Ihr Headset (HMD) mit SlimeVR verbunden sein und Sie müssen es an haben!</b>
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 =
<b>Warnung:</b> Beim Schätzen der Proportionen wurde ein Fehler festgestellt!
Bitte <docs>prüfen Sie die Dokumentation</docs> oder treten sie unserem <discord>Discord Server</discord> bei, um Hilfe zu bekommen. ^_^
onboarding-automatic_proportions-error_modal-v2 =
<b>Warnung:</b> 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 <docs>überprüfen Sie die Dokumentation</docs> oder treten Sie unserem <discord>Discord</discord> bei, um Hilfe zu erhalten ^_^
onboarding-automatic_proportions-error_modal-confirm = Verstanden!
## Home
+119 -10
View File
@@ -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
@@ -74,6 +104,12 @@ skeleton_bone-ELBOW_OFFSET = Elbow Offset
## Tracker reset buttons
reset-reset_all = Reset all proportions
reset-reset_all_warning =
<b>Warning:</b> This will reset your proportions to being just based on your height.
Are you sure you want to do this?
reset-reset_all_warning-reset = Reset proportions
reset-reset_all_warning-cancel = Cancel
reset-full = Full Reset
reset-mounting = Reset Mounting
reset-yaw = Yaw Reset
@@ -125,10 +161,13 @@ widget-developer_mode-raw_slime_rotation = Raw rotation
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 = Hide
widget-imu_visualizer = Tracking data
widget-imu_visualizer-preview = Preview
widget-imu_visualizer-hide = Hide
widget-imu_visualizer-rotation_raw = Raw rotation
widget-imu_visualizer-rotation_preview = Preview rotation
widget-imu_visualizer-acceleration = Acceleration
widget-imu_visualizer-position = Position
## Widget: Skeleton Visualizer
widget-skeleton_visualizer-preview = Skeleton preview
@@ -175,9 +214,16 @@ tracker-infos-url = Tracker URL
tracker-infos-version = Firmware Version
tracker-infos-hardware_rev = Hardware Revision
tracker-infos-hardware_identifier = Hardware ID
tracker-infos-data_support = Data support
tracker-infos-imu = IMU Sensor
tracker-infos-board_type = Main board
tracker-infos-network_version = Protocol Version
tracker-infos-magnetometer = Magnetometer
tracker-infos-magnetometer-status-v1 = { $status ->
*[NOT_SUPPORTED] Not supported
[DISABLED] Disabled
[ENABLED] Enabled
}
## Tracker settings
tracker-settings-back = Go back to trackers list
@@ -191,11 +237,19 @@ tracker-settings-mounting_section-edit = Edit mounting
tracker-settings-drift_compensation_section = Allow drift compensation
tracker-settings-drift_compensation_section-description = Should this tracker compensate for its drift when drift compensation is enabled?
tracker-settings-drift_compensation_section-edit = Allow drift compensation
tracker-settings-use_mag = Allow magnetometer on this tracker
# Multiline!
tracker-settings-use_mag-description =
Should this tracker use magnetometer to reduce drift when magnetometer usage is allowed? <b>Please don't shutdown your tracker while toggling this!</b>
You need to allow magnetometer usage first, <magSetting>click here to go to the setting</magSetting>.
tracker-settings-use_mag-label = Allow magnetometer
# The .<name> 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 name
tracker-settings-name_section-description = Give it a cute nickname :)
tracker-settings-name_section-placeholder = NightyBeast's left leg
tracker-settings-name_section-label = Tracker name
tracker-settings-forget = Forget tracker
tracker-settings-forget-description = Removes the tracker from the SlimeVR Server and prevent it from connecting to it until the server is restarted. The configuration of the tracker won't be lost.
tracker-settings-forget-label = Forget tracker
@@ -271,6 +325,7 @@ settings-sidebar-utils = Utilities
settings-sidebar-serial = Serial console
settings-sidebar-appearance = Appearance
settings-sidebar-notifications = Notifications
settings-sidebar-advanced = Advanced
## SteamVR settings
settings-general-steamvr = SteamVR
@@ -321,7 +376,22 @@ settings-general-tracker_mechanics-drift_compensation = Drift compensation
settings-general-tracker_mechanics-drift_compensation-description =
Compensates IMU yaw drift by applying an inverse rotation.
Change amount of compensation and up to how many resets are taken into account.
This should only be used if you need to reset very often!
settings-general-tracker_mechanics-drift_compensation-enabled-label = Drift compensation
settings-general-tracker_mechanics-drift_compensation-prediction = Drift compensation prediction
# This cares about multilines
settings-general-tracker_mechanics-drift_compensation-prediction-description =
Predicts yaw drift compensation beyond previously measured range.
Enable this if your trackers are continuously spinning on the yaw axis.
settings-general-tracker_mechanics-drift_compensation-prediction-label = Drift compensation prediction
settings-general-tracker_mechanics-drift_compensation_warning =
<b>Warning:</b> Only use drift compensation if you need to reset
very often (every ~5-10 minutes).
Some IMUs prone to frequent resets include:
Joy-Cons, owoTrack, and MPUs (without recent firmware).
settings-general-tracker_mechanics-drift_compensation_warning-cancel = Cancel
settings-general-tracker_mechanics-drift_compensation_warning-done = I understand
settings-general-tracker_mechanics-drift_compensation-amount-label = Compensation amount
settings-general-tracker_mechanics-drift_compensation-max_resets-label = Use up to x last resets
settings-general-tracker_mechanics-save_mounting_reset = Save automatic mounting reset calibration
@@ -329,6 +399,11 @@ settings-general-tracker_mechanics-save_mounting_reset-description =
Saves the automatic mounting reset calibrations for the trackers between restarts. Useful
when wearing a suit where trackers don't move between sessions. <b>Not recommended for normal users!</b>
settings-general-tracker_mechanics-save_mounting_reset-enabled-label = Save mounting reset
settings-general-tracker_mechanics-use_mag_on_all_trackers = Use magnetometer on all IMU trackers that support it
settings-general-tracker_mechanics-use_mag_on_all_trackers-description =
Uses magnetometer on all trackers that have a compatible firmware for it, reducing drift in stable magnetic environments.
Can be disabled per tracker in the tracker's settings. <b>Please don't shutdown any of the trackers while toggling this!</b>
settings-general-tracker_mechanics-use_mag_on_all_trackers-label = Use magnetometer on trackers
## FK/Tracking settings
settings-general-fk_settings = Tracking settings
@@ -424,6 +499,9 @@ settings-general-interface-dev_mode = Developer Mode
settings-general-interface-dev_mode-description = This mode can be useful if you need in-depth data or to interact with connected trackers on a more advanced level.
settings-general-interface-dev_mode-label = Developer Mode
settings-general-interface-theme = Color theme
settings-general-interface-show-navbar-onboarding = Show "{ navbar-onboarding }" on navigation bar
settings-general-interface-show-navbar-onboarding-description = This changes if the "{ navbar-onboarding }" button shows on the navigation bar.
settings-general-interface-show-navbar-onboarding-label = Show "{ navbar-onboarding }"
settings-general-interface-lang = Select language
settings-general-interface-lang-description = Change the default language you want to use.
settings-general-interface-lang-placeholder = Select the language to use
@@ -435,6 +513,9 @@ settings-interface-appearance-font-os_font = OS font
settings-interface-appearance-font-slime_font = Default font
settings-interface-appearance-font_size = Base font scaling
settings-interface-appearance-font_size-description = This affects the font size of the whole interface except this settings panel.
settings-interface-appearance-decorations = Use the system native decorations
settings-interface-appearance-decorations-description = This will not render the top bar of the interface and will use the operating system's instead.
settings-interface-appearance-decorations-label = Use native decorations
## Notification settings
settings-interface-notifications = Notifications
@@ -573,6 +654,32 @@ settings-osc-vmc-mirror_tracking = Mirror tracking
settings-osc-vmc-mirror_tracking-description = Mirror the tracking horizontally.
settings-osc-vmc-mirror_tracking-label = Mirror tracking
## Advanced settings
settings-utils-advanced = Advanced
settings-utils-advanced-reset-gui = Reset GUI settings
settings-utils-advanced-reset-gui-description = Restore the default settings for the interface.
settings-utils-advanced-reset-gui-label = Reset GUI
settings-utils-advanced-reset-server = Reset tracking settings
settings-utils-advanced-reset-server-description = Restore the default settings for the tracking.
settings-utils-advanced-reset-server-label = Reset tracking
settings-utils-advanced-reset-all = Reset all settings
settings-utils-advanced-reset-all-description = Restore the default settings for both the interface and tracking.
settings-utils-advanced-reset-all-label = Reset all
settings-utils-advanced-reset_warning =
<b>Warning:</b> This will reset { $type ->
[gui] your GUI
[server] your tracking
*[all] all your
} settings to the defaults.
Are you sure you want to do this?
settings-utils-advanced-reset_warning-reset = Reset settings
settings-utils-advanced-reset_warning-cancel = Cancel
settings-utils-advanced-open_data = Data folder
settings-utils-advanced-open_data-description = Open SlimeVR's data folder in file explorer, containing config and log files.
settings-utils-advanced-open_data-label = Open folder
## Setup/onboarding menu
onboarding-skip = Skip setup
onboarding-continue = Continue
@@ -672,6 +779,7 @@ onboarding-calibration_tutorial-status-waiting = Waiting for you
onboarding-calibration_tutorial-status-calibrating = Calibrating
onboarding-calibration_tutorial-status-success = Nice!
onboarding-calibration_tutorial-status-error = The tracker was moved
onboarding-calibration_tutorial-skip = Skip tutorial
## Tracker assignment tutorial
onboarding-assignment_tutorial = How to prepare a Slime Tracker before putting it on
@@ -779,11 +887,11 @@ onboarding-choose_mounting = What mounting calibration method to use?
# Multiline text
onboarding-choose_mounting-description = Mounting orientation corrects for the placement of trackers on your body.
onboarding-choose_mounting-auto_mounting = Automatic mounting
# Italized text
# Italicized text
onboarding-choose_mounting-auto_mounting-label-v2 = Recommended
onboarding-choose_mounting-auto_mounting-description = This will automatically detect the mounting orientations for all of your trackers from 2 poses
onboarding-choose_mounting-manual_mounting = Manual mounting
# Italized text
# Italicized text
onboarding-choose_mounting-manual_mounting-label-v2 = Might not be precise enough
onboarding-choose_mounting-manual_mounting-description = This will let you choose the mounting orientation manually for each tracker
# Multiline text
@@ -827,14 +935,14 @@ onboarding-choose_proportions-description-v1 = Body proportions are used to know
When proportions of your body don't match the ones saved, your tracking precision will be worse and you will notice things like skating or sliding, or your body not matching your avatar well.
<b>You only need to measure your body once!</b> Unless they are wrong or your body has changed, then you don't need to do them again.
onboarding-choose_proportions-auto_proportions = Automatic proportions
# Italized text
# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Recommended
onboarding-choose_proportions-auto_proportions-descriptionv3 =
This will guess your proportions by recording a sample of your movements and passing it through an algorithm.
<b>This requires having your headset (HMD) connected to SlimeVR and on your head!</b>
onboarding-choose_proportions-manual_proportions = Manual proportions
# Italized text
# Italicized text
onboarding-choose_proportions-manual_proportions-subtitle = For small touches
onboarding-choose_proportions-manual_proportions-description = This will let you adjust your proportions manually by modifying them directly
onboarding-choose_proportions-export = Export proportions
@@ -910,8 +1018,9 @@ onboarding-automatic_proportions-verify_results-redo = Redo recording
onboarding-automatic_proportions-verify_results-confirm = They're correct
onboarding-automatic_proportions-done-title = Body measured and saved.
onboarding-automatic_proportions-done-description = Your body proportions' calibration is complete!
onboarding-automatic_proportions-error_modal =
<b>Warning:</b> An error was found while estimating proportions!
onboarding-automatic_proportions-error_modal-v2 =
<b>Warning:</b> There was an error while estimating proportions!
This is likely a mounting calibration issue. Make sure your tracking works properly before trying again.
Please <docs>check the docs</docs> or join our <discord>Discord</discord> for help ^_^
onboarding-automatic_proportions-error_modal-confirm = Understood!
+89 -8
View File
@@ -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 =
<b>Advertencia:</b> 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? <b>¡Por favor, no apagues tu tracker mientras alternas esto!</b>
Primero debes permitir el uso del magnetómetro, <magSetting>haga clic aquí para ir al ajuste</magSetting>.
tracker-settings-use_mag-label = Permitir el uso del magnetómetro
# The .<name> 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 =
<b>Advertencia:</b> 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. <b>¡No se recomienda para usuarios típicos!</b>
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. <b>¡Por favor, no apagues ninguno de los trackers mientras activas esta opción!</b>
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]
<b>Advertencia:</b> Esto reiniciará tus ajustes de la interfaz de usuario a sus valores predeterminados.
¿Estás seguro de que quieres seguir?
[server]
<b>Advertencia:</b> Esto reiniciará tus ajustes de seguimiento a sus valores predeterminados.
¿Estás seguro de que quieres seguir?
*[all]
<b>Advertencia:</b> 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.
<b>¡Solo necesitas medir tu cuerpo una vez!</b> 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.
<b>¡Esto requiere tener tu visor (HMD) conectado a SlimeVR y en tu cabeza!</b>
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 =
<b>Atención:</b> ¡Se ha encontrado un error durante la estimación de sus proporciones!
Por favor <docs>fijate la documentación</docs> o únete a nuestro <discord>Discord</discord> para obtener ayuda ^_^
onboarding-automatic_proportions-error_modal-v2 =
<b>Peligro:</b> ¡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 <docs>revisa la documentación</docs> o únete a nuestro <discord>Discord</discord> por ayuda ^_^
onboarding-automatic_proportions-error_modal-confirm = ¡Entendido!
## Home
+24 -8
View File
@@ -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.
<b>¡Sólo necesitas medir tu cuerpo una vez!</b> 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.
<b>¡Esto requiere tener tu visor (HMD) conectado a SlimeVR y en tu cabeza!</b>
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 =
<b>Atención:</b> ¡Se ha encontrado un error al estimar las proporciones!
Por favor <docs>comprueba la documentación</docs> o únete a nuestro <discord>Discord</discord> para obtener ayuda ^_^
onboarding-automatic_proportions-error_modal-confirm = ¡Entendido!
## Home
+90 -9
View File
@@ -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 =
<b>Avertissement:</b> 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 ? <b>N’éteignez pas votre capteur pendant que vous changez cette option !</b>
Vous devez d’abord autoriser l’utilisation du magnétomètre dans les paramètres. <magSetting>Cliquez ici pour y accéder</magSetting>.
tracker-settings-use_mag-label = Autoriser le magnétomètre
# The .<name> 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 =
<b>Avertissement:</b> 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. <b>Non recommandé pour les utilisateurs normaux !</b>
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. <b>Ne fermez aucun des capteurs en changeant cette option !</b>
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]
<b>Avertissement:</b> Cela réinitialisera vos paramètres de l'interface.
Êtes-vous sûr de vouloir faire cela ?
[server]
<b>Avertissement:</b> Cela réinitialisera vos paramètres de la capture.
Êtes-vous sûr de vouloir faire cela ?
*[all]
<b>Avertissement:</b> 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.
<b>Vous n’avez besoin de mesurer les proportions de votre corps qu’une seule fois !</b> À 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.
<b>Cela nécessite d’avoir votre casque VR connecté à SlimeVR et sur votre tête !</b>
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 =
<b>Avertissement :</b> Une erreur a été détectée lors de l’estimation des proportions !
Veuillez <docs>consulter la documentation</docs> ou rejoindre notre <discord>Discord</discord> pour obtenir de l’aide ^_^
onboarding-automatic_proportions-error_modal-v2 =
<b>Avertissement:</b> 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 <docs>consulter la documentation</docs> ou rejoindre notre <discord>Discord</discord> pour obtenir de l’aide ^_^
onboarding-automatic_proportions-error_modal-confirm = Compris !
## Home
+87 -13
View File
@@ -19,7 +19,7 @@ version_update-close = 닫기
## Tips
tips-find_tracker = 어떤 트래커가 어디에 대응되는지 모르겠나요? 트래커를 흔들면 해당 트래커에 해당되는 항목이 강조 표시됩니다.
tips-find_tracker = 어떤 트래커가 어디에 대응되는지 모르겠나요? 트래커를 흔들면 해당 트래커에 해당되는 항목이 강조 표시돼요.
tips-do_not_move_heels = 기록하는 동안 발뒤꿈치가 움직이지 않도록 조심하세요!
tips-file_select = 파일을 <u>열거나</u>, 여기에 드래그&드롭하세요.
tips-tap_setup = 목록에서 트래커를 선택하는 대신 트래커를 천천히 2번 탭해서 선택할 수 있어요.
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = 팔꿈치 오프셋
## Tracker reset buttons
reset-reset_all = 모든 신체 비율 초기화
reset-reset_all_warning =
<b>경고:</b> 이렇게 하면 지금까지 변경한 신체 비율 설정이 사라지고 설정했던 키를 기반으로 초기화돼요.
계속하시겠어요?
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 =
이 트래커는 자력계 사용이 허용될 때 드리프트를 줄이기 위해 자력계를 사용해야 합니까? <b>이것을 토글하는 동안 트래커를 종료하지 마십시오!</b>
먼저 자력계를 사용하도록 설정한 다음, <magSetting>여기를 클릭하여 설정으로 이동하세요</magSetting>.
tracker-settings-use_mag-label = 자력계 활성화
# The .<name> 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 =
<b>경고:</b> 트래커를 지나치게 자주 정렬해야 하는 경우에만 틀어짐 보정을 사용하세요 (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 =
트래커의 자동 마운팅 리셋 보정값을 저장합니다. 트래커들의 위치가 고정된
모션 캡처 슈트 같은 것을 사용할 때 유용합니다. <b>일반 사용자들에게는 권장되지 않아요!</b>
트래커의 착용 방향 정렬 보정값을 저장합니다. 트래커들의 위치가 고정된
모션 캡처 슈트 같은 것을 사용할 때 유용해요. <b>일반 사용자들에게는 권장되지 않아요!</b>
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 =
호환 가능한 펌웨어가 있는 모든 트래커에서 자력계를 사용하여 안정적인 자기 환경에서 틀어짐을 줄일 수 있어요.
트래커의 설정에서 트래커별로 비활성화할 수 있어요. <b>이 기능을 토글하는 동안 트래커를 종료하지 마세요!</b>
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] <b>경고:</b> 이렇게 하면 화면 표시와 관련된 모든 설정이 초기화돼요. 계속하시겠어요?
[server] <b>경고:</b> 이렇게 하면 화면 트래커의 움직임에 관한 모든 설정이 초기화돼요. 계속하시겠어요?
*[all] <b>경고:</b> 이렇게 하면 지금까지 변경한 모든 설정이 초기화돼요. 계속하시겠어요?
}
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 =
설정된 신체 비율과 실제 신체 비율이 다를 경우, 트래킹 정확도가 훨씬 낮아질 수 있으며 사용 중 스케이팅, 슬라이딩, 또는 아바타와 신체 동작이 일치하지 않게 되는 경우가 발생할 수 있어요.
<b>신체 비율 측정은 한 번이면 충분해요!</b> 측정치가 부정확하거나 신체 비율이 달라진 경우를 제외하고는 다시 측정할 필요가 없어요.
onboarding-choose_proportions-auto_proportions = 자동으로 비율 설정
# Italized text
# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = 권장
onboarding-choose_proportions-auto_proportions-descriptionv3 =
몸을 이리저리 움직여 샘플을 기록한 다음 알고리즘을 통해 연산하는 방식으로 신체 비율을 추산합니다.
<b>사용하기 위해서는 VR 헤드셋이 SlimeVR과 연결되어 있어야 해요</b>
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 =
<b>경고:</b> 신체 비율을 계산하는 동안 오류가 발생했습니다!
<docs>도움말</docs>을 확인하거나 <discord>디스코드</discord> 서버에서 도움을 받으세요 ^_^
onboarding-automatic_proportions-error_modal-v2 =
<b>경고:</b> 신체 비율을 추정하는 동안 오류가 발생했어요..!
이는 착용 방향 정렬 문제일 수 있어요. 다시 시도하기 전에 추적이 제대로 작동하는지 확인해보세요.
<docs>설명서</docs>를 읽어보거나 <discord>Discord 서버</discord>에 가입해서 도와달라고 해 보세요! ^_^
onboarding-automatic_proportions-error_modal-confirm = 이해했어요!
## Home
+43 -20
View File
@@ -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
+99 -18
View File
@@ -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 =
<b>Aviso:<b> 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? <b>Não desligue seu tracker enquanto altera esta opção!</b>
Você precisa permitir o uso de magnetômetro primeiro, <magSetting>clique aqui para ir para as configurações</magSetting>.
tracker-settings-use_mag-label = Permitir o uso do magnetômetro
# The .<name> 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 =
<b>Aviso:</b> 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. <b>Não recomendado para usuários normais!</b>
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. <b>Não desligue nenhum dos trackers enquanto altera esta opção!</b>
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]
<b>Aviso:</b> Isso irá restaurar as configurações da interface gráfica para as configurações iniciais.
Tem certeza de que deseja fazer isso?
[server]
<b>Aviso:</b> Isso irá restaurar as configurações de tracking para as configurações iniciais.
Tem certeza de que deseja fazer isso?
*[all]
<b>Aviso:</b> 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.
<b>Você precisará medir seu corpo apenas uma vez!</b> 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.
<b>Isso requer ter seu headset (HMD) conectado ao SlimeVR e na sua cabeça!</b>
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 =
<b>Aviso:</b> Um erro foi encontrado ao estimar proporções!
Por favor, <docs>verifique a documentação</docs> ou junte-se ao nosso <discord>Discord</discord> para obter ajuda ^_^
onboarding-automatic_proportions-error_modal-v2 =
<b>Aviso:</b> 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, <docs>verifique a documentação</docs> ou entre em nosso <discord> Discord</discord> para obter ajuda ^_^
onboarding-automatic_proportions-error_modal-confirm = Entendido!
## Home
+81 -8
View File
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = Смещение локтя
## Tracker reset buttons
reset-reset_all = Сбросить все пропорции
reset-reset_all_warning =
<b>Внимание:</b> Это сбросит ваши пропорции до основанных только на вашем росте.
Вы уверены, что хотите это сделать?
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 = Должен ли этот трекер использовать магнитометр для компенсации дрифта, когда использование магнитометра разрешено?<b>Пожалуйста, не выключайте трекер во время включения данной функции!</b> Вам сначала нужно разрешить использование магнитометра, <magSetting>нажмите здесь чтобы зайти в настройки</magSetting>.
tracker-settings-use_mag-label = Разрешить магнитометр
# The .<name> 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 =
<b>Предупреждение:</b> Используйте компенсацию дрифта только в том случае, если вам нужно сбросить настройки
очень часто (каждые ~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 =
Сохраняет автоматические калибровки сброса крепления для трекеров между перезапусками. Полезный
при ношении костюма, в котором трекеры не перемещаются между сессиями. <b>Не рекомендуется для обычных пользователей!</b>
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 =
Использует магнитометр на всех трекерах, которые имеют совместимую с ним прошивку, уменьшая дрифт в стабильных магнитных средах.
Может быть отключен для каждого трекера в настройках трекера. <b>Пожалуйста, не выключайте ни один из трекеров во время переключения!</b>
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]
<b>Предупреждение:</b> Это сбросит ваши настройки графического интерфейса до значений по умолчанию.
Вы уверены, что хотите это сделать?
[server]
<b>Предупреждение:</b> Это сбросит ваши настройки отслеживания до значений по умолчанию.
Вы уверены, что хотите это сделать?
*[all]
<b>Предупреждение:</b> Это сбросит все ваши настройки до значений по умолчанию.
Вы уверены, что хотите это сделать?
}
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 =
Когда пропорции вашего тела не совпадают с сохраненными, точность отслеживания будет хуже, и вы заметите такие вещи, как скольжение или дрифт, или ваше тело не очень хорошо соответствует вашему аватару.
<b>Вам нужно измерить свое тело только один раз!</b> Если они не неправильны или ваше тело не изменилось, то вам не нужно делать их снова.
onboarding-choose_proportions-auto_proportions = Автоматическая привязка
# Italized text
# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = Рекомендуется
onboarding-choose_proportions-auto_proportions-descriptionv3 =
Это попробует угадать ваши пропорции, записывая образец ваших движений и пропуская его через алгоритм.
<b>Для этого необходимо, чтобы ваш Шлем (HMD) был подключен к SlimeVR и был надет на голову!</b>
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 =
<b>Предупреждение:</b> Была обнаружена ошибка при расчёте пропорций!
Пожалуйста, <docs>ознакомьтесь с документацией</docs>, или присоединитесь к нашему <discord>Discord серверу</discord> для получения помощи ^_^
onboarding-automatic_proportions-error_modal-v2 =
<b>Внимание:</b> Произошла ошибка при оценке пропорций!
Скорее всего, это проблема с калибровкой крепления. Прежде чем повторить попытку, убедитесь, что отслеживание работает правильно.
Пожалуйста, <docs>проверьте документацию</docs> или присоединитесь к нашему <discord>Discord</discord> для получения помощи ^_^
onboarding-automatic_proportions-error_modal-confirm = Принято!
## Home
+27 -5
View File
@@ -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>Bạn chỉ cần đo cơ thể của bạn một lần!</b> 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.
<b>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!</b>
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ể
+108 -12
View File
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = 肘部偏移
## Tracker reset buttons
reset-reset_all = 重置身体比例
reset-reset_all_warning =
<b>警告:</b> 这会将您的身体比例重置为仅基于身高的默认比例。
您确定要执行此操作吗?
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 =
<b>警告:</b> 仅在需要经常重置偏航角
(大概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 = 拖曳文件或 <u>浏览文件</u> 以加载
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]
<b>警告:</b> 将要恢复界面设置为初始配置。
是否确认进行此操作?
[server]
<b>警告:</b> 将要恢复追踪设置为初始配置。
是否确认进行此操作?
*[all]
<b>警告:</b> 将要恢复所有设置为初始配置。
是否确认进行此操作?
}
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 =
如果保存的身体比例和实际身体尺寸不匹配,追踪精度将会下降,并且会出现脚在地面滑动,或是身体和虚拟形象动作不一致的情况。
<b>身体比例设置只要进行一次!</b> 除非身体比例存在错误或是身体尺寸发生了改变,否则不需要重复进行身体比例设置。
onboarding-choose_proportions-auto_proportions = 自动调整身体比例
# Italized text
# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = 推荐
onboarding-choose_proportions-auto_proportions-descriptionv3 =
这将录制你的运动样本并通过算法来推测你的身体比例。
<b>需要戴上头戴设备,并确保设备已连接到 SlimeVR!</b>
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
+161 -80
View File
@@ -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 = 拖曳檔案或 <u>瀏覽檔案</u> 以使用
tips-tap_setup = 除了從列表挑選追蹤器以外,您也可以慢慢敲擊 2 次追蹤器來選擇它。
tips-turn_on_tracker = 您使用的是官方的 SlimeVR 追蹤器嗎?記得要在連接到電腦以後<b><em>打開追蹤器的電源</em></b>喔!
tips-find_tracker = 若你不確定手上的追蹤器是哪一個,搖一搖它,對應的項目會被高亮顯示出來。
tips-do_not_move_heels = 測量過程中,請勿移動腳跟!
tips-file_select = 拖曳檔案或 <u>瀏覽檔案</u> 以使用。
tips-tap_setup = 除了從列表挑選追蹤器以外,你也可以慢慢敲擊 2 次追蹤器來選擇它。
tips-turn_on_tracker = 你使用的是官方的 SlimeVR 追蹤器嗎?記得要在連接到電腦以後<b><em>打開追蹤器的電源</em></b>喔!
tips-failed_webgl = 初始化 WebGL 失敗。
## Body parts
@@ -81,6 +81,11 @@ skeleton_bone-ELBOW_OFFSET = 肘部偏移
## Tracker reset buttons
reset-reset_all = 重置軀幹比例
reset-reset_all_warning =
<b>警告:</b> 這會將軀幹比例重置為僅基於身高的比例。
你確定要執行此操作嗎?
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 =
如果「在追蹤器上啟用磁力計」功能已開啟,是否要在這個追蹤器上啟用它來減緩偏移?<b>切換本選項時請勿關閉追蹤器的電源!</b>
請先開啟「在追蹤器上啟用磁力計」功能,<magSetting>點選此處以移動至該設定</magSetting>。
tracker-settings-use_mag-label = 允許使用這個追蹤器的磁力計
# The .<name> 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 =
<b>警告:</b>手部追蹤器將會取代控制器的追蹤。
您確定嗎?
你確定嗎?
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 =
<b>警告:</b> 只有在需要頻繁重置(約 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 後不需要再進行校正。
本設定適用於動捕服,因為多次穿戴後追蹤器的位置不會變化。<b>不建議一般使用者使用!</b>
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 =
在所有有韌體支援的追蹤器上使用磁力計,在磁場穩定的環境中可以減緩偏移。
開啟此選項後,可以個別在追蹤器選項內停用磁力計。<b>切換此選項時請勿關閉任何一個追蹤器的電源!</b>
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]
<b>警告:</b> 這會將 UI 設定重置為預設值。
你確定要執行此操作嗎?
[server]
<b>警告:</b> 這會將追蹤設定重置為預設值。
你確定要執行此操作嗎?
*[all]
<b>警告:</b> 這會將所有設定重置為預設值。
你確定要執行此操作嗎?
}
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 =
<b>警告:</b>若要有良好的追蹤效果,必須進行初始設定,
如果這是您是第一次使用 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 }」按鈕來進行手動校正,<b>校正過程中請勿移動追蹤器</b>。
onboarding-calibration_tutorial-description = 每次在打開追蹤器的開關時,需要將追蹤器平置一下來進行自動校正。你也可以透過按下「{ onboarding-calibration_tutorial-calibrate }」按鈕來進行手動校正,<b>校正過程中請勿移動追蹤器</b>。
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 =
軀幹比例用於取得身體各個部位的長短,為計算追蹤器的位置而有所必要。
當您的軀幹比例與設定的比例有差異時,追蹤精確度會變差,您可能會注意到出現腳滑溜冰的情形,或者你的身體與你的虛擬角色對不太上。
當你的軀幹比例與設定的比例有差異時,追蹤精確度會變差,你可能會注意到出現腳滑溜冰的情形,或者你的身體與你的虛擬角色對不太上。
<b>軀幹比例的測量只需要進行一次!</b>除非設定有誤,或是身材有明顯變化,本設定不需要重複進行。
onboarding-choose_proportions-auto_proportions = 自動軀幹比例校正
# Italized text
# Italicized text
onboarding-choose_proportions-auto_proportions-subtitle = 推薦使用
onboarding-choose_proportions-auto_proportions-descriptionv3 =
本選項會從您的身體動作錄製一段樣本,並通過演算法來推算您的軀幹比例。
本選項會從你的身體動作錄製一段樣本,並通過演算法來推算你的軀幹比例。
<b>使用本功能需要連接頭戴顯示器到 SlimeVR,並且配戴在頭部!</b>
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 = 請<u>站直</u>並按下按鈕以計算身高,按下按鈕後您有 3 秒鐘來調整姿勢。
onboarding-automatic_proportions-check_height-guardian_tip = 如果您使用的是一體式 VR 頭顯,請確認頭盔的守護神/邊界設定已經開啟,以確保身高能正確測量。
onboarding-automatic_proportions-check_height-calculation_warning = 請<u>站直</u>並按下按鈕以計算身高,按下按鈕後你有 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 =
<b>警告:</b> 推算軀幹比例時發生錯誤。
請<docs>閱讀文件</docs>或加入我們的 <discord>Discord</discord> 伺服器以尋求協助 ^_^
onboarding-automatic_proportions-error_modal-v2 =
<b>警告:</b>推算軀幹比例時發生錯誤!
這有可能是配戴校正的問題,請確保追蹤功能運作正常之後再試一次。
<docs>請檢閱文件</docs>或加入我們的 <discord>Discord</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
+15 -12
View File
@@ -21,21 +21,21 @@ default = ["custom-protocol"]
custom-protocol = ["tauri/custom-protocol"]
[build-dependencies]
tauri-build = { version = "=2.0.0-beta.18", features = [] }
tauri-build = { version = "2.0", features = [] }
cfg_aliases = "0.2"
shadow-rs = "0.27"
shadow-rs = "0.35"
[dependencies]
serde_json = "1"
serde = { version = "1", features = ["derive"] }
tauri = { version = "=2.0.0-beta.23", features = ["devtools", "tray-icon", "image-png"] }
tauri-runtime = "=2.0.0-beta.19"
tauri-plugin-dialog = "=2.0.0-beta.10"
tauri-plugin-fs = "=2.0.0-beta.10"
tauri-plugin-os = "=2.0.0-beta.7"
tauri-plugin-shell = "=2.0.0-beta.8"
tauri-plugin-store = "=2.0.0-beta.9"
flexi_logger = "0.28"
tauri = { version = "2.0", features = ["devtools", "tray-icon", "image-png"] }
tauri-runtime = "2.0"
tauri-plugin-dialog = "2.0"
tauri-plugin-fs = "2.0"
tauri-plugin-os = "2.0"
tauri-plugin-shell = "2.0"
tauri-plugin-store = "2.0"
flexi_logger = "0.29"
log-panics = { version = "2", features = ["with-backtrace"] }
log = "0.4"
clap = { version = "4.0.29", features = ["derive"] }
@@ -45,11 +45,11 @@ tempfile = "3"
which = "6.0"
glob = "0.3"
open = "5"
shadow-rs = { version = "0.27", default-features = false }
shadow-rs = { version = "0.35", default-features = false }
const_format = "0.2.30"
cfg-if = "1"
color-eyre = "0.6"
rfd = { version = "0.14", features = ["gtk3"], default-features = false }
rfd = { version = "0.15", features = ["gtk3"], default-features = false }
dirs-next = "2.0.0"
discord-sdk = "0.3.6"
tokio = { version = "1.37.0", features = ["time"] }
@@ -57,3 +57,6 @@ tokio = { version = "1.37.0", features = ["time"] }
[target.'cfg(windows)'.dependencies]
win32job = "1"
winreg = "0.52"
[target.'cfg(target_os = "linux")'.dependencies]
libloading = "0.8"
+16 -15
View File
@@ -6,24 +6,25 @@
"main"
],
"permissions": [
"path:default",
"event:default",
"window:default",
"app:default",
"resources:default",
"menu:default",
"tray:default",
"core:path:default",
"core:event:default",
"core:window:default",
"core:app:default",
"core:resources:default",
"core:menu:default",
"core:tray:default",
"core:webview:default",
"core:window:allow-close",
"core:window:allow-toggle-maximize",
"core:window:allow-minimize",
"core:window:allow-start-dragging",
"core:window:allow-hide",
"core:window:allow-show",
"core:window:allow-set-focus",
"core:window:allow-set-decorations",
"store:default",
"os:allow-os-type",
"webview:default",
"dialog:allow-save",
"window:allow-close",
"window:allow-toggle-maximize",
"window:allow-minimize",
"window:allow-start-dragging",
"window:allow-hide",
"window:allow-show",
"window:allow-set-focus",
"shell:allow-open",
"store:allow-get",
"store:allow-set",
+6 -3
View File
@@ -11,6 +11,7 @@ use std::time::Instant;
use clap::Parser;
use color_eyre::Result;
use state::WindowState;
use tauri::Emitter;
use tauri::{Manager, RunEvent, WindowEvent};
use tauri_plugin_shell::process::CommandChild;
@@ -179,6 +180,7 @@ fn main() -> Result<()> {
warning,
tray::update_translations,
tray::update_tray_text,
tray::is_tray_available,
presence::discord_client_exists,
presence::update_presence,
presence::clear_presence,
@@ -208,11 +210,12 @@ fn main() -> Result<()> {
window_state.update_window(&window.as_ref().window(), false)?;
}
#[cfg(desktop)]
{
if cfg!(desktop) {
let handle = app.handle();
tray::create_tray(handle)?;
presence::create_presence(handle)?;
} else {
app.manage(tray::TrayAvailable(false));
}
app.manage(Mutex::new(window_state));
@@ -226,7 +229,7 @@ fn main() -> Result<()> {
.shell()
.command(java_bin.to_str().unwrap())
.current_dir(p)
.args(["-Xmx512M", "-jar", "slimevr.jar", "run"])
.args(["-Xmx128M", "-jar", "slimevr.jar", "run"])
.spawn()
.expect("Unable to start the server jar");
+5
View File
@@ -15,6 +15,7 @@ pub struct WindowState {
height: f64,
x: i32,
y: i32,
decorated: bool,
#[serde(skip)]
old: bool,
}
@@ -50,6 +51,8 @@ impl WindowState {
window: &Window,
ignore_maximized: bool,
) -> Result<()> {
self.decorated = window.is_decorated()?;
let maximized = window.is_maximized()?;
self.maximized = maximized || (self.maximized && ignore_maximized);
// We early return when it's maximized because we dont have to save the state
@@ -70,6 +73,8 @@ impl WindowState {
}
pub fn update_window(&self, window: &Window, ignore_maximized: bool) -> Result<()> {
window.set_decorations(self.decorated)?;
let maximized = !ignore_maximized && window.is_maximized()?;
if maximized && !self.maximized {
window.unmaximize()?;
+34 -4
View File
@@ -4,10 +4,11 @@ use tauri::{
image::Image,
menu::{Menu, MenuBuilder, MenuItemBuilder, MenuItemKind},
tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
AppHandle, Manager, Runtime, State,
AppHandle, Emitter, Manager, Runtime, State,
};
pub struct TrayMenu<R: Runtime>(Menu<R>);
pub struct TrayAvailable(pub bool);
pub struct TrayTranslations {
store: Mutex<HashMap<String, String>>,
@@ -21,11 +22,16 @@ impl TrayTranslations {
}
}
#[tauri::command]
pub fn is_tray_available(tray_available: State<TrayAvailable>) -> bool {
tray_available.0
}
#[tauri::command]
pub fn update_translations<R: Runtime>(
app: AppHandle<R>,
i18n: State<TrayTranslations>,
menu: State<TrayMenu<R>>,
menu: State<Option<TrayMenu<R>>>,
new_i18n: HashMap<String, String>,
) -> color_eyre::Result<(), String> {
{
@@ -44,8 +50,11 @@ pub fn update_translations<R: Runtime>(
pub fn update_tray_text<R: Runtime>(
app: AppHandle<R>,
i18n: State<TrayTranslations>,
menu: State<TrayMenu<R>>,
menu: State<Option<TrayMenu<R>>>,
) -> color_eyre::Result<(), String> {
let Some(menu) = menu.as_ref() else {
return Ok(());
};
if let Some((window, MenuItemKind::MenuItem(toggle_i))) =
app.get_webview_window("main").zip(menu.0.get("toggle"))
{
@@ -67,6 +76,26 @@ pub fn update_tray_text<R: Runtime>(
}
pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
#[cfg(target_os = "linux")]
unsafe {
const LIBS_TO_CHECK: &[&str] = &[
"libayatana-appindicator3.so.1",
"libappindicator3.so.1",
"libayatana-appindicator3.so",
"libappindicator3.so",
];
let found = LIBS_TO_CHECK
.iter()
.any(|lib| libloading::Library::new(lib).is_ok());
if !found {
log::warn!(
"libappindicator couldn't be found so tray support has been disabled!"
);
app.manage(TrayAvailable(false));
return Ok(());
}
}
let toggle_i = MenuItemBuilder::with_id("toggle", "Hide").build(app)?;
let quit_i = MenuItemBuilder::with_id("quit", "Quit").build(app)?;
let menu1 = MenuBuilder::new(app).items(&[&toggle_i, &quit_i]).build()?;
@@ -120,7 +149,8 @@ pub fn create_tray<R: Runtime>(app: &tauri::AppHandle<R>) -> tauri::Result<()> {
.menu_on_left_click(false)
.build(app)?;
app.manage(TrayMenu(menu1));
app.manage(TrayAvailable(true));
app.manage(Some(TrayMenu(menu1)));
app.manage(TrayTranslations {
store: Default::default(),
});
+1 -22
View File
@@ -62,29 +62,8 @@
"licenseFile": "../../LICENSE-MIT"
},
"plugins": {
"fs": {
"all": true,
"scope": [
"$APP/*",
"$APP"
]
},
"os": {
"all": true
},
"shell": {
"open": true
},
"window": {
"close": true,
"maximize": true,
"minimize": true,
"setResizable": true,
"setSize": true,
"setTitle": true,
"startDragging": true,
"unmaximize": true,
"unminimize": true
"open": "^((https?://\\w+)|(file://)).+"
}
},
"productName": "slimevr",
+2
View File
@@ -55,6 +55,7 @@ import { AppLayout } from './AppLayout';
import { Preload } from './components/Preload';
import { UnknownDeviceModal } from './components/UnknownDeviceModal';
import { useDiscordPresence } from './hooks/discord-presence';
import { AdvancedSettings } from './components/settings/pages/AdvancedSettings';
export const GH_REPO = 'SlimeVR/SlimeVR-Server';
export const VersionContext = createContext('');
@@ -110,6 +111,7 @@ function Layout() {
<Route path="osc/vrchat" element={<VRCOSCSettings />} />
<Route path="osc/vmc" element={<VMCSettings />} />
<Route path="interface" element={<InterfaceSettings />} />
<Route path="advanced" element={<AdvancedSettings />} />
</Route>
<Route
path="/onboarding"
+7 -3
View File
@@ -9,6 +9,7 @@ import { RulerIcon } from './commons/icon/RulerIcon';
import { SparkleIcon } from './commons/icon/SparkleIcon';
import { WrenchIcon } from './commons/icon/WrenchIcons';
import { useBreakpoint } from '@/hooks/breakpoint';
import { useConfig } from '@/hooks/config';
export function NavButton({
to,
@@ -64,6 +65,7 @@ export function NavButton({
}
export function MainLinks() {
const { config } = useConfig();
const { l10n } = useLocalization();
return (
@@ -94,9 +96,11 @@ export function MainLinks() {
>
{l10n.getString('navbar-body_proportions')}
</NavButton>
<NavButton to="/onboarding/home" icon={<SparkleIcon></SparkleIcon>}>
{l10n.getString('navbar-onboarding')}
</NavButton>
{config?.showNavbarOnboarding && (
<NavButton to="/onboarding/home" icon={<SparkleIcon></SparkleIcon>}>
{l10n.getString('navbar-onboarding')}
</NavButton>
)}
</>
);
}
+42 -24
View File
@@ -1,4 +1,4 @@
import { getCurrent } from '@tauri-apps/api/webviewWindow';
import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow';
import { ReactNode, useContext, useEffect, useState } from 'react';
import { NavLink, useMatch } from 'react-router-dom';
import {
@@ -27,6 +27,9 @@ import { TrackersStillOnModal } from './TrackersStillOnModal';
import { useConfig } from '@/hooks/config';
import { listen } from '@tauri-apps/api/event';
import { TrayOrExitModal } from './TrayOrExitModal';
import { error } from '@/utils/logging';
import { useDoubleTap } from 'use-double-tap';
import { isTrayAvailable } from '@/utils/tauri';
export function VersionTag() {
return (
@@ -57,27 +60,29 @@ export function TopBar({
const { useRPCPacket, sendRPCPacket } = useWebsocketAPI();
const { useConnectedIMUTrackers } = useTrackers();
const connectedIMUTrackers = useConnectedIMUTrackers();
const { config, setConfig } = useConfig();
const { config, setConfig, saveConfig } = useConfig();
const version = useContext(VersionContext);
const [localIp, setLocalIp] = useState<string | null>(null);
const [showConnectedTrackersWarning, setConnectedTrackerWarning] =
useState(false);
const [showVersionMobile, setShowVersionMobile] = useState(false);
const [showTrayOrExitModal, setShowTrayOrExitModal] = useState(false);
const doesMatchSettings = useMatch({
path: '/settings/*',
});
const closeApp = async () => {
await saveConfig();
await invoke('update_window_state');
await getCurrent().close();
await getCurrentWebviewWindow().close();
};
const tryCloseApp = async (dontTray = false) => {
if (isTauri && config?.useTray === null) {
if (isTrayAvailable && config?.useTray === null) {
setShowTrayOrExitModal(true);
return;
}
if (config?.useTray && !dontTray) {
await getCurrent().hide();
await getCurrentWebviewWindow().hide();
await invoke('update_tray_text');
} else if (
config?.connectedTrackersWarning &&
@@ -90,13 +95,15 @@ export function TopBar({
await closeApp();
}
};
const showVersionBind = useDoubleTap(() => setShowVersionMobile(true));
const unshowVersionBind = useDoubleTap(() => setShowVersionMobile(false));
useEffect(() => {
const unlisten = listen('try-close', async () => {
const window = getCurrent();
const window = getCurrentWebviewWindow();
await window.show();
await window.setFocus();
await invoke('update_tray_text');
if (isTrayAvailable) await invoke('update_tray_text');
await tryCloseApp(true);
});
return () => {
@@ -104,6 +111,11 @@ export function TopBar({
};
}, [config?.useTray, config?.connectedTrackersWarning]);
useEffect(() => {
if (config === null || !isTauri) return;
getCurrentWebviewWindow().setDecorations(config?.decorations).catch(error);
}, [config?.decorations]);
useEffect(() => {
sendRPCPacket(RpcMessage.ServerInfosRequest, new ServerInfosRequestT());
}, []);
@@ -121,18 +133,20 @@ export function TopBar({
<div className="h-[3px]"></div>
<div data-tauri-drag-region className="flex gap-2 h-[38px] z-50">
<div
className="flex px-2 pb-1 mt-3 justify-around z-50"
className="flex px-2 py-2 justify-around z-50"
data-tauri-drag-region
>
<div className="flex gap-2 mobile:w-5" data-tauri-drag-region>
<NavLink
to="/"
className="flex justify-around flex-col select-all"
data-tauri-drag-region
>
<SlimeVRIcon></SlimeVRIcon>
</NavLink>
{(isTauri || !isMobile) && (
<div className="flex gap-2" data-tauri-drag-region>
{!config?.decorations && (
<NavLink
to="/"
className="flex justify-around flex-col select-all"
data-tauri-drag-region
>
<SlimeVRIcon></SlimeVRIcon>
</NavLink>
)}
{(isTauri || !isMobile) && !config?.decorations && (
<div
className={classNames('flex justify-around flex-col')}
data-tauri-drag-region
@@ -140,7 +154,7 @@ export function TopBar({
<Typography>SlimeVR</Typography>
</div>
)}
{!isMobile && (
{(!(isMobile && !config?.decorations) || showVersionMobile) && (
<>
<VersionTag></VersionTag>
{doesMatchSettings && (
@@ -149,6 +163,7 @@ export function TopBar({
'flex justify-around flex-col text-standard-bold text-status-special',
'bg-status-special bg-opacity-20 rounded-lg px-3 select-text'
)}
{...unshowVersionBind}
>
{localIp || 'unknown local ip'}
</div>
@@ -192,8 +207,11 @@ export function TopBar({
</>
)}
{!isTauri && (
<div className="flex flex-row gap-2">
{!isTauri && !showVersionMobile && !config?.decorations && (
<div
className="flex flex-row gap-2"
{...(doesMatchSettings ? showVersionBind : {})}
>
<div
className="flex justify-around flex-col xs:hidden"
data-tauri-drag-region
@@ -230,17 +248,17 @@ export function TopBar({
</div>
)}
{isTauri && (
{isTauri && !config?.decorations && (
<>
<div
className="flex items-center justify-center hover:bg-background-60 rounded-full w-7 h-7"
onClick={() => getCurrent().minimize()}
onClick={() => getCurrentWebviewWindow().minimize()}
>
<MinimiseIcon></MinimiseIcon>
</div>
<div
className="flex items-center justify-center hover:bg-background-60 rounded-full w-7 h-7"
onClick={() => getCurrent().toggleMaximize()}
onClick={() => getCurrentWebviewWindow().toggleMaximize()}
>
<MaximiseIcon></MaximiseIcon>
</div>
@@ -268,7 +286,7 @@ export function TopBar({
// Doing this in here just in case config doesn't get updated in time
if (useTray) {
await getCurrent().hide();
await getCurrentWebviewWindow().hide();
await invoke('update_tray_text');
} else if (
config?.connectedTrackersWarning &&
@@ -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<
<UpperLegIcon width={width} flipped></UpperLegIcon>
),
[BodyPart.WAIST]: ({ width }) => <WaistIcon width={width}></WaistIcon>,
[BodyPart.LEFT_THUMB_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_THUMB_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_THUMB_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_INDEX_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_INDEX_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_INDEX_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_MIDDLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_MIDDLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_MIDDLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_RING_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_RING_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_RING_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_LITTLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_LITTLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_LITTLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_THUMB_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_THUMB_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_THUMB_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_INDEX_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_INDEX_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_INDEX_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_MIDDLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_MIDDLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_MIDDLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_RING_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_RING_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_RING_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_LITTLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_LITTLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_LITTLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
};
export function BodyPartIcon({
+16 -8
View File
@@ -9,6 +9,7 @@ export function CheckBox({
control,
outlined,
name,
loading,
// input props
disabled,
...props
@@ -19,6 +20,7 @@ export function CheckBox({
variant?: 'checkbox' | 'toggle';
color?: 'primary' | 'secondary' | 'tertiary';
outlined?: boolean;
loading?: boolean;
} & React.HTMLProps<HTMLInputElement>) {
const classes = useMemo(() => {
const vriantsMap = {
@@ -32,7 +34,9 @@ export function CheckBox({
toggle: {
checkbox: classNames('hidden'),
toggle: classNames('w-10 h-4 rounded-full relative transition-colors'),
pin: classNames('h-2 w-2 bg-background-10 rounded-full absolute m-1'),
pin: classNames(
'h-2 w-2 bg-background-10 rounded-full absolute m-1 transition-opacity'
),
},
};
return vriantsMap[variant];
@@ -60,7 +64,8 @@ export function CheckBox({
'w-full py-3 flex gap-2 items-center text-standard-bold',
{
'px-3': outlined,
'cursor-pointer': !disabled,
'cursor-pointer': !disabled || !loading,
'cursor-default': disabled || loading,
}
)}
>
@@ -71,23 +76,26 @@ export function CheckBox({
name={name}
className={classes.checkbox}
type="checkbox"
disabled={disabled}
disabled={disabled || loading}
{...props}
/>
{variant === 'toggle' && (
<div
className={classNames(classes.toggle, {
'bg-accent-background-30': value && !disabled,
'bg-accent-background-30': value && !disabled && !loading,
'bg-accent-background-50': value && disabled,
'bg-accent-background-30 animate-pulse': loading && !disabled,
'bg-background-50':
(!value && color == 'primary') || color == 'secondary',
'bg-background-40': !value && color == 'tertiary',
((!value && color == 'primary') || color == 'secondary') &&
!loading,
'bg-background-40': !value && color == 'tertiary' && !loading,
})}
>
<div
className={classNames(classes.pin, {
'left-0': !value,
'right-0': value,
'left-0': !value && !loading,
'opacity-0': loading,
'right-0': value && !loading,
'bg-background-30': disabled,
})}
></div>
@@ -0,0 +1,16 @@
export function BugIcon() {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="currentColor"
className="size-6"
>
<path
fillRule="evenodd"
d="M8.478 1.6a.75.75 0 0 1 .273 1.026 3.72 3.72 0 0 0-.425 1.121c.058.058.118.114.18.168A4.491 4.491 0 0 1 12 2.25c1.413 0 2.673.651 3.497 1.668.06-.054.12-.11.178-.167a3.717 3.717 0 0 0-.426-1.125.75.75 0 1 1 1.298-.752 5.22 5.22 0 0 1 .671 2.046.75.75 0 0 1-.187.582c-.241.27-.505.52-.787.749a4.494 4.494 0 0 1 .216 2.1c-.106.792-.753 1.295-1.417 1.403-.182.03-.364.057-.547.081.152.227.273.476.359.742a23.122 23.122 0 0 0 3.832-.803 23.241 23.241 0 0 0-.345-2.634.75.75 0 0 1 1.474-.28c.21 1.115.348 2.256.404 3.418a.75.75 0 0 1-.516.75c-1.527.499-3.119.854-4.76 1.049-.074.38-.22.735-.423 1.05 2.066.209 4.058.672 5.943 1.358a.75.75 0 0 1 .492.75 24.665 24.665 0 0 1-1.189 6.25.75.75 0 0 1-1.425-.47 23.14 23.14 0 0 0 1.077-5.306c-.5-.169-1.009-.32-1.524-.455.068.234.104.484.104.746 0 3.956-2.521 7.5-6 7.5-3.478 0-6-3.544-6-7.5 0-.262.037-.511.104-.746-.514.135-1.022.286-1.522.455.154 1.838.52 3.616 1.077 5.307a.75.75 0 1 1-1.425.468 24.662 24.662 0 0 1-1.19-6.25.75.75 0 0 1 .493-.749 24.586 24.586 0 0 1 4.964-1.24h.01c.321-.046.644-.085.969-.118a2.983 2.983 0 0 1-.424-1.05 24.614 24.614 0 0 1-4.76-1.05.75.75 0 0 1-.516-.75c.057-1.16.194-2.302.405-3.417a.75.75 0 0 1 1.474.28c-.164.862-.28 1.74-.345 2.634 1.237.371 2.517.642 3.832.803.085-.266.207-.515.359-.742a18.698 18.698 0 0 1-.547-.08c-.664-.11-1.311-.612-1.417-1.404a4.535 4.535 0 0 1 .217-2.103 6.788 6.788 0 0 1-.788-.751.75.75 0 0 1-.187-.583 5.22 5.22 0 0 1 .67-2.04.75.75 0 0 1 1.026-.273Z"
clipRule="evenodd"
/>
</svg>
);
}
@@ -0,0 +1,15 @@
export function FingersIcon({ width = 28 }: { width?: number }) {
return (
<svg
version="1.1"
id="Layer_1"
xmlns="http://www.w3.org/2000/svg"
width={width}
viewBox="0 0 93.49 130"
>
<g>
<path d="M2.34,62.52l-0.26,0.27l-2.08-0.83V31.27c0-1.42,0.42-2.76,1.14-3.89l0,0c0.14-0.22,0.29-0.44,0.46-0.64 c0.17-0.22,0.35-0.42,0.53-0.6l0.02-0.02c0.54-0.54,1.18-1.01,1.89-1.36l0.03-0.01l0.35-0.17l0.04-0.02 c0.86-0.37,1.82-0.58,2.81-0.58l0,0h0.04v0c2.01,0,3.84,0.82,5.16,2.14c0.54,0.54,1.01,1.18,1.36,1.88l0.02,0.04l0.16,0.35 l0.01,0.03c0.37,0.86,0.58,1.82,0.58,2.81l0,0.01v0.04v24.96v1.13l-1.13,0.07c-3.08,0.19-5.92,1.18-8.32,2.77 c-0.48,0.32-0.94,0.66-1.38,1.02c-0.41,0.34-0.84,0.72-1.26,1.15L2.34,62.52L2.34,62.52L2.34,62.52z M65.62,83.35l1.23,0.46 l0.53,0.39c0.09,0.12,0.2,0.22,0.33,0.31l0,0l0.16,0.09l0,0.01c0.17,0.08,0.35,0.12,0.54,0.12v0h0.03c0.18,0,0.34-0.03,0.49-0.09 l0.12-0.06l0.12-0.07l0.04-0.02l0.04-0.02c0.54-0.31,1.26-0.85,2.05-1.5c0.8-0.67,1.71-1.49,2.61-2.33 c1.76-1.66,3.76-3.66,4.56-4.45l0.04-0.04c2.53-2.53,5.11-3.7,7.38-3.85c0.46-0.03,0.92-0.02,1.35,0.03 c0.44,0.05,0.87,0.14,1.28,0.27h0.01l0.05,0.02l0.01,0c0.81,0.26,1.56,0.67,2.22,1.2l0.03,0.03l0.31,0.27l0.06,0.05l0.29,0.29 l0.05,0.06l0.01,0.01l0,0l0.01,0.02l0,0c0.56,0.62,1.01,1.35,1.34,2.16l0.02,0.03l0.15,0.42l0.02,0.09l0.12,0.43l0.01,0.05 l0.01,0.06h0c0.57,2.38,0.1,5.27-1.88,8.17c-0.37,0.55-0.81,1.11-1.29,1.65c-0.48,0.54-1.02,1.09-1.62,1.62l0,0l-0.08,0.07 l-0.1,0.09l-0.07,0.07l-0.04,0.04L63.64,114.3l-0.85,0.93l-0.06-0.06c-1.35,1.23-2.67,2.29-4.01,3.2c-1.6,1.08-3.22,1.95-4.9,2.61 c-1.69,0.67-3.46,1.15-5.33,1.46c-1.87,0.3-3.84,0.45-5.94,0.45h-15.9c-5.3,0-10.23-1.56-14.36-4.23l0,0 c-0.79-0.51-1.57-1.08-2.32-1.69c-0.76-0.62-1.47-1.26-2.12-1.92l-0.02-0.02l0,0c-2.01-2.04-3.71-4.42-5-7.03 c-0.25-0.52-0.49-1.04-0.71-1.56C0.76,103.2,0.01,99.65,0,95.93h0V95.9V74.93c0-1.93,0.36-3.79,1-5.49l0-0.01 c0.12-0.31,0.26-0.64,0.41-0.97h0c0.15-0.32,0.31-0.64,0.48-0.95l0.01-0.02l0.03-0.05l0.02-0.04c0.62-0.97,1.36-1.88,2.19-2.69 l0.02-0.02l0.46-0.43l0.04-0.03l0.48-0.41l0.04-0.04l0.02-0.02l0,0c1.06-0.85,2.24-1.57,3.51-2.11h0c0.29-0.12,0.57-0.24,0.76-0.3 v0c1.56-0.57,3.25-0.88,5.01-0.88v0h0.04h0.64l0.29,0.04l0.27,0.07l0.21,0.02v0h17.27v0l0.11,0h0.08l0.11,0v0h17.27v0l0.05,0h0.07 l0.05,0v0h1.28c2.54,0,4.94,0.65,7.05,1.79l0,0c0.42,0.23,0.82,0.47,1.19,0.72v0l0.01,0c0.36,0.24,0.74,0.52,1.11,0.82l0.01,0.01 l0.02,0.02l0,0c1.82,1.49,3.3,3.41,4.25,5.6c0.2,0.45,0.37,0.89,0.5,1.31v0c0.15,0.45,0.27,0.91,0.38,1.37v0.01l0.01,0.07 l0.02,0.11c0.01,0.08,0.02,0.16,0.04,0.22h0l0.01,0.03h0l0.04,0.11h0l0.02,0.06L67,73.21l0.06,0.65l0,0.04l0.02,0.26v0.04 l0.02,0.46v0.03l0,0.25l0,0.01v4.43v1.66l-1.58-0.52c-2.46-0.81-4.81-1.36-7.03-1.66h0c-0.5-0.07-0.98-0.12-1.42-0.17 c-0.45-0.04-0.92-0.08-1.39-0.1l-1.02-0.03c-2.85-0.04-5.48,0.37-7.81,1.17c-0.51,0.18-0.99,0.36-1.42,0.55 c-0.45,0.2-0.9,0.41-1.32,0.64l-0.71,0.41c-2.23,1.34-4.08,3.14-5.49,5.34c-0.29,0.46-0.56,0.9-0.78,1.33 c-0.24,0.45-0.46,0.94-0.68,1.44v0l-0.01,0.03h0c-0.68,1.62-1.17,3.4-1.45,5.33c-0.06,0.44-0.12,0.87-0.15,1.28 c-0.03,0.34-0.07,0.7-0.08,1.06l2.66,0.03c0.08-1.35,0.28-2.64,0.57-3.84h0c0.09-0.37,0.18-0.72,0.27-1.03h0 c0.09-0.3,0.2-0.64,0.33-0.98v0l0.32-0.82l0,0c0.89-2.13,2.18-3.94,3.8-5.38c0.32-0.28,0.66-0.55,0.99-0.8 c0.37-0.27,0.72-0.51,1.06-0.71l0.02-0.01l0.03-0.02v0c1.7-1.02,3.68-1.73,5.9-2.09c0.45-0.07,0.94-0.14,1.44-0.18 c0.49-0.05,1-0.07,1.49-0.09h0.03l0.98,0h0.02c2.3,0.03,4.79,0.39,7.44,1.07v0c0.61,0.15,1.18,0.32,1.72,0.49 c0.62,0.19,1.21,0.39,1.77,0.58L65.62,83.35L65.62,83.35z M15.74,60.59L15.74,60.59L15.74,60.59L15.74,60.59L15.74,60.59z M48.24,57.4H36.05h-1.2v-1.2V7.3h0c0-2.01,0.82-3.84,2.14-5.16c0.54-0.54,1.18-1.01,1.88-1.36l0.03-0.01l0.35-0.17l0.04-0.02 c0.86-0.37,1.81-0.58,2.81-0.58l0-0.01h0.04v0.01c2.01,0,3.84,0.82,5.16,2.14c0.54,0.54,1,1.18,1.36,1.88l0.02,0.03l0.16,0.35 l0.02,0.04c0.37,0.86,0.58,1.81,0.58,2.81l0,0.01V7.3v48.89v1.2H48.24L48.24,57.4z M53.63,57.45l-0.22-0.02l-1.12-0.09v-1.11V19.01 h0c0-2.01,0.82-3.84,2.14-5.16c0.54-0.54,1.18-1,1.89-1.36l0.04-0.02l0.35-0.16l0.03-0.02c0.86-0.37,1.81-0.58,2.81-0.58l0,0h0.04 c1.42,0,2.76,0.42,3.89,1.14l0,0l0.01,0.01c0.22,0.13,0.43,0.29,0.63,0.45l0,0l0.01,0.01c0.21,0.16,0.41,0.34,0.59,0.52l0.02,0.02 c0.54,0.54,1.01,1.18,1.36,1.88l0.01,0.03l0.17,0.35l0.02,0.04c0.37,0.86,0.58,1.82,0.58,2.81l0,0v0.04v42.9l-2.07,0.84l-0.2-0.2 c-2.06-2.06-4.63-3.62-7.49-4.45c-0.57-0.17-1.16-0.31-1.73-0.41C54.84,57.58,54.24,57.5,53.63,57.45L53.63,57.45z M30.68,57.4 H18.49h-1.21v-1.2V31.27h0V18.89h0c0-1.42,0.42-2.77,1.14-3.9h0c0.14-0.23,0.3-0.45,0.46-0.65c0.17-0.22,0.35-0.42,0.52-0.59 l0.02-0.02c0.54-0.54,1.18-1,1.89-1.36l0.03-0.01l0.35-0.16l0.04-0.02c0.86-0.37,1.81-0.58,2.81-0.58l0,0h0.04v0 c2.01,0,3.84,0.82,5.16,2.14c0.54,0.54,1,1.18,1.36,1.88l0.01,0.03L31.28,16l0.02,0.04c0.37,0.86,0.58,1.82,0.58,2.81l0,0v0.04 v37.3v1.2H30.68L30.68,57.4z" />
</g>
</svg>
);
}
@@ -10,7 +10,7 @@ import './OnboardingLayout.scss';
export function OnboardingLayout({ children }: { children: ReactNode }) {
const { isMobile } = useBreakpoint('mobile');
const { state, skipSetup } = useOnboarding();
const [skipWarning, setSkipWarning] = useState(false);
const [showWarning, setShowWarning] = useState(false);
return !state.alonePage ? (
<div className="onboarding-layout h-full">
@@ -21,15 +21,15 @@ export function OnboardingLayout({ children }: { children: ReactNode }) {
<div className="absolute top-12 mobile:top-0 right-2 z-50">
<SkipSetupButton
visible={true}
modalVisible={skipWarning}
onClick={() => setSkipWarning(true)}
modalVisible={showWarning}
onClick={() => setShowWarning(true)}
></SkipSetupButton>
</div>
<div className="h-full w-full overflow-y-auto">{children}</div>
<SkipSetupWarningModal
accept={skipSetup}
onClose={() => setSkipWarning(false)}
isOpen={skipWarning}
onClose={() => setShowWarning(false)}
isOpen={showWarning}
></SkipSetupWarningModal>
</div>
</div>
@@ -12,6 +12,7 @@ import { useTrackers } from '@/hooks/tracker';
import { useRestCalibrationTrackers } from '@/hooks/imu-logic';
import { averageVector, Vector3FromVec3fT } from '@/maths/vector3';
import { Vector3 } from 'three';
import { useTimeout } from '@/hooks/timeout';
export enum CalibrationStatus {
SUCCESS,
@@ -29,10 +30,12 @@ export function CalibrationTutorialPage() {
const [calibrationStatus, setCalibrationStatus] = useState(
CalibrationStatus.WAITING
);
const [skipButton, setSkipButton] = useState(false);
const { timer, isCounting, startCountdown, abortCountdown } = useCountdown({
duration: IMU_CALIBRATION_TIME,
onCountdownEnd: () => setCalibrationStatus(CalibrationStatus.SUCCESS),
});
useTimeout(() => setSkipButton(true), 10000);
const { useConnectedIMUTrackers } = useTrackers();
const connectedIMUTrackers = useConnectedIMUTrackers();
const restCalibrationTrackers =
@@ -192,6 +195,13 @@ export function CalibrationTutorialPage() {
{l10n.getString('onboarding-continue')}
</Button>
</div>
<Button
variant="secondary"
to="/onboarding/assign-tutorial"
className={classNames('xs:ml-auto', !skipButton && 'hidden')}
>
{l10n.getString('onboarding-calibration_tutorial-skip')}
</Button>
</div>
</div>
<div className="mobile:hidden flex self-center w-[32rem] mobile:absolute">
@@ -29,6 +29,8 @@ const statusLabelMap = {
'onboarding-connect_tracker-connection_status-none',
[WifiProvisioningStatus.SERIAL_INIT]:
'onboarding-connect_tracker-connection_status-serial_init',
[WifiProvisioningStatus.OBTAINING_MAC_ADDRESS]:
'onboarding-connect_tracker-connection_status-obtaining_mac_address',
[WifiProvisioningStatus.PROVISIONING]:
'onboarding-connect_tracker-connection_status-provisioning',
[WifiProvisioningStatus.CONNECTING]:
@@ -46,6 +48,7 @@ const statusLabelMap = {
const statusProgressMap = {
[WifiProvisioningStatus.NONE]: 0,
[WifiProvisioningStatus.SERIAL_INIT]: 0.2,
[WifiProvisioningStatus.OBTAINING_MAC_ADDRESS]: 0.3,
[WifiProvisioningStatus.PROVISIONING]: 0.4,
[WifiProvisioningStatus.CONNECTING]: 0.6,
[WifiProvisioningStatus.LOOKING_FOR_SERVER]: 0.8,
+9 -1
View File
@@ -3,9 +3,11 @@ import { useOnboarding } from '@/hooks/onboarding';
import { Button } from '@/components/commons/Button';
import { SlimeVRIcon } from '@/components/commons/icon/SimevrIcon';
import { Typography } from '@/components/commons/Typography';
import { useNavigate } from 'react-router-dom';
export function DonePage() {
const { l10n } = useLocalization();
const navigate = useNavigate();
const { applyProgress, skipSetup } = useOnboarding();
applyProgress(1);
@@ -22,7 +24,13 @@ export function DonePage() {
{l10n.getString('onboarding-done-description')}
</Typography>
</div>
<Button variant="primary" to="/" onClick={skipSetup}>
<Button
variant="primary"
onClick={() => {
skipSetup();
navigate('/');
}}
>
{l10n.getString('onboarding-done-close')}
</Button>
</div>
@@ -15,6 +15,8 @@ import { VerifyResultsStep } from './autobone-steps/VerifyResults';
import { useCountdown } from '@/hooks/countdown';
import { CheckHeight } from './autobone-steps/CheckHeight';
import { PreparationStep } from './autobone-steps/Preparation';
import { useState } from 'react';
import { ProportionsResetModal } from './ProportionsResetModal';
export function AutomaticProportionsPage() {
const { l10n } = useLocalization();
@@ -30,6 +32,8 @@ export function AutomaticProportionsPage() {
},
});
const [showWarning, setShowWarning] = useState(false);
applyProgress(0.9);
return (
@@ -65,7 +69,7 @@ export function AutomaticProportionsPage() {
<div className="w-full pb-4 flex flex-row mobile:justify-center">
<Button
variant="secondary"
onClick={startCountdown}
onClick={() => setShowWarning(true)}
disabled={isCounting}
>
<div className="relative">
@@ -76,6 +80,14 @@ export function AutomaticProportionsPage() {
</div>
</Button>
</div>
<ProportionsResetModal
accept={() => {
startCountdown();
setShowWarning(false);
}}
onClose={() => setShowWarning(false)}
isOpen={showWarning}
></ProportionsResetModal>
</div>
</AutoboneContextC.Provider>
);
@@ -278,7 +278,7 @@ export function BodyProportions({
className={classNames(
'h-12 w-32 rounded-lg bg-background-60 flex flex-col justify-center',
'items-center fill-background-10',
scrollerRef?.current?.scrollTop ?? 0 > 0
(scrollerRef?.current?.scrollTop ?? 0 > 0)
? 'opacity-100 active:bg-accent-background-30'
: 'opacity-50'
)}
@@ -7,15 +7,17 @@ import { CheckBox } from '@/components/commons/Checkbox';
import { Typography } from '@/components/commons/Typography';
import { BodyProportions } from './BodyProportions';
import { useLocalization } from '@fluent/react';
import { useEffect, useMemo } from 'react';
import { useEffect, useMemo, useState } from 'react';
import { useBreakpoint } from '@/hooks/breakpoint';
import { SkeletonVisualizerWidget } from '@/components/widgets/SkeletonVisualizerWidget';
import { ProportionsResetModal } from './ProportionsResetModal';
export function ButtonsControl() {
const { l10n } = useLocalization();
const { state } = useOnboarding();
const { sendRPCPacket } = useWebsocketAPI();
const [showWarning, setShowWarning] = useState(false);
const resetAll = () => {
sendRPCPacket(
RpcMessage.SkeletonResetAllRequest,
@@ -32,9 +34,17 @@ export function ButtonsControl() {
>
{l10n.getString('onboarding-previous_step')}
</Button>
<Button variant="secondary" onClick={resetAll}>
<Button variant="secondary" onClick={() => setShowWarning(true)}>
{l10n.getString('reset-reset_all')}
</Button>
<ProportionsResetModal
accept={() => {
resetAll();
setShowWarning(false);
}}
onClose={() => setShowWarning(false)}
isOpen={showWarning}
></ProportionsResetModal>
{!state.alonePage && (
<Button variant="primary" className="ml-auto" to="/onboarding/done">
{l10n.getString('onboarding-continue')}
@@ -0,0 +1,64 @@
import { Button } from '@/components/commons/Button';
import { WarningBox } from '@/components/commons/TipBox';
import { Localized, useLocalization } from '@fluent/react';
import { BaseModal } from '@/components/commons/BaseModal';
import ReactModal from 'react-modal';
export function ProportionsResetModal({
isOpen = true,
onClose,
accept,
...props
}: {
/**
* Is the parent/sibling component opened?
*/
isOpen: boolean;
/**
* Function to trigger when the warning hasn't been accepted
*/
onClose: () => void;
/**
* Function when you press `Reset settings`
*/
accept: () => void;
} & ReactModal.Props) {
const { l10n } = useLocalization();
return (
<BaseModal
isOpen={isOpen}
shouldCloseOnOverlayClick
onRequestClose={onClose}
className={props.className}
overlayClassName={props.overlayClassName}
>
<div className="flex w-full h-full flex-col ">
<div className="flex flex-col flex-grow items-center gap-3">
<Localized id="reset-reset_all_warning" elems={{ b: <b></b> }}>
<WarningBox>
<b>Warning:</b> This will reset your proportions to being just
based on your height.
<br />
Are you sure you want to do this?
</WarningBox>
</Localized>
<div className="flex flex-row gap-3 pt-5 place-content-center">
<Button variant="primary" onClick={onClose}>
{l10n.getString('reset-reset_all_warning-cancel')}
</Button>
<Button
variant="tertiary"
onClick={() => {
accept();
}}
>
{l10n.getString('reset-reset_all_warning-reset')}
</Button>
</div>
</div>
</div>
</BaseModal>
);
}
@@ -34,7 +34,7 @@ export function AutoboneErrorModal({
<div className="flex w-full h-full flex-col ">
<div className="flex w-full flex-col flex-grow items-center gap-3">
<Localized
id="onboarding-automatic_proportions-error_modal"
id="onboarding-automatic_proportions-error_modal-v2"
elems={{
b: <b></b>,
docs: (
@@ -12,16 +12,12 @@ import { Localized, useLocalization } from '@fluent/react';
import { useForm } from 'react-hook-form';
import { useMemo, useState } from 'react';
import { NumberSelector } from '@/components/commons/NumberSelector';
import {
DEFAULT_HEIGHT,
MIN_HEIGHT,
} from '@/components/onboarding/pages/body-proportions/ProportionsChoose';
import { MIN_HEIGHT } from '@/components/onboarding/pages/body-proportions/ProportionsChoose';
import { useLocaleConfig } from '@/i18n/config';
import { useCountdown } from '@/hooks/countdown';
import { TipBox } from '@/components/commons/TipBox';
interface HeightForm {
height: number;
hmdHeight: number;
}
@@ -62,18 +58,13 @@ export function CheckHeight({
[currentLocales]
);
useRPCPacket(
RpcMessage.HeightResponse,
({ hmdHeight, estimatedFullHeight }: HeightResponseT) => {
setValue('height', estimatedFullHeight || DEFAULT_HEIGHT);
setValue('hmdHeight', hmdHeight);
}
);
useRPCPacket(RpcMessage.HeightResponse, ({ hmdHeight }: HeightResponseT) => {
setValue('hmdHeight', hmdHeight);
});
const onSubmit = (values: HeightForm) => {
const changeSettings = new ChangeSettingsRequestT();
const autobone = new AutoBoneSettingsT();
autobone.targetFullHeight = values.height;
autobone.targetHmdHeight = values.hmdHeight;
changeSettings.autoBoneSettings = autobone;
@@ -143,23 +134,6 @@ export function CheckHeight({
step={0.01}
disabled={true}
/>
<NumberSelector
control={control}
name="height"
label={l10n.getString(
'onboarding-automatic_proportions-check_height-height1'
)}
valueLabelFormat={(value) =>
isNaN(value)
? l10n.getString(
'onboarding-automatic_proportions-check_height-unknown'
)
: mFormat.format(value)
}
min={MIN_HEIGHT}
max={4}
step={0.01}
/>
</form>
</div>
@@ -8,7 +8,7 @@ import { P, match } from 'ts-pattern';
import { AutoboneErrorModal } from './AutoboneErrorModal';
import { PlayCircleIcon } from '@/components/commons/icon/PlayIcon';
import { useDebouncedEffect } from '@/hooks/timeout';
import { AUTOBONE_VIDEO } from './StartRecording';
import { AUTOBONE_VIDEO } from '@/utils/tauri';
export function Recording({
nextStep,
@@ -6,9 +6,7 @@ import { useLocalization } from '@fluent/react';
import { useEffect, useRef, useState } from 'react';
import { PlayCircleIcon } from '@/components/commons/icon/PlayIcon';
import { useDebouncedEffect } from '@/hooks/timeout';
import { fetchResourceUrl } from '@/utils/tauri';
export const AUTOBONE_VIDEO = await fetchResourceUrl('/videos/autobone.webm');
import { AUTOBONE_VIDEO } from '@/utils/tauri';
export function StartRecording({
nextStep,
@@ -10,7 +10,7 @@ export function MountingChoose() {
const { l10n } = useLocalization();
const { applyProgress, skipSetup, state } = useOnboarding();
const [animated, setAnimated] = useState(false);
const [skipWarning, setSkipWarning] = useState(false);
const [showWarning, setShowWarning] = useState(false);
applyProgress(0.65);
@@ -139,8 +139,8 @@ export function MountingChoose() {
</div>
<SkipSetupWarningModal
accept={skipSetup}
onClose={() => setSkipWarning(false)}
isOpen={skipWarning}
onClose={() => setShowWarning(false)}
isOpen={showWarning}
></SkipSetupWarningModal>
</>
);
@@ -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<
<FootIcon width={width} flipped></FootIcon>
),
[BodyPart.WAIST]: ({ width }) => <FootIcon width={width}></FootIcon>,
[BodyPart.LEFT_THUMB_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_THUMB_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_THUMB_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_INDEX_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_INDEX_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_INDEX_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_MIDDLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_MIDDLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_MIDDLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_RING_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_RING_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_RING_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_LITTLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_LITTLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.LEFT_LITTLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_THUMB_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_THUMB_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_THUMB_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_INDEX_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_INDEX_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_INDEX_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_MIDDLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_MIDDLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_MIDDLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_RING_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_RING_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_RING_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_LITTLE_PROXIMAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_LITTLE_INTERMEDIATE]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
[BodyPart.RIGHT_LITTLE_DISTAL]: ({ width }) => (
<FingersIcon width={width}></FingersIcon>
),
};
export function MountingBodyPartIcon({
@@ -0,0 +1,72 @@
import { Button } from '@/components/commons/Button';
import { WarningBox } from '@/components/commons/TipBox';
import { Localized, useLocalization } from '@fluent/react';
import { BaseModal } from '@/components/commons/BaseModal';
import ReactModal from 'react-modal';
export function DriftCompensationModal({
isOpen = true,
onClose,
accept,
...props
}: {
/**
* Is the parent/sibling component opened?
*/
isOpen: boolean;
/**
* Function to trigger when the warning hasn't been accepted
*/
onClose: () => void;
/**
* Function when you press `I understand`
*/
accept: () => void;
} & ReactModal.Props) {
const { l10n } = useLocalization();
return (
<BaseModal
isOpen={isOpen}
shouldCloseOnOverlayClick
onRequestClose={onClose}
className={props.className}
overlayClassName={props.overlayClassName}
>
<div className="flex w-full h-full flex-col ">
<div className="flex flex-col flex-grow items-center gap-3">
<Localized
id="settings-general-tracker_mechanics-drift_compensation_warning"
elems={{ b: <b></b> }}
>
<WarningBox>
<b>Warning:</b> Drift compensation should only be used if you find
you need to reset very often (~5-10 minutes).
<br />
Some IMUs prone to frequent resets include: Joy-Cons, owoTrack,
and MPUs (without recent firmware).
</WarningBox>
</Localized>
<div className="flex flex-row gap-3 pt-5 place-content-center">
<Button variant="primary" onClick={onClose}>
{l10n.getString(
'settings-general-tracker_mechanics-drift_compensation_warning-cancel'
)}
</Button>
<Button
variant="tertiary"
onClick={() => {
accept();
}}
>
{l10n.getString(
'settings-general-tracker_mechanics-drift_compensation_warning-done'
)}
</Button>
</div>
</div>
</div>
</BaseModal>
);
}
@@ -19,14 +19,12 @@ export function HandsWarningModal({
*/
onClose: () => void;
/**
* Function when you press `i understand`
* Function when you press `Yes`
*/
accept: () => void;
} & ReactModal.Props) {
const { l10n } = useLocalization();
// isOpen is checked by checking if the parent modal is opened + our bodyPart is the
// neck and we havent showed this warning yet
return (
<BaseModal
isOpen={isOpen}
@@ -40,6 +40,10 @@ export function SettingSelectorMobile() {
label: l10n.getString('settings-sidebar-serial'),
value: { url: '/settings/serial' },
},
{
label: l10n.getString('settings-sidebar-advanced'),
value: { url: '/settings/advanced' },
},
];
const { control, watch, handleSubmit, setValue } = useForm<{
@@ -0,0 +1,73 @@
import { Button } from '@/components/commons/Button';
import { WarningBox } from '@/components/commons/TipBox';
import { Localized, useLocalization } from '@fluent/react';
import { BaseModal } from '@/components/commons/BaseModal';
import ReactModal from 'react-modal';
export function SettingsResetModal({
isOpen = true,
onClose,
accept,
variant,
...props
}: {
/**
* Is the parent/sibling component opened?
*/
isOpen: boolean;
/**
* Function to trigger when the warning hasn't been accepted
*/
onClose: () => void;
/**
* Function when you press `Reset settings`
*/
accept: () => void;
/**
* Type of reset
*/
variant: 'gui' | 'server' | 'all';
} & ReactModal.Props) {
const { l10n } = useLocalization();
return (
<BaseModal
isOpen={isOpen}
shouldCloseOnOverlayClick
onRequestClose={onClose}
className={props.className}
overlayClassName={props.overlayClassName}
>
<div className="flex w-full h-full flex-col ">
<div className="flex flex-col flex-grow items-center gap-3">
<Localized
id="settings-utils-advanced-reset_warning"
elems={{ b: <b></b> }}
vars={{ type: variant }}
>
<WarningBox>
<b>Warning:</b> This will reset your {variant} settings to the
defaults.
<br />
Are you sure you want to do this?
</WarningBox>
</Localized>
<div className="flex flex-row gap-3 pt-5 place-content-center">
<Button variant="primary" onClick={onClose}>
{l10n.getString('settings-utils-advanced-reset_warning-cancel')}
</Button>
<Button
variant="tertiary"
onClick={() => {
accept();
}}
>
{l10n.getString('settings-utils-advanced-reset_warning-reset')}
</Button>
</div>
</div>
</div>
</BaseModal>
);
}
@@ -41,6 +41,7 @@ export function SettingsLink({
export function SettingsSidebar() {
const { l10n } = useLocalization();
return (
<div className="flex flex-col px-5 py-5 gap-3 overflow-y-auto bg-background-70 rounded-lg h-full">
<Typography variant="main-title">
@@ -100,6 +101,11 @@ export function SettingsSidebar() {
{l10n.getString('settings-sidebar-serial')}
</SettingsLink>
</div>
<div className="flex flex-col gap-2">
<SettingsLink to="/settings/advanced">
{l10n.getString('settings-sidebar-advanced')}
</SettingsLink>
</div>
</div>
</div>
</div>
@@ -0,0 +1,190 @@
import { useLocalization } from '@fluent/react';
import { useState } from 'react';
import { Typography } from '@/components/commons/Typography';
import {
SettingsPageLayout,
SettingsPagePaneLayout,
} from '@/components/settings/SettingsPageLayout';
import { BugIcon } from '@/components/commons/icon/BugIcon';
import { Button } from '@/components/commons/Button';
import { SettingsResetModal } from '@/components/settings/SettingsResetModal';
import { open } from '@tauri-apps/plugin-shell';
import { error } from '@/utils/logging';
import { appConfigDir } from '@tauri-apps/api/path';
import { defaultConfig as defaultGUIConfig, useConfig } from '@/hooks/config';
import { defaultValues as defaultDevConfig } from '@/components/widgets/DeveloperModeWidget';
import { RpcMessage, SettingsResetRequestT } from 'solarxr-protocol';
import { useWebsocketAPI } from '@/hooks/websocket-api';
function guiDefaults() {
// Destructure the properties to exclude "lang"
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { lang, ...guiDefaults } = defaultGUIConfig;
// Include "devSettings" which has all the properties of "defaultDevConfig"
// @ts-expect-error "devSettings" is not in the "guiDefaults" object but we want to include it (from "defaultDevConfig")
guiDefaults.devSettings = defaultDevConfig;
return guiDefaults;
}
export function AdvancedSettings() {
const { l10n } = useLocalization();
const { setConfig } = useConfig();
const [showWarningGUI, setShowWarningGUI] = useState(false);
const [showWarningServer, setShowWarningServer] = useState(false);
const [showWarningAll, setShowWarningAll] = useState(false);
const { sendRPCPacket } = useWebsocketAPI();
const openConfigFolder = async () => {
try {
const configPath = await appConfigDir();
await open('file://' + configPath);
} catch (err) {
error('Failed to open config folder:', err);
}
};
return (
<SettingsPageLayout>
<form className="flex flex-col gap-2 w-full">
<SettingsPagePaneLayout icon={<BugIcon></BugIcon>} id="advanced">
<>
<Typography variant="main-title">
{l10n.getString('settings-utils-advanced')}
</Typography>
<div className="grid gap-4">
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
<div>
<Typography bold>
{l10n.getString('settings-utils-advanced-reset-gui')}
</Typography>
<div className="flex flex-col">
<Typography color="secondary">
{l10n.getString(
'settings-utils-advanced-reset-gui-description'
)}
</Typography>
</div>
</div>
<div className="flex flex-col nsm:pt-2">
<Button
variant="secondary"
onClick={() => setShowWarningGUI(true)}
>
{l10n.getString('settings-utils-advanced-reset-gui-label')}
</Button>
<SettingsResetModal
accept={() => {
setConfig(guiDefaults());
setShowWarningGUI(false);
}}
onClose={() => setShowWarningGUI(false)}
isOpen={showWarningGUI}
variant="gui"
></SettingsResetModal>
</div>
</div>
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
<div>
<Typography bold>
{l10n.getString('settings-utils-advanced-reset-server')}
</Typography>
<div className="flex flex-col">
<Typography color="secondary">
{l10n.getString(
'settings-utils-advanced-reset-server-description'
)}
</Typography>
</div>
</div>
<div className="flex flex-col nsm:pt-2">
<Button
variant="secondary"
onClick={() => setShowWarningServer(true)}
>
{l10n.getString(
'settings-utils-advanced-reset-server-label'
)}
</Button>
<SettingsResetModal
accept={() => {
sendRPCPacket(
RpcMessage.SettingsResetRequest,
new SettingsResetRequestT()
);
setShowWarningServer(false);
}}
onClose={() => setShowWarningServer(false)}
isOpen={showWarningServer}
variant="server"
></SettingsResetModal>
</div>
</div>
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
<div>
<Typography bold>
{l10n.getString('settings-utils-advanced-reset-all')}
</Typography>
<div className="flex flex-col">
<Typography color="secondary">
{l10n.getString(
'settings-utils-advanced-reset-all-description'
)}
</Typography>
</div>
</div>
<div className="flex flex-col nsm:pt-2">
<Button
variant="secondary"
onClick={() => setShowWarningAll(true)}
>
{l10n.getString('settings-utils-advanced-reset-all-label')}
</Button>
<SettingsResetModal
accept={() => {
sendRPCPacket(
RpcMessage.SettingsResetRequest,
new SettingsResetRequestT()
);
setConfig(guiDefaults());
setShowWarningAll(false);
}}
onClose={() => setShowWarningAll(false)}
isOpen={showWarningAll}
variant="all"
></SettingsResetModal>
</div>
</div>
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
<div>
<Typography bold>
{l10n.getString('settings-utils-advanced-open_data')}
</Typography>
<div className="flex flex-col">
<Typography color="secondary">
{l10n.getString(
'settings-utils-advanced-open_data-description'
)}
</Typography>
</div>
</div>
<div className="flex flex-col nsm:pt-2">
<Button variant="secondary" onClick={openConfigFolder}>
{l10n.getString('settings-utils-advanced-open_data-label')}
</Button>
</div>
</div>
</div>
</>
</SettingsPagePaneLayout>
</form>
</SettingsPageLayout>
);
}
@@ -31,6 +31,8 @@ import {
SettingsPagePaneLayout,
} from '@/components/settings/SettingsPageLayout';
import { HandsWarningModal } from '@/components/settings/HandsWarningModal';
import { MagnetometerToggleSetting } from './MagnetometerToggleSetting';
import { DriftCompensationModal } from '@/components/settings/DriftCompensationModal';
interface SettingsForm {
trackers: {
@@ -52,6 +54,7 @@ interface SettingsForm {
};
driftCompensation: {
enabled: boolean;
prediction: boolean;
amount: number;
maxResets: number;
};
@@ -138,6 +141,7 @@ const defaultValues: SettingsForm = {
filtering: { amount: 0.1, type: FilteringType.NONE },
driftCompensation: {
enabled: false,
prediction: false,
amount: 0.1,
maxResets: 1,
},
@@ -282,6 +286,7 @@ export function GeneralSettings() {
const driftCompensation = new DriftCompensationSettingsT();
driftCompensation.enabled = values.driftCompensation.enabled;
driftCompensation.prediction = values.driftCompensation.prediction;
driftCompensation.amount = values.driftCompensation.amount;
driftCompensation.maxResets = values.driftCompensation.maxResets;
settings.driftCompensation = driftCompensation;
@@ -435,6 +440,8 @@ export function GeneralSettings() {
// }
// }, [state]);
const [showDriftCompWarning, setShowDriftCompWarning] = useState(false);
return (
<SettingsPageLayout>
<HandsWarningModal
@@ -697,7 +704,51 @@ export function GeneralSettings() {
label={l10n.getString(
'settings-general-tracker_mechanics-drift_compensation-enabled-label'
)}
onClick={() => {
if (getValues('driftCompensation.enabled')) {
return;
}
setShowDriftCompWarning(true);
}}
/>
<div className="flex flex-col pt-2 pb-4"></div>
<Typography bold>
{l10n.getString(
'settings-general-tracker_mechanics-drift_compensation-prediction'
)}
</Typography>
<div className="flex flex-col pt-2 pb-4">
{l10n
.getString(
'settings-general-tracker_mechanics-drift_compensation-prediction-description'
)
.split('\n')
.map((line, i) => (
<Typography color="secondary" key={i}>
{line}
</Typography>
))}
</div>
<CheckBox
variant="toggle"
outlined
control={control}
name="driftCompensation.prediction"
label={l10n.getString(
'settings-general-tracker_mechanics-drift_compensation-prediction-label'
)}
/>
<DriftCompensationModal
accept={() => {
setShowDriftCompWarning(false);
}}
onClose={() => {
setShowDriftCompWarning(false);
setValue('driftCompensation.enabled', false);
}}
isOpen={showDriftCompWarning}
></DriftCompensationModal>
<div className="flex gap-5 pt-5 md:flex-row flex-col">
<NumberSelector
control={control}
@@ -758,6 +809,10 @@ export function GeneralSettings() {
'settings-general-tracker_mechanics-save_mounting_reset-enabled-label'
)}
/>
<MagnetometerToggleSetting
settingType="general"
id="mechanics-magnetometer"
/>
</>
</SettingsPagePaneLayout>
<SettingsPagePaneLayout
@@ -16,13 +16,16 @@ import { LangSelector } from '@/components/commons/LangSelector';
import { BellIcon } from '@/components/commons/icon/BellIcon';
import { Range } from '@/components/commons/Range';
import { Dropdown } from '@/components/commons/Dropdown';
import { isTrayAvailable } from '@/utils/tauri';
interface InterfaceSettingsForm {
appearance: {
devmode: boolean;
theme: string;
showNavbarOnboarding: boolean;
textSize: number;
fonts: string;
decorations: boolean;
};
notifications: {
watchNewDevices: boolean;
@@ -43,8 +46,11 @@ export function InterfaceSettings() {
appearance: {
devmode: config?.debug ?? defaultConfig.debug,
theme: config?.theme ?? defaultConfig.theme,
showNavbarOnboarding:
config?.showNavbarOnboarding ?? defaultConfig.showNavbarOnboarding,
textSize: config?.textSize ?? defaultConfig.textSize,
fonts: config?.fonts.join(',') ?? defaultConfig.fonts.join(','),
decorations: config?.decorations ?? defaultConfig.decorations,
},
notifications: {
watchNewDevices:
@@ -69,11 +75,13 @@ export function InterfaceSettings() {
feedbackSound: values.notifications.feedbackSound,
feedbackSoundVolume: values.notifications.feedbackSoundVolume,
theme: values.appearance.theme,
showNavbarOnboarding: values.appearance.showNavbarOnboarding,
fonts: values.appearance.fonts.split(','),
textSize: values.appearance.textSize,
connectedTrackersWarning: values.notifications.connectedTrackersWarning,
useTray: values.notifications.useTray,
discordPresence: values.notifications.discordPresence,
decorations: values.appearance.decorations,
});
};
@@ -91,6 +99,7 @@ export function InterfaceSettings() {
<SettingsPageLayout>
<form
className="flex flex-col gap-2 w-full"
// Don't resize the font size for this page because you have access to font resizing on it and we don't want to break the layout just in case
style={
{
'--font-size': '12rem',
@@ -187,27 +196,31 @@ export function InterfaceSettings() {
/>
</div>
<Typography bold>
{l10n.getString('settings-general-interface-use_tray')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography color="secondary">
{l10n.getString(
'settings-general-interface-use_tray-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="notifications.useTray"
label={l10n.getString(
'settings-general-interface-use_tray-label'
)}
/>
</div>
{isTrayAvailable && (
<>
<Typography bold>
{l10n.getString('settings-general-interface-use_tray')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography color="secondary">
{l10n.getString(
'settings-general-interface-use_tray-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="notifications.useTray"
label={l10n.getString(
'settings-general-interface-use_tray-label'
)}
/>
</div>
</>
)}
<Typography bold>
{l10n.getString('settings-general-interface-discord_presence')}
@@ -264,6 +277,28 @@ export function InterfaceSettings() {
/>
</div>
<Typography bold>
{l10n.getString('settings-interface-appearance-decorations')}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography color="secondary">
{l10n.getString(
'settings-interface-appearance-decorations-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="appearance.decorations"
label={l10n.getString(
'settings-interface-appearance-decorations-label'
)}
/>
</div>
<div className="pb-4">
<Typography bold>
{l10n.getString('settings-general-interface-theme')}
@@ -317,9 +352,39 @@ export function InterfaceSettings() {
value={'trans'}
colors="!bg-trans-flag"
></ThemeSelector>
<ThemeSelector
control={control}
name="appearance.theme"
value={'asexual'}
colors="!bg-asexual-flag"
></ThemeSelector>
</div>
</div>
<Typography bold>
{l10n.getString(
'settings-general-interface-show-navbar-onboarding'
)}
</Typography>
<div className="flex flex-col pt-1 pb-2">
<Typography color="secondary">
{l10n.getString(
'settings-general-interface-show-navbar-onboarding-description'
)}
</Typography>
</div>
<div className="grid sm:grid-cols-2 pb-4">
<CheckBox
variant="toggle"
control={control}
outlined
name="appearance.showNavbarOnboarding"
label={l10n.getString(
'settings-general-interface-show-navbar-onboarding-label'
)}
/>
</div>
<Typography bold>
{l10n.getString('settings-interface-appearance-font')}
</Typography>
@@ -344,7 +409,7 @@ export function InterfaceSettings() {
'settings-interface-appearance-font-slime_font'
),
value: 'poppins',
fontName: 'poppins',
fontName: 'poppins, Noto Sans CJK',
},
{
label: 'OpenDyslexic',
@@ -0,0 +1,160 @@
import { CheckBox } from '@/components/commons/Checkbox';
import { Typography } from '@/components/commons/Typography';
import { useWebsocketAPI } from '@/hooks/websocket-api';
import { Localized, useLocalization } from '@fluent/react';
import { useCallback, useEffect, useRef, useState } from 'react';
import { useForm } from 'react-hook-form';
import {
ChangeMagToggleRequestT,
DeviceIdT,
MagToggleRequestT,
MagToggleResponseT,
RpcMessage,
TrackerIdT,
} from 'solarxr-protocol';
import { Link } from 'react-router-dom';
interface MagnetometerToggleForm {
magToggle: boolean;
}
export function MagnetometerToggleSetting({
trackerNum,
deviceId,
settingType,
id,
}: {
trackerNum?: number;
deviceId?: number;
settingType: 'general' | 'tracker';
id?: string;
}) {
const { l10n } = useLocalization();
const { sendRPCPacket, useRPCPacket } = useWebsocketAPI();
const originalValue = useRef<boolean | null>(null);
// used to disable the tracker specific toggle if false
const [globalToggle, setGlobalToggle] = useState(false);
const [waitingMag, setWaitingMag] = useState(false);
const { control, watch, handleSubmit, reset } =
useForm<MagnetometerToggleForm>({
defaultValues: { magToggle: settingType === 'tracker' },
});
const onSubmit = useCallback(
(values: MagnetometerToggleForm) => {
if (originalValue.current === values.magToggle) return;
setWaitingMag(true);
const req = new ChangeMagToggleRequestT();
if (trackerNum !== undefined) {
const id = new TrackerIdT(
deviceId ? new DeviceIdT(deviceId) : undefined,
trackerNum
);
req.trackerId = id;
}
req.enable = values.magToggle;
sendRPCPacket(RpcMessage.ChangeMagToggleRequest, req);
},
[trackerNum, deviceId]
);
useEffect(() => {
const subscription = watch(() => handleSubmit(onSubmit)());
return () => subscription.unsubscribe();
}, []);
useEffect(() => {
const req = new MagToggleRequestT();
if (trackerNum !== undefined) {
const id = new TrackerIdT(
deviceId ? new DeviceIdT(deviceId) : undefined,
trackerNum
);
req.trackerId = id;
sendRPCPacket(RpcMessage.MagToggleRequest, new MagToggleRequestT());
}
sendRPCPacket(RpcMessage.MagToggleRequest, req);
}, [trackerNum, deviceId]);
useRPCPacket(RpcMessage.MagToggleResponse, (mag: MagToggleResponseT) => {
if (trackerNum !== undefined && mag.trackerId?.trackerNum === undefined) {
setGlobalToggle(mag.enable);
}
if (
mag.trackerId?.trackerNum !== trackerNum ||
mag.trackerId?.deviceId?.id !== deviceId
) {
return;
}
originalValue.current = mag.enable;
setWaitingMag(false);
reset({ magToggle: mag.enable });
});
return settingType === 'general' ? (
<>
<div className="flex flex-col pt-5 pb-3" id={id}>
<Typography bold>
{l10n.getString(
'settings-general-tracker_mechanics-use_mag_on_all_trackers'
)}
</Typography>
<Localized
id="settings-general-tracker_mechanics-use_mag_on_all_trackers-description"
elems={{ b: <b></b> }}
>
<Typography
color="secondary"
whitespace="whitespace-pre-line"
></Typography>
</Localized>
</div>
<CheckBox
variant="toggle"
outlined
control={control}
loading={waitingMag}
name="magToggle"
label={l10n.getString(
'settings-general-tracker_mechanics-use_mag_on_all_trackers-label'
)}
/>
</>
) : (
<div className="flex flex-col gap-2 w-full mt-3" id={id}>
<Typography variant="section-title">
{l10n.getString('tracker-settings-use_mag')}
</Typography>
<Localized
id="tracker-settings-use_mag-description"
elems={{
b: <b></b>,
magSetting: (
<Link
to="/settings/trackers"
state={{ scrollTo: 'mechanics-magnetometer' }}
className="underline"
></Link>
),
}}
>
<Typography
color="secondary"
whitespace="whitespace-pre-line"
></Typography>
</Localized>
<div className="flex">
<CheckBox
variant="toggle"
outlined
loading={waitingMag}
disabled={!globalToggle}
name="magToggle"
control={control}
label={l10n.getString('tracker-settings-use_mag-label')}
/>
</div>
</div>
);
}
+2 -2
View File
@@ -78,7 +78,7 @@ function TrackerSmol({
<div className="flex flex-col justify-center items-center fill-background-10">
<BodyPartIcon bodyPart={tracker.info?.bodyPart}></BodyPartIcon>
</div>
<div className="flex flex-col flex-grow ">
<div className="flex flex-col flex-grow justify-center">
<Typography bold truncate>
{trackerName}
</Typography>
@@ -150,7 +150,7 @@ export function TrackerCard({
? {
boxShadow: `0px 0px ${Math.floor(velocity * 8)}px ${Math.floor(
velocity * 8
)}px #BB8AE5`,
)}px rgb(var(--accent-background-30))`,
}
: {}
}
@@ -86,7 +86,7 @@ export function TrackerPartCard({
style={{
boxShadow: `0px 0px ${globalVelocity * 3}px ${
globalVelocity * 3
}px #BB8AE5`,
}px rgb(var(--accent-background-30))`,
}}
>
{roleError && (
+39 -4
View File
@@ -9,7 +9,9 @@ import {
BodyPart,
ForgetDeviceRequestT,
ImuType,
MagnetometerStatus,
RpcMessage,
TrackerDataType,
} from 'solarxr-protocol';
import { useDebouncedEffect } from '@/hooks/timeout';
import { useTrackerFromId } from '@/hooks/tracker';
@@ -33,6 +35,7 @@ import { SingleTrackerBodyAssignmentMenu } from './SingleTrackerBodyAssignmentMe
import { TrackerCard } from './TrackerCard';
import { Quaternion } from 'three';
import { useAppContext } from '@/hooks/app';
import { MagnetometerToggleSetting } from '@/components/settings/pages/MagnetometerToggleSetting';
const rotationsLabels: [Quaternion, string][] = [
[rotationToQuatMap.BACK, 'tracker-rotation-back'],
@@ -258,6 +261,16 @@ export function TrackerSettingsPage() {
{tracker?.device?.hardwareInfo?.hardwareIdentifier || '--'}
</Typography>
</div>
<div className="flex justify-between">
<Typography color="secondary">
{l10n.getString('tracker-infos-data_support')}
</Typography>
<Typography>
{tracker?.tracker.info?.dataSupport
? TrackerDataType[tracker?.tracker.info?.dataSupport]
: '--'}
</Typography>
</div>
<div className="flex justify-between">
<Typography color="secondary">
{l10n.getString('tracker-infos-imu')}
@@ -276,6 +289,19 @@ export function TrackerSettingsPage() {
{tracker?.device?.hardwareInfo?.boardType || '--'}
</Typography>
</div>
<div className="flex justify-between">
<Typography color="secondary">
{l10n.getString('tracker-infos-magnetometer')}
</Typography>
<Typography>
{tracker?.tracker.info?.magnetometer === undefined
? '--'
: l10n.getString('tracker-infos-magnetometer-status-v1', {
status:
MagnetometerStatus[tracker.tracker.info.magnetometer],
})}
</Typography>
</div>
<div className="flex justify-between">
<Typography color="secondary">
{l10n.getString('tracker-infos-network_version')}
@@ -315,11 +341,11 @@ export function TrackerSettingsPage() {
></BodyPartIcon>
)}
{tracker?.tracker.info?.bodyPart === BodyPart.NONE && (
<WarningIcon className="text-yellow-300" />
<WarningIcon className="fill-status-warning" />
)}
<Typography
color={classNames({
'text-yellow-300':
'text-status-warning':
tracker?.tracker.info?.bodyPart === BodyPart.NONE,
})}
>
@@ -403,6 +429,15 @@ export function TrackerSettingsPage() {
</div>
</div>
)}
{tracker?.tracker.info?.isImu &&
tracker?.tracker.info?.magnetometer !==
MagnetometerStatus.NOT_SUPPORTED && (
<MagnetometerToggleSetting
settingType="tracker"
trackerNum={tracker.tracker.trackerId?.trackerNum}
deviceId={tracker.tracker.trackerId?.deviceId?.id}
/>
)}
<div className="flex flex-col gap-2 w-full mt-3">
<Typography variant="section-title">
{l10n.getString('tracker-settings-name_section')}
@@ -419,7 +454,7 @@ export function TrackerSettingsPage() {
control={control}
autocomplete="off"
rules={undefined}
label="Tracker name"
label={l10n.getString('tracker-settings-name_section-label')}
></Input>
</div>
{macAddress && (
@@ -432,7 +467,7 @@ export function TrackerSettingsPage() {
</Typography>
<Button
variant="secondary"
className="!bg-status-critical self-start"
className="!bg-status-critical self-start"
onClick={() => {
sendRPCPacket(
RpcMessage.ForgetDeviceRequest,
+1 -1
View File
@@ -137,7 +137,7 @@ export function RowContainer({
style={{
boxShadow: `0px 0px ${Math.floor(velocity * 8)}px ${Math.floor(
velocity * 8
)}px #BB8AE5`,
)}px rgb(var(--accent-background-30))`,
}}
className={classNames(
'h-[50px] flex flex-col justify-center px-3',
@@ -16,6 +16,16 @@ export interface DeveloperModeWidgetForm {
moreInfo: boolean;
}
export const defaultValues: DeveloperModeWidgetForm = {
highContrast: false,
preciseRotation: false,
fastDataFeed: false,
filterSlimesAndHMD: false,
sortByName: false,
rawSlimeRotation: false,
moreInfo: false,
};
export function DeveloperModeWidget() {
const { l10n } = useLocalization();
const { config, setConfig } = useConfig();
@@ -23,15 +33,7 @@ export function DeveloperModeWidget() {
const { reset, control, handleSubmit, watch } =
useForm<DeveloperModeWidgetForm>({
defaultValues: {
highContrast: false,
preciseRotation: false,
fastDataFeed: false,
filterSlimesAndHMD: false,
sortByName: false,
rawSlimeRotation: false,
moreInfo: false,
},
defaultValues: defaultValues,
});
useEffect(() => {
@@ -123,6 +123,15 @@ export function IMUVisualizerWidget({ tracker }: { tracker: TrackerDataT }) {
{l10n.getString('widget-imu_visualizer')}
</Typography>
{tracker.position && (
<div className="flex justify-between">
<Typography color="secondary">
{l10n.getString('widget-imu_visualizer-position')}
</Typography>
<Typography>{formatVector3(tracker.position, 2)}</Typography>
</div>
)}
<div className="flex justify-between">
<Typography color="secondary">
{l10n.getString('widget-imu_visualizer-rotation_raw')}
@@ -137,6 +146,17 @@ export function IMUVisualizerWidget({ tracker }: { tracker: TrackerDataT }) {
<Typography>{formatVector3(rotationIdent, 2)}</Typography>
</div>
{tracker.linearAcceleration && (
<div className="flex justify-between">
<Typography color="secondary">
{l10n.getString('widget-imu_visualizer-acceleration')}
</Typography>
<Typography>
{formatVector3(tracker.linearAcceleration, 1)}
</Typography>
</div>
)}
{!enabled && (
<Button
variant="secondary"
@@ -145,7 +165,7 @@ export function IMUVisualizerWidget({ tracker }: { tracker: TrackerDataT }) {
localStorage.setItem('modelPreview', 'true');
}}
>
{l10n.getString('widget-imu_visualizer-rotation_preview')}
{l10n.getString('widget-imu_visualizer-preview')}
</Button>
)}
{enabled && (
@@ -157,7 +177,7 @@ export function IMUVisualizerWidget({ tracker }: { tracker: TrackerDataT }) {
localStorage.setItem('modelPreview', 'false');
}}
>
{l10n.getString('widget-imu_visualizer-rotation_hide')}
{l10n.getString('widget-imu_visualizer-hide')}
</Button>
<ErrorBoundary
fallback={
+11 -5
View File
@@ -1,10 +1,11 @@
import { createContext, useContext, useMemo, useState } from 'react';
import { createContext, useContext, useState } from 'react';
import { DeveloperModeWidgetForm } from '@/components/widgets/DeveloperModeWidget';
import { error } from '@/utils/logging';
import { useDebouncedEffect } from './timeout';
import { Store } from '@tauri-apps/plugin-store';
import { createStore, Store } from '@tauri-apps/plugin-store';
import { useIsTauri } from './breakpoint';
import { waitUntil } from '@/utils/a11y';
import { isTauri } from '@tauri-apps/api/core';
export interface WindowConfig {
width: number;
@@ -37,6 +38,8 @@ export interface Config {
mirrorView: boolean;
assignMode: AssignMode;
discordPresence: boolean;
decorations: boolean;
showNavbarOnboarding: boolean;
}
export interface ConfigContext {
@@ -62,6 +65,8 @@ export const defaultConfig: Omit<Config, 'devSettings'> = {
mirrorView: true,
assignMode: AssignMode.Core,
discordPresence: false,
decorations: false,
showNavbarOnboarding: true,
};
interface CrossStorage {
@@ -69,13 +74,15 @@ interface CrossStorage {
get(key: string): Promise<string | null>;
}
const tauriStore: CrossStorage = new Store('gui-settings.dat');
const localStore: CrossStorage = {
get: async (key) => localStorage.getItem(key),
set: async (key, value) => localStorage.setItem(key, value),
};
const store: CrossStorage = isTauri()
? await createStore('gui-settings.dat', { autoSave: 100 as never })
: localStore;
function fallbackToDefaults(loadedConfig: any): Config {
return Object.assign({}, defaultConfig, loadedConfig);
}
@@ -84,7 +91,6 @@ export function useConfigProvider(): ConfigContext {
const [currConfig, set] = useState<Config | null>(null);
const [loading, setLoading] = useState(false);
const tauri = useIsTauri();
const store = useMemo(() => (tauri ? tauriStore : localStore), [tauri]);
useDebouncedEffect(
() => {
+11 -1
View File
@@ -1,11 +1,21 @@
import { useMemo } from 'react';
import { FlatDeviceTracker } from './app';
const IGNORED_BOARDS = new Set(['Sony Mocopi', 'Haritora']);
export function useIsRestCalibrationTrackers(
connectedTrackers: FlatDeviceTracker[]
): boolean {
const imuExists = useMemo(
() => connectedTrackers.some((tracker) => tracker.tracker.info?.isImu),
() =>
connectedTrackers.some(
(tracker) =>
tracker.tracker.info?.isImu &&
!(
tracker.device?.hardwareInfo?.boardType &&
IGNORED_BOARDS.has(tracker.device?.hardwareInfo?.boardType as string)
)
),
[connectedTrackers]
);
+2 -1
View File
@@ -12,6 +12,7 @@ import {
import { exists, readTextFile, BaseDirectory } from '@tauri-apps/plugin-fs';
import { error } from '@/utils/logging';
import { invoke } from '@tauri-apps/api/core';
import { isTrayAvailable } from '@/utils/tauri';
export const defaultNS = 'translation';
export const DEFAULT_LOCALE = 'en';
@@ -200,7 +201,7 @@ export function AppLocalizationProvider(props: AppLocalizationProviderProps) {
}, []);
useEffect(() => {
if (l10n === null) return;
if (l10n === null || !isTrayAvailable) return;
const newI18n: Record<string, string> = {};
TRAY_MENU_KEYS.forEach((key) => {
+26
View File
@@ -316,6 +316,32 @@ body {
--default-color: 0, 0, 0;
}
:root[data-theme='asexual'] {
--background-10: 255, 255, 255;
--background-20: 230, 230, 230;
--background-30: 200, 200, 200;
--background-40: 120, 120, 120;
--background-50: 90, 90, 90;
--background-60: 60, 60, 60;
--background-70: 30, 30, 30;
--background-80: 15, 15, 15;
--background-90: 0, 0, 0;
--accent-background-10: 230, 0, 230;
--accent-background-20: 210, 0, 210;
--accent-background-30: 150, 0, 150;
--accent-background-40: 130, 0, 130;
--accent-background-50: 70, 0, 70;
--success: 100, 230, 10;
--warning: 220, 200, 50;
--critical: 220, 40, 110;
--special: 230, 0, 230;
--window-icon-stroke: 200, 130, 200;
--default-color: 255, 255, 255;
}
#root {
height: 100%;
}
+166 -1
View File
@@ -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;
}
}
}
+8 -1
View File
@@ -1,4 +1,4 @@
import { isTauri } from '@tauri-apps/api/core';
import { invoke, isTauri } from '@tauri-apps/api/core';
import { type } from '@tauri-apps/plugin-os';
/**
@@ -10,3 +10,10 @@ export async function fetchResourceUrl(url: string) {
if (!isTauri() || type() !== 'linux') return url;
return URL.createObjectURL(await fetch(url).then((res) => res.blob()));
}
// FIXME: For some fucking reason, you can't top-level await on a react component file
// on Chromium on developments builds specifically -Uriel
export const AUTOBONE_VIDEO = await fetchResourceUrl('/videos/autobone.webm');
export const isTrayAvailable =
isTauri() && (await invoke<boolean>('is_tray_available'));
+8
View File
@@ -150,6 +150,12 @@ const colors = {
700: '#b3b3b3',
900: '#d8d8d8',
},
'asexual': {
100: '#000000',
200: '#A3A3A3',
300: '#FFFFFF',
400: '#800080',
},
};
const config = {
@@ -160,6 +166,7 @@ const config = {
smol: '525px',
mobile: { raw: 'not (min-width: 800px)' },
xs: '800px',
nsm: { raw: 'not (min-width: 900px)' },
sm: '900px',
md: '1100px',
'md-max': { raw: 'not (min-width: 1100px)' },
@@ -228,6 +235,7 @@ const config = {
dark: `linear-gradient(135deg, ${colors['dark-accent'][100]} 50%, ${colors['dark-background'][700]} 50% 100%)`,
light: `linear-gradient(135deg, ${colors['light-accent'][100]} 50%, ${colors['light-background'][700]} 50% 100%)`,
'trans-flag': `linear-gradient(135deg, ${colors['trans-blue'][800]} 40%, ${colors['trans-blue'][700]} 40% 70%, ${colors['trans-blue'][600]} 70% 100%)`,
'asexual-flag': `linear-gradient(135deg, ${colors['asexual'][100]} 30%, ${colors['asexual'][200]} 30% 50%, ${colors['asexual'][300]} 50% 70%, ${colors['asexual'][400]} 70% 100%)`,
},
},
data: {
+7
View File
@@ -57,4 +57,11 @@ export default defineConfig({
'@': path.resolve(__dirname, 'src'),
},
},
css: {
preprocessorOptions: {
scss: {
api: 'modern',
},
},
},
});
+4 -4
View File
@@ -2,7 +2,7 @@
"name": "slimevr-ui",
"version": "0.5.1",
"private": true,
"packageManager": "pnpm@9.4.0",
"packageManager": "pnpm@9.12.2",
"workspaces": [
"solarxr-protocol",
"gui"
@@ -13,11 +13,11 @@
"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": {
"husky": "^9.0.11",
"lint-staged": "^15.2.7"
"husky": "^9.1.6",
"lint-staged": "^15.2.10"
}
}
+972 -912
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.79"
channel = "1.81"
profile = "default"
components = ["rustc", "cargo", "clippy", "rustfmt", "rust-analyzer", "rust-src"]
+4
View File
@@ -19,3 +19,7 @@ Load AutoBone Recordings
*.log.lck
*.log
logs/
android/release
android/debug
+23 -17
View File
@@ -5,6 +5,7 @@
* For more details take a look at the Java Libraries chapter in the Gradle
* User Manual available at https://docs.gradle.org/6.3/userguide/java_library_plugin.html
*/
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
@@ -12,7 +13,7 @@ plugins {
kotlin("plugin.serialization")
id("com.github.gmazzo.buildconfig")
id("com.android.application") version "8.0.2"
id("com.android.application") version "8.6.1"
id("org.ajoberstar.grgit")
}
@@ -39,8 +40,10 @@ tasks.preBuild {
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "17"
kotlinOptions.freeCompilerArgs += "-Xvalue-classes"
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
freeCompilerArgs.set(listOf("-Xvalue-classes"))
}
}
// Set compiler to use UTF-8
@@ -65,21 +68,21 @@ allprojects {
dependencies {
implementation(project(":server:core"))
implementation("commons-cli:commons-cli:1.5.0")
implementation("org.apache.commons:commons-lang3:3.12.0")
implementation("commons-cli:commons-cli:1.8.0")
implementation("org.apache.commons:commons-lang3:3.15.0")
// Android stuff
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.core:core-ktx:1.10.1")
implementation("com.google.android.material:material:1.9.0")
implementation("androidx.appcompat:appcompat:1.7.0")
implementation("androidx.core:core-ktx:1.13.1")
implementation("com.google.android.material:material:1.12.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
// For hosting web GUI
implementation("io.ktor:ktor-server-core:2.3.0")
implementation("io.ktor:ktor-server-netty:2.3.0")
implementation("io.ktor:ktor-server-caching-headers:2.3.0")
implementation("io.ktor:ktor-server-core:2.3.12")
implementation("io.ktor:ktor-server-netty:2.3.10")
implementation("io.ktor:ktor-server-caching-headers:2.3.12")
// Serial
implementation("com.github.mik3y:usb-serial-for-android:3.7.0")
@@ -99,7 +102,7 @@ android {
compile your app. This means your app can use the API features included in
this API level and lower. */
compileSdk = 33
compileSdk = 35
/* The defaultConfig block encapsulates default settings and entries for all
build variants and can override some attributes in main/AndroidManifest.xml
@@ -119,13 +122,16 @@ android {
minSdk = 26
// Specifies the API level used to test the app.
targetSdk = 33
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"
}
+9 -13
View File
@@ -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.**
+3 -1
View File
@@ -6,6 +6,7 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
<application
android:allowBackup="true"
@@ -16,7 +17,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.SlimeVR"
tools:targetApi="33"
tools:targetApi="35"
android:usesCleartextTraffic="true">
<activity
android:name=".MainActivity"
@@ -31,6 +32,7 @@
<service
android:name=".ForegroundService"
android:enabled="true"
android:foregroundServiceType="connectedDevice"
android:exported="false" />
</application>
@@ -1,12 +1,15 @@
package dev.slimevr.android
import android.app.Notification
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.Service
import android.app.*
import android.content.Intent
import android.content.pm.ServiceInfo
import android.os.Build
import android.os.IBinder
import androidx.core.app.NotificationChannelCompat
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import androidx.core.app.ServiceCompat
import io.eiren.util.logging.LogManager
/**
* ForegroundService helps to keep the SlimeVR Server on Android from being killed.
@@ -35,9 +38,26 @@ class ForegroundService : Service() {
}
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
val notification = createNotification()
startForeground(NOTIFICATION_ID, notification)
try {
val notification = createNotification()
ServiceCompat.startForeground(
this,
NOTIFICATION_ID, // Cannot be 0
notification,
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE
} else {
0
},
)
} catch (e: Exception) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S &&
e is ForegroundServiceStartNotAllowedException
) {
LogManager.severe("Tried to start foreground service when not allowed:", e)
}
// ...
}
/*
* Currently being a foreground process should be enough to keep the server running.
* If it turns out to not be enough then the next option would be to return sticky here
@@ -51,13 +71,12 @@ class ForegroundService : Service() {
override fun onBind(intent: Intent?): IBinder? = null
private fun createNotificationChannel() {
val serviceChannel = NotificationChannel(
CHANNEL_ID,
"SlimeVR Foreground Service Channel",
NotificationManager.IMPORTANCE_LOW,
)
val manager = getSystemService(NotificationManager::class.java)
manager.createNotificationChannel(serviceChannel)
val serviceChannel = NotificationChannelCompat.Builder(CHANNEL_ID, NotificationManager.IMPORTANCE_LOW)
.setName("SlimeVR Foreground Service Channel")
.build()
NotificationManagerCompat
.from(this)
.createNotificationChannel(serviceChannel)
}
private fun createNotification(): Notification = NotificationCompat.Builder(this, CHANNEL_ID)
+1 -1
View File
@@ -37,7 +37,7 @@ configure<com.diffplug.gradle.spotless.SpotlessExtension> {
"java.util.*,kotlin.math.*,dev.slimevr.autobone.errors.*" +
",io.github.axisangles.ktmath.*,kotlinx.atomicfu.*" +
",dev.slimevr.tracking.trackers.*,dev.slimevr.desktop.platform.ProtobufMessages.*" +
",com.illposed.osc.*",
",solarxr_protocol.rpc.*,kotlinx.coroutines.*,com.illposed.osc.*,android.app.*",
"ij_kotlin_allow_trailing_comma" to true,
)
val ktlintVersion = "1.2.1"
+10 -6
View File
@@ -5,6 +5,7 @@
* For more details take a look at the Java Libraries chapter in the Gradle
* User Manual available at https://docs.gradle.org/6.3/userguide/java_library_plugin.html
*/
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
@@ -25,8 +26,10 @@ java {
}
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "17"
kotlinOptions.freeCompilerArgs += "-Xvalue-classes"
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
freeCompilerArgs.set(listOf("-Xvalue-classes"))
}
}
// Set compiler to use UTF-8
@@ -60,26 +63,27 @@ dependencies {
// This dependency is used internally,
// and not exposed to consumers on their own compile classpath.
implementation("com.google.flatbuffers:flatbuffers-java:22.10.26")
implementation("commons-cli:commons-cli:1.5.0")
implementation("commons-cli:commons-cli:1.8.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.1")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.1")
implementation("com.github.jonpeterson:jackson-module-model-versioning:1.2.2")
implementation("org.apache.commons:commons-math3:3.6.1")
implementation("org.apache.commons:commons-lang3:3.12.0")
implementation("org.apache.commons:commons-lang3:3.15.0")
implementation("org.apache.commons:commons-collections4:4.4")
implementation("com.illposed.osc:javaosc-core:0.8")
implementation("org.java-websocket:Java-WebSocket:1.+")
implementation("com.melloware:jintellitype:1.+")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
// Jitpack
implementation("com.github.SlimeVR:oscquery-kt:566a0cba58")
testImplementation(kotlin("test"))
// Use JUnit test framework
testImplementation(platform("org.junit:junit-bom:5.9.0"))
testImplementation(platform("org.junit:junit-bom:5.10.3"))
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.junit.platform:junit-platform-launcher")
}
@@ -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<out Bridge?>): Boolean {
@@ -167,7 +167,7 @@ class AutoBone(server: VRServer) {
// Otherwise if there is no skeleton available, attempt to get the
// max HMD height from the recording
val hmdHeight = frames.maxHmdHeight
if (hmdHeight <= 0.4f) {
if (hmdHeight <= MIN_HEIGHT) {
LogManager
.warning(
"[AutoBone] Max headset height detected (Value seems too low, did you not stand up straight while measuring?): $hmdHeight",
@@ -195,6 +195,9 @@ class AutoBone(server: VRServer) {
config: AutoBoneConfig = globalConfig,
epochCallback: Consumer<Epoch>? = null,
): AutoBoneResults {
check(frames.frameHolders.isNotEmpty()) { "Recording has no trackers." }
check(frames.maxFrameCount > 0) { "Recording has no frames." }
// Load current values for adjustable configs
loadConfigValues()
@@ -209,6 +212,7 @@ class AutoBone(server: VRServer) {
} else {
targetHmdHeight / BodyProportionError.eyeHeightToHeightRatio
}
check(targetHmdHeight > MIN_HEIGHT) { "Configured height ($targetHmdHeight) is too small (<= $MIN_HEIGHT)." }
// Set up the current state, making all required players and setting up the
// skeletons appropriately
@@ -316,6 +320,9 @@ class AutoBone(server: VRServer) {
.info(
"[AutoBone] Target height: ${trainingStep.targetHmdHeight}, Final height: $estimatedHeight",
)
if (trainingStep.errorStats.mean > config.maxFinalError) {
throw AutoBoneException("The final epoch error value (${trainingStep.errorStats.mean}) has exceeded the maximum allowed value (${config.maxFinalError}).")
}
return AutoBoneResults(
estimatedHeight,
@@ -746,6 +753,7 @@ class AutoBone(server: VRServer) {
}
companion object {
const val MIN_HEIGHT = 0.4f
const val AUTOBONE_FOLDER = "AutoBone Recordings"
const val LOADAUTOBONE_FOLDER = "Load AutoBone Recordings"
@@ -189,8 +189,8 @@ class AutoBoneHandler(private val server: VRServer) {
if (framesFuture != null) {
announceProcessStatus(AutoBoneProcessType.SAVE, "Waiting for recording...")
val frames = framesFuture.get()
check(frames.frameHolders.isNotEmpty()) { "Recording has no trackers" }
check(frames.maxFrameCount > 0) { "Recording has no frames" }
check(frames.frameHolders.isNotEmpty()) { "Recording has no trackers." }
check(frames.maxFrameCount > 0) { "Recording has no frames." }
announceProcessStatus(AutoBoneProcessType.SAVE, "Saving recording...")
autoBone.saveRecording(frames)
announceProcessStatus(
@@ -243,8 +243,6 @@ class AutoBoneHandler(private val server: VRServer) {
if (framesFuture != null) {
announceProcessStatus(AutoBoneProcessType.PROCESS, "Waiting for recording...")
val frames = framesFuture.get()
check(frames.frameHolders.isNotEmpty()) { "Recording has no trackers" }
check(frames.maxFrameCount > 0) { "Recording has no frames" }
frameRecordings.add(Pair.of("<Recording>", frames))
} else {
announceProcessStatus(
@@ -26,4 +26,5 @@ class AutoBoneConfig {
var useSkeletonHeight = false
var randSeed = 4L
var useFrameFiltering = false
var maxFinalError = 0.03f
}
@@ -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,6 +117,32 @@ public class ConfigManager {
// Serialize config
try {
// delete accidental folder caused by PR
// https://github.com/SlimeVR/SlimeVR-Server/pull/1176
var cfgFileMaybeFolder = cfgFile.toFile();
if (cfgFileMaybeFolder.isDirectory()) {
try (Stream<Path> 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;
}
om.writeValue(tmpCfgFile.toFile(), this.vrConfig);
} catch (IOException e) {
LogManager.severe("Unable to write serialized config to \"" + tmpCfgFile + "\"", e);
@@ -133,6 +161,11 @@ public class ConfigManager {
}
}
public void resetConfig() {
this.vrConfig = new VRConfig();
saveConfig();
}
public VRConfig getVrConfig() {
return vrConfig;
}
@@ -7,6 +7,9 @@ class DriftCompensationConfig {
// Is drift compensation enabled
var enabled = false
// Is drift prediction enabled
var prediction = false
// Amount of drift compensation applied
var amount = 0.8f
@@ -1,10 +0,0 @@
package dev.slimevr.config;
public class ServerConfig {
private int trackerPort = 6969;
public int getTrackerPort() {
return trackerPort;
}
}
@@ -0,0 +1,65 @@
package dev.slimevr.config
import dev.slimevr.VRServer
import dev.slimevr.tracking.trackers.udp.MagnetometerStatus
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.sync.Mutex
class ServerConfig {
val trackerPort: Int = 6969
var useMagnetometerOnAllTrackers: Boolean = false
private set
private val magMutex = Mutex()
suspend fun defineMagOnAllTrackers(state: Boolean) = coroutineScope {
magMutex.lock()
try {
if (useMagnetometerOnAllTrackers == state) return@coroutineScope
VRServer.instance.deviceManager.devices.filter { it.magSupport }.map {
async {
// Not using 255 as it sometimes could make one of the sensors go into
// error mode (if there is more than one sensor inside the device)
if (!state) {
val trackers = it.trackers.filterValues {
it.magStatus != MagnetometerStatus.NOT_SUPPORTED
}
// if(trackers.size == it.trackers.size) {
// it.setMag(false)
// } else {
trackers.map { (_, t) ->
async { it.setMag(false, t.trackerNum) }
}.awaitAll()
// }
return@async
}
// val every = it.trackers.all { (_, t) -> t.config.shouldHaveMagEnabled == true
// && t.magStatus != MagnetometerStatus.NOT_SUPPORTED }
// if (every) {
// it.setMag(true)
// return@async
// }
it.trackers.filterValues {
it.config.shouldHaveMagEnabled == true &&
it.magStatus != MagnetometerStatus.NOT_SUPPORTED
}
.map { (_, t) ->
async {
// FIXME: Tracker gets restarted after each setMag, what will happen for devices with 3 trackers?
it.setMag(true, t.trackerNum)
}
}.awaitAll()
}
}.awaitAll()
useMagnetometerOnAllTrackers = state
} finally {
magMutex.unlock()
}
}
}
@@ -2,6 +2,7 @@ package dev.slimevr.config
import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.node.JsonNodeFactory
import dev.slimevr.VRServer
import dev.slimevr.tracking.trackers.Tracker
import io.github.axisangles.ktmath.ObjectQuaternion
@@ -16,12 +17,18 @@ class TrackerConfig {
var mountingResetOrientation: ObjectQuaternion? = null
var allowDriftCompensation: Boolean? = null
/**
* Only checked if [ServerConfig.useMagnetometerOnAllTrackers] enabled
*/
var shouldHaveMagEnabled: Boolean? = null
constructor()
constructor(tracker: Tracker) {
this.designation = if (tracker.trackerPosition != null) tracker.trackerPosition!!.designation else null
this.customName = tracker.customName
allowDriftCompensation = tracker.isImu()
shouldHaveMagEnabled = tracker.isImu()
}
companion object {
@@ -37,3 +44,6 @@ class TrackerConfig {
}
}
}
val Tracker.config: TrackerConfig
get() = VRServer.instance.configManager.vrConfig.getTracker(this)
@@ -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,25 +18,25 @@ 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<Quaternion>
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.
// GUI should clamp it from 0.01 (1%) or 0.1 (10%)
// to 1 (100%).
amount = amount.coerceAtLeast(0f)
if (type === TrackerFilters.SMOOTHING) {
if (type == TrackerFilters.SMOOTHING) {
// lower smoothFactor = more smoothing
smoothFactor = SMOOTH_MULTIPLIER * (1 - amount.coerceAtMost(1f)) + SMOOTH_MIN
// Totally a hack
@@ -43,14 +44,12 @@ class QuaternionMovingAverage(
smoothFactor /= amount
}
}
if (type === TrackerFilters.PREDICTION) {
if (type == TrackerFilters.PREDICTION) {
// higher predictFactor = more prediction
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,24 +89,35 @@ 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)
}
}
@Synchronized
fun addQuaternion(q: Quaternion) {
if (type === TrackerFilters.PREDICTION) {
if (type == TrackerFilters.PREDICTION) {
if (rotBuffer.size == rotBuffer.capacity()) {
rotBuffer.removeLast()
}
// 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
}
}
@@ -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
}
}
}
@@ -102,13 +195,15 @@ class UnityArmature(localRot: Boolean) {
fun setLocalRotationForBone(unityBone: UnityBone, localRot: Quaternion) {
val node = getHeadNodeOfBone(unityBone)
if (node != null) {
if (unityBone === UnityBone.HIPS) {
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
}
}
}
@@ -117,7 +212,7 @@ class UnityArmature(localRot: Boolean) {
fun getGlobalTranslationForBone(unityBone: UnityBone): Vector3 {
val node = getHeadNodeOfBone(unityBone)
return if (node != null) {
if (unityBone === UnityBone.HIPS) {
if (unityBone == UnityBone.HIPS) {
val hipsAverage = (
leftHipNode.worldTransform.translation +
rightHipNode.worldTransform.translation
@@ -134,7 +229,7 @@ class UnityArmature(localRot: Boolean) {
fun getLocalTranslationForBone(unityBone: UnityBone): Vector3 {
val node = getHeadNodeOfBone(unityBone)
return if (node != null) {
if (unityBone === UnityBone.HIPS) {
if (unityBone == UnityBone.HIPS) {
val hipsAverage = (
leftHipNode.worldTransform.translation +
rightHipNode.worldTransform.translation
@@ -160,7 +255,7 @@ class UnityArmature(localRot: Boolean) {
fun getLocalRotationForBone(unityBone: UnityBone): Quaternion {
val node = getHeadNodeOfBone(unityBone)
return if (node != null) {
if (unityBone === UnityBone.HIPS) {
if (unityBone == UnityBone.HIPS) {
node.worldTransform.rotation * rootRotation
} else {
node.parent!!.worldTransform.rotation.inv() * node.worldTransform.rotation
@@ -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
}
}
@@ -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
}
}
@@ -169,7 +169,7 @@ class VMCHandler(
try {
val addr = InetAddress.getByName(ip)
oscSender = OSCPortOut(InetSocketAddress(addr, portOut))
if ((lastPortOut != portOut && lastAddress !== addr) || !wasConnected) {
if ((lastPortOut != portOut && lastAddress != addr) || !wasConnected) {
LogManager
.info(
"[VMCHandler] Sending to port $portOut at address $ip",
@@ -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) {
@@ -368,7 +368,7 @@ class VMCHandler(
// Anchor from head
outputUnityArmature?.let { unityArmature ->
// Scale the SlimeVR head position with the VRM model
val slimevrScaledHeadPos = humanPoseManager.getBone(BoneType.HEAD).getPosition() *
val slimevrScaledHeadPos = humanPoseManager.getBone(BoneType.HEAD).getTailPosition() *
(vrmHeight / humanPoseManager.userHeightFromConfig)
// Get the VRM head and hip positions
@@ -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
Loaded 100 of 136 files, more files were not shown because too many files have changed in this diff. Show more