diff options
| -rw-r--r-- | tracker-rs/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tracker-rs/ftnoir_tracker_rs.cpp | 4 | ||||
| -rw-r--r-- | tracker-rs/ftnoir_tracker_rs_controls.ui | 10 | ||||
| -rw-r--r-- | tracker-rs/ftnoir_tracker_rs_worker.cpp | 9 | ||||
| -rw-r--r-- | tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.8048.exe | bin | 1203240 -> 0 bytes | |||
| -rw-r--r-- | tracker-rs/redist/intel_rs_sdk_runtime_websetup_8.0.24.6528.exe | bin | 0 -> 1226096 bytes | |||
| -rw-r--r-- | tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.dll | bin | 72704 -> 72704 bytes | |||
| -rw-r--r-- | tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.lib | bin | 2882 -> 2882 bytes |
8 files changed, 13 insertions, 12 deletions
diff --git a/tracker-rs/CMakeLists.txt b/tracker-rs/CMakeLists.txt index 76ffd191..9219aafd 100644 --- a/tracker-rs/CMakeLists.txt +++ b/tracker-rs/CMakeLists.txt @@ -2,5 +2,5 @@ if(WIN32) opentrack_boilerplate(opentrack-tracker-rs) target_link_libraries(opentrack-tracker-rs "${CMAKE_SOURCE_DIR}/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.lib") install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.dll" DESTINATION . ${opentrack-perms}) - install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.8048.exe" DESTINATION ./contrib/ ${opentrack-perms}) + install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/intel_rs_sdk_runtime_websetup_8.0.24.6528.exe" DESTINATION ./contrib/ ${opentrack-perms}) endif() diff --git a/tracker-rs/ftnoir_tracker_rs.cpp b/tracker-rs/ftnoir_tracker_rs.cpp index 7bb47256..d8d12210 100644 --- a/tracker-rs/ftnoir_tracker_rs.cpp +++ b/tracker-rs/ftnoir_tracker_rs.cpp @@ -72,7 +72,7 @@ void RSTracker::handleTrackingEnded(int exitCode){ bool RSTracker::startSdkInstallationProcess() { - bool pStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_7.0.23.8048.exe --finstall=core,face3d --fnone=all"); + bool pStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_8.0.24.6528.exe --finstall=core,face3d --fnone=all"); if(!pStarted){ QMessageBox::warning(0, "Intel® RealSense™ Runtime Installation", "Installation process failed to start.", QMessageBox::Ok); } @@ -88,7 +88,7 @@ void RSTracker::showRealSenseErrorMessageBox(int exitCode) msgBox.setInformativeText("Couldn't initialize RealSense tracking. Please install SDK Runtime R5."); } else { - msgBox.setInformativeText("Status code: " + QString::number(exitCode) + ".\n\nNote that you need the latest camera drivers and the SDK runtime R5 to be installed."); + msgBox.setInformativeText("Status code: " + QString::number(exitCode) + ".\n\nNote that you need the latest camera drivers and the SDK runtime 2016 R1 to be installed."); } QPushButton* triggerSdkInstallation = msgBox.addButton("Install Runtime", QMessageBox::ActionRole); diff --git a/tracker-rs/ftnoir_tracker_rs_controls.ui b/tracker-rs/ftnoir_tracker_rs_controls.ui index 023e14d3..30d06956 100644 --- a/tracker-rs/ftnoir_tracker_rs_controls.ui +++ b/tracker-rs/ftnoir_tracker_rs_controls.ui @@ -9,8 +9,8 @@ <rect> <x>0</x> <y>0</y> - <width>378</width> - <height>193</height> + <width>484</width> + <height>244</height> </rect> </property> <property name="windowTitle"> @@ -36,15 +36,15 @@ The application will activate your camera for face tracking by the Intel® RealSense™ SDK. By design, the application has no direct access to any camera images. -In order to use this tracker, you need a PC equipped with -an Intel® RealSense™ R200 camera and the RealSense™ SDK R5 runtime.</string> +In order to use this tracker, you need a PC equipped with an Intel® RealSense™ +F200 or SR300 camera and the RealSense™ SDK 2016 R1 runtime.</string> </property> </widget> </item> <item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> <widget class="QPushButton" name="triggerSDKInstallButton"> <property name="text"> - <string>Install SDK Runtime R5</string> + <string>Install Runtime</string> </property> </widget> </item> diff --git a/tracker-rs/ftnoir_tracker_rs_worker.cpp b/tracker-rs/ftnoir_tracker_rs_worker.cpp index c387b731..213f13ff 100644 --- a/tracker-rs/ftnoir_tracker_rs_worker.cpp +++ b/tracker-rs/ftnoir_tracker_rs_worker.cpp @@ -29,13 +29,14 @@ void RSTrackerWorkerThread::run(){ while(!isInterruptionRequested()){ retValue = rs_tracker_impl_update_pose(pose); - if(retValue!=0 && retValue!=-303){ // -303 is only a timeout. + if(retValue == 0){ // success + QMutexLocker lock(&mMutex); + memcpy(mPose, pose, sizeof(pose)); + } + else if(retValue != -303){ // pose update failed. -303 is OK as it's only a timeout. emit trackingHasFinished(retValue); break; } - - QMutexLocker lock(&mMutex); - memcpy(mPose, pose, sizeof(pose)); } rs_tracker_impl_end(); diff --git a/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.8048.exe b/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.8048.exe Binary files differdeleted file mode 100644 index 2e2b365c..00000000 --- a/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.8048.exe +++ /dev/null diff --git a/tracker-rs/redist/intel_rs_sdk_runtime_websetup_8.0.24.6528.exe b/tracker-rs/redist/intel_rs_sdk_runtime_websetup_8.0.24.6528.exe Binary files differnew file mode 100644 index 00000000..5b3704ed --- /dev/null +++ b/tracker-rs/redist/intel_rs_sdk_runtime_websetup_8.0.24.6528.exe diff --git a/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.dll b/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.dll Binary files differindex 9e75d4e3..d6e0a261 100644 --- a/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.dll +++ b/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.dll diff --git a/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.lib b/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.lib Binary files differindex 772cd340..47743c50 100644 --- a/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.lib +++ b/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.lib |