Merge branch 'unstable' into trackhat-ui

Sponsored-by: TrackHat

* unstable: (112 commits)
  Revert "accela: try more complex deadzone algorithm"
  pt: add wiki link for calibration instructions
  qfc: more gray colors when graph is disabled
  qfc, mapping: disallow editing and change color when checkbox disabled
  qfc: don't allow editing when disabled
  plugin-support: workaround multiple copies of modules
  accela: change translation gain
  accela: change rotation gain
  pt: change extraction code
  freepie-udp: add license
  freepie-udp: update
  accela: try more complex deadzone algorithm
  accela: add helpful comment
  accela: revert to more quadratic spline at start
  also save if save pending when start tracking
  ui: force saving if saving timer is pending
  accela: slightly more linear function
  pose-widget: simplify
  freepie-udp: nix harmless warning
  pose-widget: add comment
  simple-mat: add __restrict for GNU
  ui: save settings on a timer
  ui: show a warning if configuration directory can't be used
  aruco: tune min/max marker size
  win32-joystick: fix duplicate device name selection logic
  ui: no need to reset settings on tracking start
  ui: save profile when combobox text changes, not merely index
  ui: save current tracker/filter/proto, not last
  win32-joystick: fix COM failure path
  win32-joystick: nix unused variable
  win32-joystick: allow for unique selection of joysticks
  qfc: also draw line from function start while moving
  no need to save on tracking start anymore
  save axis opts, not just spline control points
  tracker: change centering order again
  fix typo
  cmake: don't say "opentrack" twice for osx build
  ui: really don't switch profiles while refreshing combobox
  pt: fix type mismatch
  ui: save prior to switching configs
  tracker_rs: adjusted tracker's name
  ui: don't reload settings if config wasn't changed
  ui: save everything before switching profiles
  options: return .ini basename easier
  tracker_rs: more readable icon
  tracker_rs: prevent potential thread starvation
  ui: switch to newly-created config
  ui: decruft
  ui: also bail on new config if its name is ".ini"
  ui: auto-refresh config list
  ui: display up to 20 profiles w/o scrolling
  ui: create an empty config properly in another code branch
  udp-tracker: silence harmless warning
  plugin-support: fix typo
  plugin-support: set more sane RTLD flags
  plugin-support: free modules from address space when needed
  ui: rename symbol to reflect current usage
  ui: move some slots to private
  ui, shortcuts: these are slots, actually
  ui: no need to write anything to new empty config
  ui: avoid potential memory leak
  ft: new game support
  game-data: chomp newlines in extractor
  ui: append extension in the right place
  simple-mat: fix arglist SFINAE
  simple-mat: can use static_cast here
  nix default empty config. it gets created on its own.
  ui: these aren't qt slots
  ui: nix wrong headers
  ui: remove GNU GPL
  ui: simplify condition
  props changed only
  main, ui: store config files in a predefined directory
  pt: show extracted points' areas and success count
  close dialogs on switch to new module
  ...

1 files changed, 67 insertions, 36 deletions

diff --git a/opentrack/simple-mat.hpp b/opentrack/simple-mat.hpp
index 7432e665..e462812b 100644
--- a/opentrack/simple-mat.hpp
+++ b/opentrack/simple-mat.hpp
@@ -41,66 +41,84 @@ namespace {
         enum { P = a == 1 ? 1 : 3 };
         enum { Q = a == 1 ? 3 : 1 };
     };
+
+    template<typename num, int h, int w, typename...ts>
+    struct is_arglist_correct
+    {
+        enum { value = h * w == sizeof...(ts) };
+    };
 }
 
 template<typename num, int h_, int w_>
