fix rotation offset for leapmotion + add experimental calibration mode

Nyabsi · Aug 18, 2024 · 51e2e7d · 51e2e7d
1 parent 416c6ee
commit 51e2e7d
Show file tree

Hide file tree

Showing 9 changed files with 530 additions and 194 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,6 +26,7 @@ add_library(${PROJECT_NAME} SHARED
     ${SRC_DIR}/InterfaceHook.cpp
 	${SRC_DIR}/TrackedController.cpp
 	${SRC_DIR}/LeapConnection.cpp
+	${SRC_DIR}/GestureInput.cpp
 )
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${SRC_DIR})

diff --git a/dist/leapify/resources/localization/localization_en_us.json b/dist/leapify/resources/localization/localization_en_us.json
@@ -10,8 +10,10 @@
   "Setting_automatic_switch": "Hand Tracking as Fallback",
   "Setting_automatic_offset": "Automatic Hand Offset",
   "Setting_tracker_override": "Override hand to Tracker position",
+  "Setting_tracker_calibration_mode": "Calibration Mode",
   "Setting_manual_offset": "Manual Hand Offset (mm)",
-  "Setting_manual_mounting_offset": "Adjust Mounting Offset",
+  "Setting_manual_mounting_translation_offset": "Adjust Mounting Offset (Translation)",
+  "Setting_manual_mounting_orientation_offset": "Adjust Mounting Offset (Orientation)",
   "Setting_manual_mounting_offset_x": "Offset (X)",
   "Setting_manual_mounting_offset_y": "Offset (Y)",
   "Setting_manual_mounting_offset_z": "Offset (Z)"

diff --git a/dist/leapify/resources/localization/localization_ja_jp.json b/dist/leapify/resources/localization/localization_ja_jp.json
@@ -1,18 +1,20 @@
 {
-    "language_tag": "ja_JP",
-
-    "Settings_Title": "Leapify",
-    "Setting_toggle_on": "有効",
-    "Setting_toggle_off": "無効",
-    "Setting_hand_tracking": "ハンドトラッキング",
-    "Setting_skeletal_passthrough": "スケルトンデータ・パススルー",
-    "Setting_position_passthrough": "ポジションデータ・パススルー",
-    "Setting_automatic_switch": "ハンドトラッキングを代替手段として利用",
-    "Setting_automatic_offset": "ハンド・オフセットを自動で設定する",
-    "Setting_tracker_override": "手の位置をトラッカーの位置として利用する",
-    "Setting_manual_offset": "ハンド・オフセット調整 (mm)",
-    "Setting_manual_mounting_offset": "位置調整用オフセット",
-    "Setting_manual_mounting_offset_x": "オフセット (X)",
-    "Setting_manual_mounting_offset_y": "オフセット (Y)",
-    "Setting_manual_mounting_offset_z": "オフセット (Z)"
+  "language_tag": "ja_JP",
+
+  "Settings_Title": "Leapify",
+  "Setting_toggle_on": "有効",
+  "Setting_toggle_off": "無効",
+  "Setting_hand_tracking": "ハンドトラッキング",
+  "Setting_skeletal_passthrough": "スケルトンデータ・パススルー",
+  "Setting_position_passthrough": "ポジションデータ・パススルー",
+  "Setting_automatic_switch": "ハンドトラッキングを代替手段として利用",
+  "Setting_automatic_offset": "ハンド・オフセットを自動で設定する",
+  "Setting_tracker_override": "手の位置をトラッカーの位置として利用する",
+  "Setting_tracker_calibration_mode": "Calibration Mode",
+  "Setting_manual_offset": "ハンド・オフセット調整 (mm)",
+  "Setting_manual_mounting_translation_offset": "Adjust Mounting Offset (Translation)",
+  "Setting_manual_mounting_orientation_offset": "Adjust Mounting Offset (Orientation)",
+  "Setting_manual_mounting_offset_x": "オフセット (X)",
+  "Setting_manual_mounting_offset_y": "オフセット (Y)",
+  "Setting_manual_mounting_offset_z": "オフセット (Z)"
 }
diff --git a/dist/leapify/resources/settings/default.vrsettings b/dist/leapify/resources/settings/default.vrsettings
@@ -10,21 +10,14 @@
     "automaticHandOffset": true,
     "manualHandOffset": 0.0,
     "overrideWithTrackerPosition": false,
+    "trackerCalibrationMode": false,
     "manualMountingTranslationOffset": false,
     "manualMountingTranslationOffsetX": 0.0,
     "manualMountingTranslationOffsetY": 0.0,
     "manualMountingTranslationOffsetZ": 0.0,
     "manualMountingOrientationOffset": false,
     "manualMountingOrientationOffsetX": 0.0,
     "manualMountingOrientationOffsetY": 0.0,
