Skip to content

Commit

Permalink
Updated flip logic, added stub position prediction filter
Browse files Browse the repository at this point in the history
  • Loading branch information
KimihikoAkayasaki committed Oct 14, 2022
1 parent 1e2f481 commit 46ae29e
Show file tree
Hide file tree
Showing 12 changed files with 333 additions and 225 deletions.
20 changes: 12 additions & 8 deletions Amethyst/Assets/Strings/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,15 @@
"/SettingsPage/Captions/TrackersRestart/Line2": "benötigt einen Neustart von SteamVR und Amethyst.",
"/SettingsPage/Elements/ExtFlipCalibration/ToolTip": "Kalibrierung",
"/SettingsPage/Elements/FlipToggle/ToolTip": "Durch Deaktivieren wird das Tracking gestoppt, wenn man sich umdreht.",
"/SettingsPage/Filters/Orientation/Device": "Vom Gerät abgeleitete Rotation",
"/SettingsPage/Filters/Orientation/HMD": "Headset verfolgen",
"/SettingsPage/Filters/Orientation/MathBased": "Softwareberechnete Rotation",
"/SettingsPage/Filters/Orientation/Off": "Rotation deaktivieren",
"/SettingsPage/Filters/Orientation/Device": "Default Orientation",
"/SettingsPage/Filters/Orientation/HMD": "Follow VR Headset",
"/SettingsPage/Filters/Orientation/MathBased": "Ankle-based Orientation",
"/SettingsPage/Filters/Orientation/MathBasedV2": "Leg-based Orientation",
"/SettingsPage/Filters/Orientation/Off": "Disable Orientation",
"/SettingsPage/Filters/Position/Kalman": "Erweiterter Kalman-Filter",
"/SettingsPage/Filters/Position/LERP": "Lineare Interpolation",
"/SettingsPage/Filters/Position/LowPass": "Tiefpass (Low Pass) Filter",
"/SettingsPage/Filters/Position/Prediction": "Adaptive Prediction",
"/SettingsPage/Filters/Position/Off": "Filter deaktivieren",
"/SettingsPage/Filters/Managed": "Managed by '{0}'",
"/SettingsPage/ReManifest/Error/NotFound": "Amethysts VR-Manifest konnte nicht installiert werden.\nÜberprüfe ob es im Stammverzeichnis (.exe) vorhanden ist.",
Expand Down Expand Up @@ -161,12 +163,14 @@
"/SettingsLearn/Captions/Orientation/Explanations/Default": "Diese Einstellung kann für einige Benutzer auf Xbox One Kinect instabil sein.\nIn diesem Falle, versuche es noch einmal mit der Softwareberechneten Rotation.\nDies ist die Gelenkausrichtung, die vom Kinect SDK basierend auf der Position jedes Gelenks in der Kette approximiert wird.\nStell dir das soweit vor, dass man auf jedes Glied des Körpers Pfeile anknüpft, die auf die Extremitäten zeigen.\nBei Fußtrackern unterscheidet sich das Verhalten zwischen Kinect-Modellen.\nAuf Xbox One basiert sich die Drehung auf der Fußspitze, was bedeutet, dass sich Ihre Füße drehen können.\nAuf der Xbox 360 basiert die Drehung allein auf dem Knöchel, was bedeutet, dass es keine Fußdrehung gibt.",
"/SettingsLearn/Captions/Orientation/Explanations/HMD": "Die Tracker folgen der Richtung, in die das Headset auf der Y-Achse zeigt. Die Tracker drehen sich aber nicht auf den anderen beiden Achsen.",
"/SettingsLearn/Captions/Orientation/Explanations/MathBased": "Diese Option ist nur für Fußtracker verfügbar.\nDie Richtung der Füße wird aus dem Winkel zwischen Knöchel und Fußspitze berechnet.\nDie Reichweite wird auf 50% reduziert um Jitter (Flimmern) zu vermeiden. Dies ermöglicht die Drehung der Füße auf der Xbox 360 Kinect.",
"/SettingsLearn/Captions/Orientation/Explanations/MathBasedV2": "This option is only available for feet trackers.\nThe orientation of your feet is calculated from the joints' poses of your whole leg and waist.\nThere's some additions to make it more responsive. This allows for foot rotation on Xbox One Kinect.",
"/SettingsLearn/Captions/Orientation/Explanations/None": "Die Tracker drehen sich nur, wenn die Tracker-Spiegelung (Flip) durch Wegschauen aktiviert wird.",
"/SettingsLearn/Captions/Orientation/Introduction": "Alle Rotationseinstellungen werden weiterhin von der Tracker-Spiegelung (Skelett-Flip) beeinflusst, wenn es aktiviert ist.",
"/SettingsLearn/Captions/Orientation/Names/Default": "- Vom Gerät abgeleitete Rotation",
"/SettingsLearn/Captions/Orientation/Names/HMD": "- Headset folgen",
"/SettingsLearn/Captions/Orientation/Names/MathBased": "- Softwareberechnete Rotation",
"/SettingsLearn/Captions/Orientation/Names/None": "- Rotation deaktivieren",
"/SettingsLearn/Captions/Orientation/Names/Default": "- Default Orientation",
"/SettingsLearn/Captions/Orientation/Names/HMD": "- Follow VR Headset",
"/SettingsLearn/Captions/Orientation/Names/MathBased": "- Ankle-based Orientation",
"/SettingsLearn/Captions/Orientation/Names/MathBasedV2": "- Leg-based Orientation",
"/SettingsLearn/Captions/Orientation/Names/None": "- Disable Orientation",
"/SettingsLearn/Captions/TrackerConfig": "Amethyst unterstützt bis zu 7 Basistracker. Zusätzliche können über das Zahnradsymbol umgeschaltet werden.\nJeder Tracker oder Reihe von Trackern enthält Einstellungen zum Anpassen der Rotation und Filterung für einzelne Tracker.\nAuf diese Weise kann man beispielsweise einen starken Filter für Füße und Taille einstellen, wenn man beabsichtigt, viel zu sitzen und\ngleichzeitig eine schnellere Einstellung für die Ellbogen verwenden, damit die Tracker die Hände besser folgen können.",
"/SettingsLearn/Captions/TrackerConfigNote": "Notiz: Einige dieser Einstellungen sind nur bei Verwendung von Kinect relevant.",
"/SettingsLearn/Titles/FilterSettings": "Filtereinstellungen:",
Expand Down
26 changes: 15 additions & 11 deletions Amethyst/Assets/Strings/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"/SettingsPage/Captions/ExtFlipStatus/Disabled": "Disabled!",
"/SettingsPage/Captions/ExtFlipStatus/NoTracker": "No external waist tracker or override detected!",
"/SettingsPage/Captions/FaceTheKinect": "Face the Kinect!",
"/SettingsPage/Captions/Filters/Orientation": "Rotation Tracking:",
"/SettingsPage/Captions/Filters/Orientation": "Orientation Tracking:",
"/SettingsPage/Captions/Filters/Position": "Position Tracking Filter:",
"/SettingsPage/Captions/SkeletonFlip": "Mirror trackers when turning away from the Kinect",
"/SettingsPage/Captions/Sounds": "Enable app sounds",
Expand All @@ -116,13 +116,15 @@
"/SettingsPage/Captions/TrackersRestart/Line2": "and Amethyst for changes to take effect.",
"/SettingsPage/Elements/ExtFlipCalibration/ToolTip": "Calibration",
"/SettingsPage/Elements/FlipToggle/ToolTip": "Disabling will stop tracking\nfrom flipping when you turn around.",
"/SettingsPage/Filters/Orientation/Device": "Device-inferred Rotation",
"/SettingsPage/Filters/Orientation/HMD": "Follow Headset",
"/SettingsPage/Filters/Orientation/MathBased": "Software-calculated Rotation",
"/SettingsPage/Filters/Orientation/Off": "Disable Rotation",
"/SettingsPage/Filters/Orientation/Device": "Default Orientation",
"/SettingsPage/Filters/Orientation/HMD": "Follow VR Headset",
"/SettingsPage/Filters/Orientation/MathBased": "Ankle-based Orientation",
"/SettingsPage/Filters/Orientation/MathBasedV2": "Leg-based Orientation",
"/SettingsPage/Filters/Orientation/Off": "Disable Orientation",
"/SettingsPage/Filters/Position/Kalman": "Extended Kalman Filter",
"/SettingsPage/Filters/Position/LERP": "Linear Interpolation",
"/SettingsPage/Filters/Position/LowPass": "Low Pass Filter",
"/SettingsPage/Filters/Position/Prediction": "Adaptive Prediction",
"/SettingsPage/Filters/Position/Off": "Disable Filter",
"/SettingsPage/Filters/Managed": "Managed by '{0}'",
"/SettingsPage/ReManifest/Error/NotFound": "Amethyst vr manifest couldn't be installed.\nPlease check if it exists at the root (.exe) path.",
Expand Down Expand Up @@ -161,12 +163,14 @@
"/SettingsLearn/Captions/Orientation/Explanations/Default": "This setting can be unstable for some users on Xbox One Kinect, try Software-Calculated Rotation\nif that's the case. This is the joint orientation guessed by the Kinect SDK based on the position\nof each joint in the chain. Imagine if you were to stick arrows on every limb of your body pointing\ntowards your extremities. For foot trackers, behavior differs between Kinect models.\nOn Xbox One, the rotation is based on the tip of the foot, which means that your feet can turn.\nOn Xbox 360, the rotation is based on the ankle alone, meaning there is no foot rotation.",
"/SettingsLearn/Captions/Orientation/Explanations/HMD": "Trackers will follow the direction the headset is facing in the Y axis (turning around)\nbut won't rotate on the other two axes.",
"/SettingsLearn/Captions/Orientation/Explanations/MathBased": "This option is only available for feet trackers.\nThe direction of your feet is calculated from the angle between the ankle and the tip of the foot.\nAnd the range is reduced to 50% to avoid jitter. This allows for foot rotation on Xbox 360 Kinect.",
"/SettingsLearn/Captions/Orientation/Explanations/MathBasedV2": "This option is only available for feet trackers.\nThe orientation of your feet is calculated from the joints' poses of your whole leg and waist.\nThere's some additions to make it more responsive. This allows for foot rotation on Xbox One Kinect.",
"/SettingsLearn/Captions/Orientation/Explanations/None": "Trackers don't rotate at all, except for when tracker mirroring (flip) is engaged by facing away.",
"/SettingsLearn/Captions/Orientation/Introduction": "All rotation settings are still affected by tracker mirroring (skeleton flip) when it is enabled.",
"/SettingsLearn/Captions/Orientation/Names/Default": "- Device-inferred Rotation",
"/SettingsLearn/Captions/Orientation/Names/HMD": "- Follow Headset",
"/SettingsLearn/Captions/Orientation/Names/MathBased": "- Software-Calculated Rotation",
"/SettingsLearn/Captions/Orientation/Names/None": "- Disable Rotation",
"/SettingsLearn/Captions/Orientation/Names/Default": "- Default Orientation",
"/SettingsLearn/Captions/Orientation/Names/HMD": "- Follow VR Headset",
"/SettingsLearn/Captions/Orientation/Names/MathBased": "- Ankle-based Orientation",
"/SettingsLearn/Captions/Orientation/Names/MathBasedV2": "- Leg-based Orientation",
"/SettingsLearn/Captions/Orientation/Names/None": "- Disable Orientation",
"/SettingsLearn/Captions/TrackerConfig": "Amethyst supports up to 7 base trackers. Additional ones can be toggled from the gear icon.\nEach tracker or set of trackers contains settings to adjust how rotation and filtering is handled for particular trackers.\nThis allows you to for example set a strong filter on your feet and waist if you intend on sitting\ndown a lot, while also using a faster setting for elbows so they follow your hands more closely.",
"/SettingsLearn/Captions/TrackerConfigNote": "Note: Some of these settings are only relevant when using Kinect.",
"/SettingsLearn/Titles/FilterSettings": "Filter settings:",
Expand All @@ -189,7 +193,7 @@
"/DevicesPage/Buttons/ViewDocs": "View Docs",
"/DevicesPage/Placeholders/Joints/Disabled/PlaceholderText": "Joint Disabled",
"/DevicesPage/Placeholders/Overrides/NoOverride/PlaceholderText": "No Override",
"/DevicesPage/Titles/Check/Orientation": "Rotation",
"/DevicesPage/Titles/Check/Orientation": "Orientation",
"/DevicesPage/Titles/Check/Position": "Position",
"/DevicesPage/Titles/CurrentDevice": "Currently Tracking",
"/DevicesPage/Titles/DeviceBase": "Device:",
Expand All @@ -204,7 +208,7 @@
"/DevicesPage/Titles/Joints/WaistAndFeet": "Waist and Feet Trackers",
"/DevicesPage/Titles/NoOverrides": "No Overrides",
"/DevicesPage/Titles/Overrides/Header": "Overrides",
"/DevicesPage/Titles/Set/Orientation": "Rotation:",
"/DevicesPage/Titles/Set/Orientation": "Orientation:",
"/DevicesPage/Titles/Set/Position": "Position:",
"/DevicesPage/Titles/Set/TrackedJoint": "Tracked Joint:",
"/DevicesPage/Titles/Set/Tracker": "Tracker:",
Expand Down
20 changes: 12 additions & 8 deletions Amethyst/Assets/Strings/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,15 @@
"/SettingsPage/Captions/TrackersRestart/Line2": "et Amethyst pour que les changements prennent effet.",
"/SettingsPage/Elements/ExtFlipCalibration/ToolTip": "Calibration",
"/SettingsPage/Elements/FlipToggle/ToolTip": "Désactiver pour empêcher les trackers de\nvous suivre en tournant.",
"/SettingsPage/Filters/Orientation/Device": "Rotation inférée par l'appareil",
"/SettingsPage/Filters/Orientation/HMD": "Suivre le casque",
"/SettingsPage/Filters/Orientation/MathBased": "Rotation calculée logiciel",
"/SettingsPage/Filters/Orientation/Off": "Désactiver la rotation",
"/SettingsPage/Filters/Orientation/Device": "Default Orientation",
"/SettingsPage/Filters/Orientation/HMD": "Follow VR Headset",
"/SettingsPage/Filters/Orientation/MathBased": "Ankle-based Orientation",
"/SettingsPage/Filters/Orientation/MathBasedV2": "Leg-based Orientation",
"/SettingsPage/Filters/Orientation/Off": "Disable Orientation",
"/SettingsPage/Filters/Position/Kalman": "Filtre Kalman Étendu",
"/SettingsPage/Filters/Position/LERP": "Interpolation Linéaire",
"/SettingsPage/Filters/Position/LowPass": "Filtre passe-bas",
"/SettingsPage/Filters/Position/Prediction": "Adaptive Prediction",
"/SettingsPage/Filters/Position/Off": "Désactiver le filtre",
"/SettingsPage/Filters/Managed": "Managed by '{0}'",
"/SettingsPage/ReManifest/Error/NotFound": "Le manifest n'a pu être installé.\nAssurez-vous qu'il existe dans le dossier où se trouve Amethyst.exe",
Expand Down Expand Up @@ -161,12 +163,14 @@
"/SettingsLearn/Captions/Orientation/Explanations/Default": "Cette option peut être instable pour certains utilisateurs sur la Kinect One. Si c'est le cas, \nessayez avec la rotation calculée logiciel. L'orientation de chaque articulation est inférée par le SDK\nde la Kinect basée sur la position de chaque partie du corps. Imaginez qu'une flèche est attachée au bout\nde chaque articulation, et que le tracker pointe dans cette direction. Cette option fonctionne différemment\nsur Kinect 360 et Kinect One.\nSur la Kinect Xbox One, la rotation est basée sur le bout du pied, donc vous pouvez tourner vos pieds.\nSur la Kinect Xbox 360, elle est basée sur le talon, donc le tracker suit seulement la jambe.",
"/SettingsLearn/Captions/Orientation/Explanations/HMD": "Les trackers suivent l'orientation du casque de VR sur l'axe Y\nmais perdent toute rotation dans les deux autres.",
"/SettingsLearn/Captions/Orientation/Explanations/MathBased": "Cette option est disponible seulement pour les pieds.\nLa direction des pieds est calculée en se basant sur l'orientation du bout des pieds jusqu'au talon.\nLe mouvement est limité à 50% pour éviter les glitch. Cette option permet de tourner les pieds sur la Kinect 360.",
"/SettingsLearn/Captions/Orientation/Explanations/MathBasedV2": "This option is only available for feet trackers.\nThe orientation of your feet is calculated from the joints' poses of your whole leg and waist.\nThere's some additions to make it more responsive. This allows for foot rotation on Xbox One Kinect.",
"/SettingsLearn/Captions/Orientation/Explanations/None": "Les trackers ne tournent pas. Sauf quand le retournement est actif en étant dos à la Kinect.",
"/SettingsLearn/Captions/Orientation/Introduction": "Toutes les options de rotation sont affectées par le retournement des trackers.",
"/SettingsLearn/Captions/Orientation/Names/Default": "- Rotation inférée par l'appareil",
"/SettingsLearn/Captions/Orientation/Names/HMD": "- Suivre le casque",
"/SettingsLearn/Captions/Orientation/Names/MathBased": "- Rotation calculée logiciel",
"/SettingsLearn/Captions/Orientation/Names/None": "- Désactiver la rotation",
"/SettingsLearn/Captions/Orientation/Names/Default": "- Default Orientation",
"/SettingsLearn/Captions/Orientation/Names/HMD": "- Follow VR Headset",
"/SettingsLearn/Captions/Orientation/Names/MathBased": "- Ankle-based Orientation",
"/SettingsLearn/Captions/Orientation/Names/MathBasedV2": "- Leg-based Orientation",
"/SettingsLearn/Captions/Orientation/Names/None": "- Disable Orientation",
"/SettingsLearn/Captions/TrackerConfig": "Amethyst supporte jusqu'à 7 trackers de base, et des trackers additionels peuvent être\nactivés ou désactivés en cliquant sur l'icône d'engrenage. Chaque tracker ou ensemble de trackers\na ses propres paramêtres pour configurer comment leur rotation fonctionne et quel filtre est utilisé\npour les mouvements. Ceci vous permet par exemple d'appliquer un filtre plus rapide aux coudes et\nun filtre plus prononcé sur les pieds si vous comptez vous asseoir souvent.",
"/SettingsLearn/Captions/TrackerConfigNote": "Note: Certaines de ces options fonctionnent seulement avec Kinect.",
"/SettingsLearn/Titles/FilterSettings": "Paramêtres de filtre:",
Expand Down
Loading

0 comments on commit 46ae29e

Please sign in to comment.