From 0afbd732e6b64d1c13cf7e94c11ab783e3e6482c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 12 Nov 2016 12:02:36 +0100 Subject: tracker/steamvr: add broken version We still need axis-angle <-> rmat and euler with different order helpers. --- tracker-pt/FTNoIR_PT_Controls.ui | 4 ++-- tracker-steamvr/CMakeLists.txt | 7 +++++-- tracker-steamvr/steamvr.cpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tracker-pt/FTNoIR_PT_Controls.ui b/tracker-pt/FTNoIR_PT_Controls.ui index 222987a4..8973a48c 100644 --- a/tracker-pt/FTNoIR_PT_Controls.ui +++ b/tracker-pt/FTNoIR_PT_Controls.ui @@ -234,10 +234,10 @@ ms - 1 + 50 - 10000 + 5000 diff --git a/tracker-steamvr/CMakeLists.txt b/tracker-steamvr/CMakeLists.txt index 33194c23..db058e31 100644 --- a/tracker-steamvr/CMakeLists.txt +++ b/tracker-steamvr/CMakeLists.txt @@ -27,10 +27,13 @@ endif() if(steamvr-dll) SET(SDK_VALVE_STEAMVR "" CACHE PATH "Valve's SteamVR") if(SDK_VALVE_STEAMVR) - opentrack_boilerplate(opentrack-tracker-steamvr) + set(porked NO-INSTALL) + opentrack_boilerplate(opentrack-tracker-steamvr ${porked}) + if(NOT porked) + install(FILES "${SDK_VALVE_STEAMVR}/bin/${steamvr-dir}/${steamvr-dll}" DESTINATION "${opentrack-hier-pfx}") + endif() target_include_directories(opentrack-tracker-steamvr SYSTEM PUBLIC "${SDK_VALVE_STEAMVR}/headers") target_link_libraries(opentrack-tracker-steamvr "${SDK_VALVE_STEAMVR}/lib/${steamvr-dir}/${steamvr-lib}") - install(FILES "${SDK_VALVE_STEAMVR}/bin/${steamvr-dir}/${steamvr-dll}" DESTINATION "${opentrack-hier-pfx}") endif() endif() diff --git a/tracker-steamvr/steamvr.cpp b/tracker-steamvr/steamvr.cpp index 55eebc37..9c357a7a 100644 --- a/tracker-steamvr/steamvr.cpp +++ b/tracker-steamvr/steamvr.cpp @@ -2,7 +2,7 @@ #include "steamvr.hpp" #include "api/plugin-api.hpp" #include "compat/util.hpp" -#include "compat/simple-mat.hpp" +#include "compat/euler.hpp" #include #include -- cgit v1.2.3