diff options
| -rw-r--r-- | logic/tracker.cpp | 14 | ||||
| -rw-r--r-- | logic/tracker.h | 5 |
2 files changed, 2 insertions, 17 deletions
diff --git a/logic/tracker.cpp b/logic/tracker.cpp index eaae0735..743c887d 100644 --- a/logic/tracker.cpp +++ b/logic/tracker.cpp @@ -164,7 +164,6 @@ void Tracker::logic() euler_t tmp = d2r * euler_t(&value[Yaw]); scaled_rotation.rotation = euler_to_rmat(c_div * tmp); real_rotation.rotation = euler_to_rmat(tmp); - tait_bryan_to_matrices(c_div * tmp, scaled_rotation.rr, scaled_rotation.ry, scaled_rotation.rp); } scaled_rotation.camera = get_camera_offset_matrix(c_div); @@ -200,22 +199,9 @@ void Tracker::logic() scaled_rotation.rotation = rmat::eye(); real_rotation.rotation = rmat::eye(); - scaled_rotation.center_roll = rmat::eye(); - scaled_rotation.center_yaw = rmat::eye(); - scaled_rotation.center_pitch = rmat::eye(); } else { - euler::tait_bryan_to_matrices(rmat_to_euler(scaled_rotation.rotation), - scaled_rotation.center_roll, - scaled_rotation.center_pitch, - scaled_rotation.center_yaw); -#if 0 - euler::tait_bryan_to_matrices(rmat_to_euler(real_rotation.rotation), - real_rotation.center_roll, - real_rotation.center_pitch, - real_rotation.center_yaw); -#endif real_rotation.rot_center = real_rotation.rotation.t(); scaled_rotation.rot_center = scaled_rotation.rotation.t(); } diff --git a/logic/tracker.h b/logic/tracker.h index 4a5bdf50..6ba5dc70 100644 --- a/logic/tracker.h +++ b/logic/tracker.h @@ -74,12 +74,11 @@ private: struct state { - rmat center_yaw, center_pitch, center_roll; rmat rot_center; rmat camera; - rmat rotation, ry, rp, rr; + rmat rotation; - state() : center_yaw(rmat::eye()), center_pitch(rmat::eye()), center_roll(rmat::eye()), rot_center(rmat::eye()) + state() : rot_center(rmat::eye()) {} }; |