-struct Mat
+class Mat
 {
+#ifdef __GNUC__
+    __restrict
+#endif
     num data[h_][w_];
+
+    static_assert(h_ > 0 && w_ > 0, "must have positive mat dimensions");
+
+    Mat(std::initializer_list<num>&& xs) = delete;
+
+public:
+
+    // parameters w_ and h_ are rebound so that SFINAE occurs
+    // removing them causes a compile-time error -sh 20150811
     
     template<int Q = w_> typename std::enable_if<equals<Q, 1, 0>::value, num>::type
-    __inline operator()(int i) const { return data[i][0]; }
+    inline operator()(int i) const { return data[i][0]; }
     
     template<int P = h_> typename std::enable_if<equals<P, 1, 1>::value, num>::type
-    __inline operator()(int i) const { return data[0][i]; }
+    inline operator()(int i) const { return data[0][i]; }
     
     template<int Q = w_> typename std::enable_if<equals<Q, 1, 2>::value, num&>::type
-    __inline operator()(int i) { return data[i][0]; }
+    inline operator()(int i) { return data[i][0]; }
     
     template<int P = h_> typename std::enable_if<equals<P, 1, 3>::value, num&>::type
-    __inline operator()(int i) { return data[0][i]; }
+    inline operator()(int i) { return data[0][i]; }
     
     template<int P = h_, int Q = w_> typename std::enable_if<maybe_add_swizzle<P, Q, 1>::value, num>::type
-    __inline x() const { return operator()(0); }
+    inline x() const { return operator()(0); }
     
     template<int P = h_, int Q = w_> typename std::enable_if<maybe_add_swizzle<P, Q, 2>::value, num>::type
-    __inline y() const { return operator()(1); }
+    inline y() const { return operator()(1); }
     
     template<int P = h_, int Q = w_> typename std::enable_if<maybe_add_swizzle<P, Q, 3>::value, num>::type
-    __inline z() const { return operator()(2); }
+    inline z() const { return operator()(2); }
     
     template<int P = h_, int Q = w_> typename std::enable_if<maybe_add_swizzle<P, Q, 4>::value, num>::type
-    __inline w() const { return operator()(3); }
+    inline w() const { return operator()(3); }
     
     template<int P = h_, int Q = w_> typename std::enable_if<maybe_add_swizzle<P, Q, 1>::value, num&>::type
-    __inline x() { return operator()(0); }
+    inline x() { return operator()(0); }
     
     template<int P = h_, int Q = w_> typename std::enable_if<maybe_add_swizzle<P, Q, 2>::value, num&>::type
-    __inline y() { return operator()(1); }
+    inline y() { return operator()(1); }
     
     template<int P = h_, int Q = w_> typename std::enable_if<maybe_add_swizzle<P, Q, 3>::value, num&>::type
-    __inline z() { return operator()(2); }
+    inline z() { return operator()(2); }
     
     template<int P = h_, int Q = w_> typename std::enable_if<maybe_add_swizzle<P, Q, 4>::value, num&>::type
-    __inline w() { return operator()(3); }
+    inline w() { return operator()(3); }
     
     template<int R, int S, int P = h_, int Q = w_>
     typename std::enable_if<is_vector_pair<R, S, P, Q>::value, num>::type
-    __inline dot(const Mat<num, R, S>& p2) const {
+    dot(const Mat<num, R, S>& p2) const {
         num ret = 0;
         constexpr int len = vector_len<R, S>::value;
         for (int i = 0; i < len; i++)
-            ret += operator()(i) * p2.operator ()(i);
+            ret += operator()(i) * p2(i);
         return ret;
     }
     
     template<int R, int S, int P = h_, int Q = w_>
     typename std::enable_if<is_dim3<P, Q, R, S>::value, Mat<num, is_dim3<P, Q, R, S>::P, is_dim3<P, Q, R, S>::Q>>::type
-    __inline cross(const Mat<num, R, S>& p2) const
+    cross(const Mat<num, R, S>& p2) const
     {
-        return Mat<num, R, S>({y() * p2.z() - p2.y() * z(),
-                               p2.x() * z() - x() * p2.z(),
-                               x() * p2.y() - y() * p2.x()});
+        return Mat<num, R, S>(y() * p2.z() - p2.y() * z(),
+                              p2.x() * z() - x() * p2.z(),
+                              x() * p2.y() - y() * p2.x());
     }
     
     Mat<num, h_, w_> operator+(const Mat<num, h_, w_>& other) const
@@ -108,7 +126,7 @@ struct Mat
         Mat<num, h_, w_> ret;
         for (int j = 0; j < h_; j++)
             for (int i = 0; i < w_; i++)
-                ret(j, i) = this->operator ()(j, i) + other(j, i);
+                ret(j, i) = data[j][i] + other.data[j][i];
         return ret;
     }
     
@@ -117,7 +135,7 @@ struct Mat
         Mat<num, h_, w_> ret;
         for (int j = 0; j < h_; j++)
             for (int i = 0; i < w_; i++)
-                ret(j, i) = this->operator ()(j, i) - other(j, i);
+                ret(j, i) = data[j][i] - other.data[j][i];
         return ret;
     }
     