-    "manualMountingOrientationOffsetZ": 0.0,
-    "manualTrackerTranslationOffset": false,
-    "manualTrackerTranslationOffsetX": 0.0,
-    "manualTrackerTranslationOffsetY": 0.0,
-    "manualTrackerTranslationOffsetZ": 0.0,
-    "manualTrackerOrientationOffset": false,
-    "manualTrackerOrientationOffsetX": 0.0,
-    "manualTrackerOrientationOffsetY": 0.0,
-    "manualTrackerOrientationOffsetZ": 0.0
+    "manualMountingOrientationOffsetZ": 0.0
   }
 }
diff --git a/dist/leapify/resources/settings/settingsschema.vrsettings b/dist/leapify/resources/settings/settingsschema.vrsettings
@@ -68,6 +68,17 @@
           "/settings/driver_leapify/positionalDataPassthrough": false
         }
       },
+      {
+        "name": "/settings/driver_leapify/trackerCalibrationMode",
+        "control": "toggle",
+        "advanced_only": true,
+        "label": "#{leapify}Setting_tracker_calibration_mode",
+        "on_label": "#{leapify}Setting_toggle_on",
+        "off_label": "#{leapify}Setting_toggle_off",
+        "requires": {
+          "/settings/driver_leapify/overrideWithTrackerPosition": true
+        }
+      },
       {
         "name": "/settings/driver_leapify/manualMountingTranslationOffset",
         "control": "toggle",
@@ -157,96 +168,6 @@
         "requires": {
           "/settings/driver_leapify/manualMountingOrientationOffset": true
         }
-      },
-      {
-        "name": "/settings/driver_leapify/manualTrackerTranslationOffset",
-        "control": "toggle",
-        "advanced_only": true,
-        "label": "#{leapify}Setting_manual_tracker_translation_offset",
-        "on_label": "#{leapify}Setting_toggle_on",
-        "off_label": "#{leapify}Setting_toggle_off",
-        "requires": {}
-      },
-      {
-        "name": "/settings/driver_leapify/manualTrackerTranslationOffsetX",
-        "control": "slider",
-        "label": "#{leapify}Setting_offset_x",
-        "type": "float",
-        "min": -500,
-        "max": 500,
-        "decimals": 1,
-        "requires": {
-          "/settings/driver_leapify/manualTrackerTranslationOffset": true
-        }
-      },
-      {
-        "name": "/settings/driver_leapify/manualTrackerTranslationOffsetY",
-        "control": "slider",
-        "label": "#{leapify}Setting_offset_y",
-        "type": "float",
-        "min": -500,
-        "max": 500,
-        "decimals": 1,
-        "requires": {
-          "/settings/driver_leapify/manualTrackerTranslationOffset": true
-        }
-      },
-      {
-        "name": "/settings/driver_leapify/manualTrackerTranslationOffsetZ",
-        "control": "slider",
-        "label": "#{leapify}Setting_offset_z",
-        "type": "float",
-        "min": -500,
-        "max": 500,
-        "decimals": 1,
-        "requires": {
-          "/settings/driver_leapify/manualTrackerTranslationOffset": true
-        }
-      },
-      {
-        "name": "/settings/driver_leapify/manualTrackerOrientationOffset",
-        "control": "toggle",
-        "advanced_only": true,
-        "label": "#{leapify}Setting_manual_tracker_orientation_offset",
-        "on_label": "#{leapify}Setting_toggle_on",
-        "off_label": "#{leapify}Setting_toggle_off",
-        "requires": {}
-      },
-      {
-        "name": "/settings/driver_leapify/manualTrackerOrientationOffsetX",
-        "control": "slider",
-        "label": "#{leapify}Setting_offset_x",
-        "type": "float",
-        "min": -500,
-        "max": 500,
-        "decimals": 1,
-        "requires": {
-          "/settings/driver_leapify/manualTrackerOrientationOffset": true
-        }
-      },
-      {
-        "name": "/settings/driver_leapify/manualTrackerOrientationOffsetY",
-        "control": "slider",
-        "label": "#{leapify}Setting_offset_y",
-        "type": "float",
-        "min": -500,
-        "max": 500,
-        "decimals": 1,
-        "requires": {
-          "/settings/driver_leapify/manualTrackerOrientationOffset": true
-        }
-      },
-      {
-        "name": "/settings/driver_leapify/manualTrackerOrientationOffsetZ",
-        "control": "slider",
-        "label": "#{leapify}Setting_offset_z",
-        "type": "float",
-        "min": -500,
-        "max": 500,
-        "decimals": 1,
-        "requires": {
-          "/settings/driver_leapify/manualTrackerOrientationOffset": true
-        }
       }
     ]
   }