From fa48b03e334e4f70a8f8bac7c7df2513c1cba0b8 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 16 Jun 2014 03:00:26 +0200
Subject: Revert "lerp: didn't work at all, now does"

This reverts commit a21435cb6fe163d6579f3fd3d42ad11c54037036.
---
 facetracknoir/lerp.hpp | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/facetracknoir/lerp.hpp b/facetracknoir/lerp.hpp
index 0123832a..70d5995c 100644
--- a/facetracknoir/lerp.hpp
+++ b/facetracknoir/lerp.hpp
@@ -2,52 +2,37 @@
 
 #include "facetracknoir/timer.hpp"
 #include <algorithm>
-#include <cmath>
 
 class lerp {
 private:
-    static const constexpr double eps = 1e-2;
-    double last[2][6], cam[6], dt;
+    double last[2][6], dt;
     Timer t;
 public:
     lerp() :
-        last { {0,0,0,0,0,0}, {0,0,0,0,0,0} }, cam {0,0,0,0,0,0}, dt(1)
+        last { {0,0,0,0,0,0}, {0,0,0,0,0,0} }, dt(1)
     {
     }
     bool idempotentp(const double* input)
     {
         for (int i = 0; i < 6; i++)
-        {
-            double diff = fabs(cam[i] - input[i]);
-            if (diff > eps)
+            if (last[0][i] != input[i])
                 return false;
-        }
         return true;
     }
 
-    void write(const double* cam_, const double* input, double* output)
+    void write(const double* input, double* output)
     {
-        const double q = t.elapsed();
-        const double d = q/dt;
+        const double q = dt;
+        dt = std::max(1, t.start());
 
-        bool idem = idempotentp(cam_);
+        const double c = std::max(std::min(1.0, q/(double)dt), 0.0);
 
-        if (!idem)
+        for (int i = 0; i < 6; i++)
         {
-            dt = q;
-            t.start();
+            last[1][i] = last[0][i];
+            last[0][i] = input[i];
         }
 
-        const double c = std::max(std::min(1.0, d), 0.0);
-
-        if (!idem)
-            for (int i = 0; i < 6; i++)
-            {
-                last[1][i] = last[0][i];
-                last[0][i] = input[i];
-                cam[i] = cam_[i];
-            }
-
         for (int i = 0; i < 6; i++)
             output[i] = last[1][i] + (last[0][i] - last[1][i]) * c;
     }
-- 
cgit v1.2.3