diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-09 15:50:09 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-10 10:41:56 +0200 |
commit | 0eec855f4f5ac86f70525418918fd1ebb4d45e03 (patch) | |
tree | b8014ad75774e00ba3c26f2b781d6ad0c6021c9a /opentrack-logic/tracker.cpp | |
parent | f56f30f1d076c8b48a0bd4ce47b26ede618d2880 (diff) |
spline-widget, gui: rename mapping-related files and classes
Adjust usages.
Diffstat (limited to 'opentrack-logic/tracker.cpp')
-rw-r--r-- | opentrack-logic/tracker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/opentrack-logic/tracker.cpp b/opentrack-logic/tracker.cpp index 746a29f4..ab1a7406 100644 --- a/opentrack-logic/tracker.cpp +++ b/opentrack-logic/tracker.cpp @@ -54,12 +54,12 @@ Tracker::rmat Tracker::get_camera_offset_matrix(double c) return euler::euler_to_rmat(off); } -double Tracker::map(double pos, Mapping& axis) +double Tracker::map(double pos, Map& axis) { bool altp = (pos < 0) && axis.opts.altp; - axis.curve.setTrackingActive( !altp ); - axis.curveAlt.setTrackingActive( altp ); - auto& fc = altp ? axis.curveAlt : axis.curve; + axis.spline_main.setTrackingActive( !altp ); + axis.spline_alt.setTrackingActive( altp ); + auto& fc = altp ? axis.spline_alt : axis.spline_main; return fc.getValue(pos); } @@ -355,8 +355,8 @@ void Tracker::run() for (int i = 0; i < 6; i++) { - m(i).curve.setTrackingActive(false); - m(i).curveAlt.setTrackingActive(false); + m(i).spline_main.setTrackingActive(false); + m(i).spline_alt.setTrackingActive(false); } } |