diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-11-12 12:02:36 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-11-12 12:17:32 +0100 |
| commit | 0afbd732e6b64d1c13cf7e94c11ab783e3e6482c (patch) | |
| tree | 94d6ee000471fdea686132ae0882110336997dc6 | |
| parent | 359875cf3328fbf8fbfe83fd8c061dd27d836bc2 (diff) | |
tracker/steamvr: add broken version
We still need axis-angle <-> rmat and euler with different order helpers.
| -rw-r--r-- | tracker-pt/FTNoIR_PT_Controls.ui | 4 | ||||
| -rw-r--r-- | tracker-steamvr/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | 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 @@ <string> ms</string> </property> <property name="minimum"> - <number>1</number> + <number>50</number> </property> <property name="maximum"> - <number>10000</number> + <number>5000</number> </property> </widget> </item> 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 <cstdlib> #include <cmath> |