fixed some issues with disableOpenVrApi

Author: ju1ce

AprilTagTrackers/Connection.cpp

@@ -110,68 +110,66 @@ void Connection::Connect()
         }
     }
 
-    if (user_config.disableOpenVrApi)
+    if (!user_config.disableOpenVrApi)
     {
-        status = CONNECTED;
-        return;
-    }
 
-    // connect to steamvr as a client in order to get buttons.
-    vr::EVRInitError error;
-    openvr_handle = VR_Init(&error, vr::VRApplication_Overlay);
+        // connect to steamvr as a client in order to get buttons.
+        vr::EVRInitError error;
+        openvr_handle = VR_Init(&error, vr::VRApplication_Overlay);
 
-    if (error != vr::VRInitError_None)
-    {
-        std::string ovrErr = vr::VR_GetVRInitErrorAsEnglishDescription(error);
-        SetError(ErrorCode::CLIENT_ERROR, std::move(ovrErr));
-        return;
-    }
+        if (error != vr::VRInitError_None)
+        {
+            std::string ovrErr = vr::VR_GetVRInitErrorAsEnglishDescription(error);
+            SetError(ErrorCode::CLIENT_ERROR, std::move(ovrErr));
+            return;
+        }
 
-    /*
-    vr::HmdMatrix34_t testZeroToStanding = openvr_handle->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+        /*
+        vr::HmdMatrix34_t testZeroToStanding = openvr_handle->GetRawZeroPoseToStandingAbsoluteTrackingPose();
 
-    std::string e = "Zero pose to standing: \n ";
-    for (int i = 0; i < 3; i++)
-    {
-        for (int j = 0; j < 4; j++)
+        std::string e = "Zero pose to standing: \n ";
+        for (int i = 0; i < 3; i++)
         {
-            e += std::to_string(testZeroToStanding.m[i][j]) + ", ";
+            for (int j = 0; j < 4; j++)
+            {
+                e += std::to_string(testZeroToStanding.m[i][j]) + ", ";
+            }
+            e += "\n";
         }
-        e += "\n";
-    }
-    wxMessageDialog dial(NULL,
-        e, wxT("Error"), wxOK | wxICON_ERROR);
-    dial.ShowModal();
+        wxMessageDialog dial(NULL,
+            e, wxT("Error"), wxOK | wxICON_ERROR);
+        dial.ShowModal();
 
-    vr::HmdMatrix34_t testStandingToSeated = openvr_handle->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+        vr::HmdMatrix34_t testStandingToSeated = openvr_handle->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
 
-    e = "Seated pose to standing: \n ";
-    for (int i = 0; i < 3; i++)
-    {
-        for (int j = 0; j < 4; j++)
+        e = "Seated pose to standing: \n ";
+        for (int i = 0; i < 3; i++)
         {
-            e += std::to_string(testStandingToSeated.m[i][j]) + ", ";
+            for (int j = 0; j < 4; j++)
+            {
+                e += std::to_string(testStandingToSeated.m[i][j]) + ", ";
+            }
+            e += "\n";
         }
-        e += "\n";
-    }
-    wxMessageDialog dial2(NULL,
-        e, wxT("Error"), wxOK | wxICON_ERROR);
-    dial2.ShowModal();
+        wxMessageDialog dial2(NULL,
+            e, wxT("Error"), wxOK | wxICON_ERROR);
+        dial2.ShowModal();
 
-    */
-    const auto bindingsPath = std::filesystem::absolute("bindings/att_actions.json");
-    if (!std::filesystem::exists(bindingsPath))
-    {
-        SetError(ErrorCode::BINDINGS_MISSING);
-        return;
-    }
-    vr::VRInput()->SetActionManifestPath(bindingsPath.generic_u8string().c_str());
+        */
+        const auto bindingsPath = std::filesystem::absolute("bindings/att_actions.json");
+        if (!std::filesystem::exists(bindingsPath))
+        {
+            SetError(ErrorCode::BINDINGS_MISSING);
+            return;
+        }
+        vr::VRInput()->SetActionManifestPath(bindingsPath.generic_u8string().c_str());
 
-    vr::VRInput()->GetActionHandle("/actions/demo/in/grab_camera", &m_actionCamera);
-    vr::VRInput()->GetActionHandle("/actions/demo/in/grab_trackers", &m_actionTrackers);
-    vr::VRInput()->GetActionHandle("/actions/demo/in/Hand_Left", &m_actionHand);
+        vr::VRInput()->GetActionHandle("/actions/demo/in/grab_camera", &m_actionCamera);
+        vr::VRInput()->GetActionHandle("/actions/demo/in/grab_trackers", &m_actionTrackers);
+        vr::VRInput()->GetActionHandle("/actions/demo/in/Hand_Left", &m_actionHand);
 
-    vr::VRInput()->GetActionSetHandle("/actions/demo", &m_actionsetDemo);
+        vr::VRInput()->GetActionSetHandle("/actions/demo", &m_actionsetDemo);
+    }
 
     std::istringstream ret;
     std::string word;

AprilTagTrackers/MyApp.cpp

@@ -23,7 +23,11 @@ int MyApp::OnExit()
 bool MyApp::OnInit()
 {
     userConfig.Load();
+
+    //The next two lines were added as a quick fix. The two options should be handeled differently from other parameters, so as a quick fix, they are reset on every launch of ATT.
     userConfig.driver_version = SemVer::Parse(REFLECTABLE_STRINGIZE(ATT_DRIVER_VERSION));       //a quick patch to prevent parameters from having an outdated version number
+    userConfig.disableOpenVrApi = false;    //since disable openvr api isnt part of the parameters, it isnt loaded properly. This ensures it is globaly disabled on every launch.
+
     calibConfig.Load();
     arucoConfig.Load();
     lc.LoadLang(userConfig.langCode);