diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2020-03-29 17:01:15 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2020-03-29 17:01:15 +0200 |
| commit | 78abe5a774a6ef202825d235add02ea8e74db76c (patch) | |
| tree | 9f195dda0dc919559e5d98b950f38419bacc3aac | |
| parent | 5a95a9e670a815cc97934c16d0f1bec9b4b77a90 (diff) | |
tracker/realsense: switch to RSSDK 2016 R3
Issue: #713
| -rw-r--r-- | sdk-paths-sthalik@MSVC-windows.cmake | 2 | ||||
| -rw-r--r-- | tracker-rs/rs_impl/ftnoir_tracker_rs_impl.cpp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sdk-paths-sthalik@MSVC-windows.cmake b/sdk-paths-sthalik@MSVC-windows.cmake index 732d29ca..f1fd3264 100644 --- a/sdk-paths-sthalik@MSVC-windows.cmake +++ b/sdk-paths-sthalik@MSVC-windows.cmake @@ -31,7 +31,7 @@ setq(SDK_HYDRA "SixenseSDK") setq(SDK_KINECT20 "Kinect-v2.0") setq(SDK_LIBUSB "libusb-msvc-x86") setq(SDK_PS3EYEDRIVER "PS3EYEDriver") -setq(SDK_REALSENSE "RSSDK-R2") +setq(SDK_REALSENSE "RSSDK-R3") setq(SDK_RIFT_140 "ovr_sdk_win_1.43.0/LibOVR") setq(SDK_VALVE_STEAMVR "steamvr") setq(SDK_VJOYSTICK "vjoystick") diff --git a/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.cpp b/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.cpp index 3230ef56..eb97380c 100644 --- a/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.cpp +++ b/tracker-rs/rs_impl/ftnoir_tracker_rs_impl.cpp @@ -11,14 +11,17 @@ #endif #include <pxcsensemanager.h> -#include <pxcfacemodule.h> -#include <pxcfaceconfiguration.h> +#include <RealSense/Face/FaceModule.h> +#include <RealSense/Face/FaceConfiguration.h> #include <cstdlib> const size_t kPreviewStreamWidth = 640; const size_t kPreviewStreamHeight = 480; +using PXCFaceData = Intel::RealSense::Face::FaceData; +using PXCFaceConfiguration = Intel::RealSense::Face::FaceConfiguration; + PXCSenseManager* g_senseManager = NULL; PXCFaceData* g_faceData = NULL; void* g_previewImage = NULL; |