diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-03-18 15:20:09 +0100 | 
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-03-18 15:20:09 +0100 | 
| commit | 5023b54ba76325bb0b5598d59714bdad2d55d81e (patch) | |
| tree | 15cc639eff7dbfa12eeccaa52d7fd251f18969e6 /variant/default | |
| parent | 3aababf6fd53a7b0312c2c1492bab6b43584b613 (diff) | |
video: add support for camera modules
Issue: #910
Diffstat (limited to 'variant/default')
| -rw-r--r-- | variant/default/_variant.cmake | 1 | ||||
| -rw-r--r-- | variant/default/main-window.cpp | 6 | 
2 files changed, 4 insertions, 3 deletions
| diff --git a/variant/default/_variant.cmake b/variant/default/_variant.cmake index 161fefda..7501b0a4 100644 --- a/variant/default/_variant.cmake +++ b/variant/default/_variant.cmake @@ -24,6 +24,7 @@ function(otr_init_variant)          "migration"          "main-window"          "video" +        "video-*"      )      set_property(GLOBAL PROPERTY opentrack-subprojects "${subprojects}") diff --git a/variant/default/main-window.cpp b/variant/default/main-window.cpp index a223c32f..334695cb 100644 --- a/variant/default/main-window.cpp +++ b/variant/default/main-window.cpp @@ -448,7 +448,7 @@ void main_window::stop_tracker_()      with_tracker_teardown sentinel;      pose_update_timer.stop(); -    ui.pose_display->rotate_sync(0,0,0, 0,0,0); +    ui.pose_display->present(0,0,0, 0,0,0);      if (pTrackerDialog)          pTrackerDialog->unregister_tracker(); @@ -473,8 +473,8 @@ void main_window::stop_tracker_()  void main_window::show_pose_(const double* mapped, const double* raw)  { -    ui.pose_display->rotate_async(mapped[Yaw], mapped[Pitch], -mapped[Roll], -                                  mapped[TX], mapped[TY], mapped[TZ]); +    ui.pose_display->present(mapped[Yaw], mapped[Pitch], -mapped[Roll], +                             mapped[TX], mapped[TY], mapped[TZ]);      QLCDNumber* raw_[] = {          ui.raw_x, ui.raw_y, ui.raw_z, | 
