remove experimental oculus block

Nyabsi · Jul 30, 2024 · ac0811e · ac0811e
1 parent 21c76e1
commit ac0811e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/dist/leapify/resources/localization/localization_en_us.json b/dist/leapify/resources/localization/localization_en_us.json
@@ -8,7 +8,6 @@
     "Setting_skeletal_passthrough": "Skeletal data passthrough",
     "Setting_position_passthrough": "Position data passthrough",
     "Setting_automatic_switch": "Auto Switch Hand Tracking And Controllers",
-    "Setting_automatic_offset": "Automatic Hand Offset (Recommended)",
-    "Setting_manual_offset": "Manual Hand Offset (mm)",
-    "Setting_block_oculus": "Block Meta/Oculus Controllers"
+    "Setting_automatic_offset": "Automatic Hand Offset",
+    "Setting_manual_offset": "Manual Hand Offset (mm)"
 }
diff --git a/dist/leapify/resources/settings/default.vrsettings b/dist/leapify/resources/settings/default.vrsettings
@@ -8,7 +8,6 @@
     "positionalDataPassthrough": false,
     "automaticControllerSwitching": false,
     "automaticHandOffset": true,
-    "manualHandOffset": 0.0,
-    "blockOculus": false
+    "manualHandOffset": 0.0
   }
 }
diff --git a/dist/leapify/resources/settings/settingsschema.vrsettings b/dist/leapify/resources/settings/settingsschema.vrsettings
@@ -51,13 +51,6 @@
         "requires": {
           "/settings/driver_leapify/automaticHandOffset": false
         }
-      },
-      {
-        "name": "/settings/driver_leapify/blockOculus",
-        "control": "toggle",
-        "label": "#{leapify}Setting_block_oculus",
-        "on_label": "#{leapify}Setting_toggle_on",
-        "off_label": "#{leapify}Setting_toggle_off"
       }
     ]
   }

diff --git a/src/InterfaceHook.cpp b/src/InterfaceHook.cpp
@@ -57,12 +57,6 @@ void InterfaceHook::GetGenericInterface(void* interfacePtr, const char* pchInter
                     {
                         StateManager::Get().updateControllerState(unWhichDevice, pose.deviceIsConnected);
 
-                        if (manufacturer == "Oculus" && vr::VRSettings()->GetBool("driver_leapify", "handTrackingEnabled") && vr::VRSettings()->GetBool("driver_leapify", "blockOculus"))
-                        {
-                            pose.deviceIsConnected = false;
-                            pose.poseIsValid = false;
-                        }
-
                         if (vr::VRSettings()->GetBool("driver_leapify", "handTrackingEnabled") && vr::VRSettings()->GetBool("driver_leapify", "positionalDataPassthrough"))
                         {
                             pose = StateManager::Get().getLeapPose(static_cast<vr::ETrackedControllerRole>(role));