From f50ef9ca768f676c38fb7f24c15d38e2f72126fb Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 12 Oct 2014 00:29:05 +0200
Subject: simplify, rename infix operator

---
 facetracknoir/pose.hpp | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

(limited to 'facetracknoir/pose.hpp')

diff --git a/facetracknoir/pose.hpp b/facetracknoir/pose.hpp
index d925c0a89..41e984f56 100644
--- a/facetracknoir/pose.hpp
+++ b/facetracknoir/pose.hpp
@@ -33,34 +33,12 @@ public:
         return ret;
     }
 
-    Pose operator-(const Pose& B) const
+    Pose operator&(const Pose& B) const
     {
-        const Quat q = (quat() * B.quat().inv());
+        const Quat q = quat() * B.quat().inv();
         Pose ret = fromQuat(q);
-        for (int i = TX; i < Yaw; i++)
-            ret(i) = B(i);
-        return ret;
-    }
-
-    Pose operator+(const Pose& B) const
-    {
-        const Quat q = quat() * B.quat();
-        Pose ret = fromQuat(q);
-        for (int i = TX; i < Yaw; i++)
-            ret(i) = B(i);
-        return ret;
-    }
-
-    Pose operator|(const Pose& replacement) const
-    {
-        Pose ret = *this;
-        for (int i = 0; i < 6; i++)
-        {
-            static constexpr double eps = 1e-3;
-            // NB replace zero-valued elements with argument's
-            if (std::abs(ret(i)) < eps)
-                ret(i) = replacement(i);
-        }
+        for (int i = TX; i < TX + 3; i++)
+            ret(i) = axes[i] - B.axes[i];
         return ret;
     }
 };
-- 
cgit v1.2.3