Many fixes made

Wunder-Wulfe · Apr 5, 2022 · 79e4255 · 79e4255
1 parent 11face8
commit 79e4255
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CDriverSettings.cpp b/CDriverSettings.cpp
@@ -28,8 +28,8 @@ bool CDriverSettings::UpdateConfig(const CServerDriver *source)
 {
     return SetConfigVector(SECTION_POS, source->m_nvInterface->GetCameraPos())
         && SetConfigVector(SECTION_ROT, source->m_camBryan)
-        && SetConfigVector(SECTION_TRACK_SCALE, source->m_scaleFactor);
-        //&& SetConfigInteger(SECTION_CAMSET, KEY_CAM_INDEX, source->m_cameraDriver->GetIndex());
+        && SetConfigVector(SECTION_TRACK_SCALE, source->m_scaleFactor)
+        && SetConfigInteger(SECTION_CAMSET, KEY_CAM_INDEX, source->camIndex);
 }
 
 bool CDriverSettings::SaveConfig()

diff --git a/CDriverSettings.h b/CDriverSettings.h
@@ -166,7 +166,7 @@ class CDriverSettings
     inline const char *GetConfigCString(const char *section, const char *key, const char *def = "") const { return m_iniFile.GetValue(section, key, def); }
     inline const std::string GetConfigString(const char *section, const char *key, const std::string &def = std::string("")) const { return std::string(m_iniFile.GetValue(section, key, def.c_str())); }
 
-    inline bool SetConfigInteger(const char *section, const char *key, int value) { _itoa_s(value, m_tempBuffer, BUFFER_SIZE); return 0 == m_iniFile.SetValue(section, key, m_tempBuffer); }
+    inline bool SetConfigInteger(const char *section, const char *key, int value) { _itoa_s(value, m_tempBuffer, 10); return 0 == m_iniFile.SetValue(section, key, m_tempBuffer); }
     inline  bool SetConfigFloat(const char *section, const char *key, float value) { return 0 == m_iniFile.SetDoubleValue(section, key, (double)value); }
     bool SetConfigVector(const char *section, const glm::vec3 value);
     bool SetConfigQuaternion(const char *section, const glm::quat value);

diff --git a/CServerDriver.cpp b/CServerDriver.cpp
@@ -179,6 +179,8 @@ void CServerDriver::OnCameraUpdate(const CCameraDriver &me, int index)
     ptrsafe(me.driver);
     ptrsafe(me.driver->m_nvInterface);
 
+    me.driver->camIndex = index;
+
     me.driver->m_nvInterface->SetFPS(me.GetFps());
     vr_log("Attempting to load the image from the camera onto GPU memory\n");
     me.driver->m_nvInterface->LoadImageFromCam(me.m_currentCamera);
@@ -400,7 +402,7 @@ void CServerDriver::Cleanup()
 
     m_cameraDriver->m_working = false;
 
-    m_camThread->join();
+    //m_camThread->join();
 
     delptr(m_cameraDriver);
     delptr(m_camThread);

diff --git a/CServerDriver.h b/CServerDriver.h
@@ -116,6 +116,7 @@ class CServerDriver final : public vr::IServerTrackedDeviceProvider
     glm::vec3 m_camBryan;
     uint m_frame;
     bool mirrored;
+    int camIndex;
 
     vr::TrackedDevicePose_t m_hmd_controller_pose[3]{};