From 763da906a83b80eadb736008dbb558b809552505 Mon Sep 17 00:00:00 2001 From: Xavier Hallade Date: Thu, 19 Nov 2015 14:34:26 +0100 Subject: tracker-rs: updated RealSense SDK version to R5 --- tracker-rs/CMakeLists.txt | 2 +- tracker-rs/ftnoir_tracker_rs.cpp | 6 +++--- tracker-rs/ftnoir_tracker_rs_controls.cpp | 2 +- .../intel_rs_sdk_runtime_websetup_6.0.21.6598.exe | Bin 780456 -> 0 bytes .../intel_rs_sdk_runtime_websetup_7.0.23.6161.exe | Bin 0 -> 1203240 bytes .../rs_impl/bin/opentrack-tracker-rs-impl.exe | Bin 83968 -> 93696 bytes tracker-rs/rs_impl/build.bat | 6 +++++- 7 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 tracker-rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe create mode 100644 tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.6161.exe (limited to 'tracker-rs') diff --git a/tracker-rs/CMakeLists.txt b/tracker-rs/CMakeLists.txt index f4f6d4b9..24dd5c74 100644 --- a/tracker-rs/CMakeLists.txt +++ b/tracker-rs/CMakeLists.txt @@ -1,5 +1,5 @@ if(WIN32) opentrack_boilerplate(opentrack-tracker-rs) install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe" DESTINATION . ${opentrack-perms}) - install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe" DESTINATION ./contrib/ ${opentrack-perms}) + install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.6161.exe" DESTINATION ./contrib/ ${opentrack-perms}) endif() diff --git a/tracker-rs/ftnoir_tracker_rs.cpp b/tracker-rs/ftnoir_tracker_rs.cpp index 3e9b23c8..42224428 100644 --- a/tracker-rs/ftnoir_tracker_rs.cpp +++ b/tracker-rs/ftnoir_tracker_rs.cpp @@ -71,17 +71,17 @@ void RSTracker::rsImplProcessFinished(int exitCode){ msgBox.setIcon(QMessageBox::Critical); msgBox.setText("RealSense Tracking Error"); if(exitCode==-101){ //The implementation got an invalid handle from the RealSense SDK session/modules - msgBox.setInformativeText("Couldn't initialize RealSense tracking. Please install SDK Runtime R4."); + 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 R4 to be installed."); + msgBox.setInformativeText("Status code: " + QString::number(exitCode) + ".\n\nNote that you need the latest camera drivers and the SDK runtime R5 to be installed."); } QPushButton* triggerSdkInstallation = msgBox.addButton("Install Runtime", QMessageBox::ActionRole); msgBox.addButton(QMessageBox::Ok); msgBox.exec(); if(msgBox.clickedButton() == triggerSdkInstallation){ - bool pStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all"); + bool pStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_7.0.23.6161.exe --finstall=core,face3d --fnone=all"); if(!pStarted){ QMessageBox::warning(0, "Intel® RealSense™ Runtime Installation", "Installation process failed to start.", QMessageBox::Ok); } diff --git a/tracker-rs/ftnoir_tracker_rs_controls.cpp b/tracker-rs/ftnoir_tracker_rs_controls.cpp index 6c71d58f..b97ab9d0 100644 --- a/tracker-rs/ftnoir_tracker_rs_controls.cpp +++ b/tracker-rs/ftnoir_tracker_rs_controls.cpp @@ -20,7 +20,7 @@ RSTrackerControls::RSTrackerControls() void RSTrackerControls::doInstallRSRuntime() { - bool processStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all"); + bool processStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_7.0.23.6161.exe --finstall=core,face3d --fnone=all"); if(processStarted){ this->close(); } diff --git a/tracker-rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe b/tracker-rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe deleted file mode 100644 index 34ecc9df..00000000 Binary files a/tracker-rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe and /dev/null differ diff --git a/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.6161.exe b/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.6161.exe new file mode 100644 index 00000000..2c16bd93 Binary files /dev/null and b/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.6161.exe differ diff --git a/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe b/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe index 1e2a57f1..f7023255 100644 Binary files a/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe and b/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe differ diff --git a/tracker-rs/rs_impl/build.bat b/tracker-rs/rs_impl/build.bat index 15206431..3a44fed5 100644 --- a/tracker-rs/rs_impl/build.bat +++ b/tracker-rs/rs_impl/build.bat @@ -1,2 +1,6 @@ -cd "%VS120COMNTOOLS%\..\..\VC" +IF DEFINED %VS120COMNTOOLS%] ( + cd "%VS120COMNTOOLS%\..\..\VC" + ) ELSE ( + cd "%VS140COMNTOOLS%\..\..\VC" + ) vcvarsall x64 && cd %~dp0 && CL /nologo /Ox /DUNICODE /D_UNICODE /MT /I"%RSSDK_DIR%\opensource\include" ftnoir_tracker_rs_impl.cpp udp_sender.cpp "%RSSDK_DIR%\opensource\src\libpxc\libpxc.cpp" /link ADVAPI32.LIB Ws2_32.lib /SUBSYSTEM:CONSOLE /OUT:bin\opentrack-tracker-rs-impl.exe \ No newline at end of file -- cgit v1.2.3