summaryrefslogtreecommitdiffhomepage
path: root/logic
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2017-02-17 14:42:32 +0100
committerStanislaw Halik <sthalik@misaki.pl>2017-02-17 14:42:32 +0100
commit7055dc552ee4f18656b9befca0e7ac5bbf9311b3 (patch)
tree561bae2fc0ebead19ee1105659f0c3c3686945c2 /logic
parentafa5744150300734f8e63f6b452f3368e33dcade (diff)
logic/tracker: remove the experimental center option
It's broken.
Diffstat (limited to 'logic')
-rw-r--r--logic/main-settings.hpp2
-rw-r--r--logic/tracker.cpp12
2 files changed, 1 insertions, 13 deletions
diff --git a/logic/main-settings.hpp b/logic/main-settings.hpp
index 248017e0..203f531a 100644
--- a/logic/main-settings.hpp
+++ b/logic/main-settings.hpp
@@ -131,7 +131,7 @@ struct main_settings
camera_roll(b, "camera-roll", 0),
use_camera_offset_from_centering(b, "use-camera-offset-from-centering", false),
center_at_startup(b, "center-at-startup", true),
- center_method(b, "centering-method", true),
+ center_method(b, "centering-method", 0),
neck_y(b, "neck-height", 0),
neck_z(b, "neck-depth", 0),
neck_enable(b, "neck-enable", false),
diff --git a/logic/tracker.cpp b/logic/tracker.cpp
index cf593cdd..6d551a65 100644
--- a/logic/tracker.cpp
+++ b/logic/tracker.cpp
@@ -238,18 +238,6 @@ void Tracker::logic()
case 1:
rotation = scaled_rotation.rotation * scaled_rotation.rot_center;
break;
- // alternative camera
- case 2:
- rmat cy, cp, cr;
- tait_bryan_to_matrices(rmat_to_euler(scaled_rotation.rotation), cr, cp, cy);
-
- rmat ry = cy * scaled_rotation.center_yaw.t();
- rmat rp = cp * scaled_rotation.center_pitch.t();
- rmat rr = cr * scaled_rotation.center_roll.t();
-
- // roll yaw pitch
- rotation = rr * ry * rp;
- break;
}
const euler_t rot = r2d * c_mult * rmat_to_euler(rotation);