@@ -126,7 +144,7 @@ struct Mat
         Mat<num, h_, w_> ret;
         for (int j = 0; j < h_; j++)
             for (int i = 0; i < w_; i++)
-                ret(j, i) = this->operator ()(j, i) + other;
+                ret(j, i) = data[j][i] + other;
         return ret;
     }
     
@@ -135,7 +153,7 @@ struct Mat
         Mat<num, h_, w_> ret;
         for (int j = 0; j < h_; j++)
             for (int i = 0; i < w_; i++)
-                ret(j, i) = this->operator ()(j, i) - other;
+                ret(j, i) = data[j][i] - other;
         return ret;
     }
     
@@ -144,7 +162,7 @@ struct Mat
         Mat<num, h_, w_> ret;
         for (int j = 0; j < h_; j++)
             for (int i = 0; i < w_; i++)
-                ret(j, i) = operator()(j, i) * other;
+                ret(j, i) = data[j][i] * other;
         return ret;
     }
     
@@ -158,30 +176,41 @@ struct Mat
                 num sum = num(0);
 
                 for (int k = 0; k < h_; k++)
-                    sum += data[j][k]*other.data[k][i];
+                    sum += data[j][k]*other(k, i);
 
-                ret.data[j][i] = sum;
+                ret(j, i) = sum;
             }
 
         return ret;
     }
 
-    __inline num operator()(int j, int i) const { return data[j][i]; }
-    __inline num& operator()(int j, int i) { return data[j][i]; }
+    inline num operator()(int j, int i) const { return data[j][i]; }
+    inline num& operator()(int j, int i) { return data[j][i]; }
 
-    Mat(std::initializer_list<num>&& list)
+    template<typename... ts, int h__ = h_, int w__ = w_,
+             typename = typename std::enable_if<is_arglist_correct<num, h__, w__, ts...>::value>::type>
+    Mat(ts const&... xs)
     {
-        auto iter = list.begin();
-        for (int i = 0; i < h_; i++)
-            for (int j = 0; j < w_; j++)
-                data[i][j] = *iter++;
+        const std::initializer_list<num> init = { static_cast<num>(xs)... };
+        auto iter = init.begin();
+        for (int j = 0; j < h_; j++)
+            for (int i = 0; i < w_; i++)
+                data[j][i] = *iter++;
+    }
+
+    template<typename t>
+    Mat(const t* xs)
+    {
+        for (int j = 0; j < h_; j++)
+            for (int i = 0; i < w_; i++)
+                data[j][i] = num(*xs++);
     }
 
     Mat()
     {
         for (int j = 0; j < h_; j++)
             for (int i = 0; i < w_; i++)
-                data[j][i] = 0;
+                data[j][i] = num(0);
     }
 
     Mat(const num* mem)
@@ -191,6 +220,8 @@ struct Mat
                 data[j][i] = mem[i*h_+j];
     }
 
+    Mat(num* mem) : Mat(const_cast<const num*>(mem)) {}
+
     // XXX add more operators as needed, third-party dependencies mostly
     // not needed merely for matrix algebra -sh 20141030
 
@@ -234,10 +265,10 @@ struct Mat
         if (std::abs(pitch_1) + std::abs(roll_1) + std::abs(yaw_1) > std::abs(pitch_2) + std::abs(roll_2) + std::abs(yaw_2))
         {
             bool fix_neg_pitch = pitch_1 < 0;
-            return dmat<3, 1>({yaw_2, std::fmod(fix_neg_pitch ? -pi - pitch_1 : pitch_2, pi), roll_2});
+            return dmat<3, 1>(yaw_2, std::fmod(fix_neg_pitch ? -pi - pitch_1 : pitch_2, pi), roll_2);
         }
         else
-            return dmat<3, 1>({yaw_1, pitch_1, roll_1});
+            return dmat<3, 1>(yaw_1, pitch_1, roll_1);
     }
     
     // tait-bryan angles, not euler