From db821b0a81962c0a01264930b628c143b0e62b6c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 2 Nov 2014 19:24:33 +0100 Subject: simplify ctor --- opentrack/mappings.hpp | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'opentrack') diff --git a/opentrack/mappings.hpp b/opentrack/mappings.hpp index 7f949f2d..1a64fcd9 100644 --- a/opentrack/mappings.hpp +++ b/opentrack/mappings.hpp @@ -12,13 +12,10 @@ class Mapping { public: Mapping(QString primary, QString secondary, - int maxInput1, - int maxOutput1, - int maxInput2, - int maxOutput2, + int max_value, axis_opts& opts) : - curve(maxInput1, maxOutput1), - curveAlt(maxInput2, maxOutput2), + curve(max_value, max_value), + curveAlt(max_value, max_value), opts(opts), name1(primary), name2(secondary) @@ -42,12 +39,12 @@ private: public: Mappings(std::vector opts) : axes { - Mapping("tx","tx_alt", 100, 100, 100, 100, *opts[TX]), - Mapping("ty","ty_alt", 100, 100, 100, 100, *opts[TY]), - Mapping("tz","tz_alt", 100, 100, 100, 100, *opts[TZ]), - Mapping("rx", "rx_alt", 180, 180, 180, 180, *opts[Yaw]), - Mapping("ry", "ry_alt", 180, 180, 180, 180, *opts[Pitch]), - Mapping("rz", "rz_alt", 180, 180, 180, 180, *opts[Roll]) + Mapping("tx","tx_alt", 100, *opts[TX]), + Mapping("ty","ty_alt", 100, *opts[TY]), + Mapping("tz","tz_alt", 100, *opts[TZ]), + Mapping("rx", "rx_alt", 180, *opts[Yaw]), + Mapping("ry", "ry_alt", 180, *opts[Pitch]), + Mapping("rz", "rz_alt", 180, *opts[Roll]) } {} -- cgit v1.2.3