accela: fix bugs introducing lack of idempotence

sq

2 files changed, 7 insertions, 28 deletions

diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
index 31cb94bd..9fcf4b92 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
@@ -23,16 +23,6 @@ static inline double parabola(const double a, const double x, const double dz, c
     return a1 * pow(std::max<double>(fabs(x) - dz, 0), expt) * sign;

 }

 

-template<typename T>

-static inline T clamp(const T min, const T max, const T value)

-{

-    if (value < min)

-        return min;

-    if (value > max)

-        return max;

-    return value;

-}

-

 void FTNoIR_Filter::FilterHeadPoseData(const double* target_camera_position,

                                        double *new_camera_position)

 {

@@ -46,8 +36,6 @@ void FTNoIR_Filter::FilterHeadPoseData(const double* target_camera_position,
                 last_output[j][i] = target_camera_position[i];

         }

 

-        timer.start();

-        frame_delta = 1;

         first_run = false;

 		return;

 	}

@@ -63,19 +51,15 @@ void FTNoIR_Filter::FilterHeadPoseData(const double* target_camera_position,
         }

     }

 

-    if (new_frame)

+    if (!new_frame)

     {

         for (int i = 0; i < 6; i++)

-            last_input[i] = target_camera_position[i];

-        frame_delta = timer.start();

-    } else {

-        auto d = timer.elapsed();

-        double c = clamp(0.0, 1.0, d / (double) frame_delta);

-        for (int i = 0; i < 6; i++)

-            new_camera_position[i] =

-                    last_output[1][i] + (last_output[0][i] - last_output[1][i]) * c;

+            new_camera_position[i] = last_output[0][i];

         return;

     }

+

+    for (int i = 0; i < 6; i++)

+        last_input[i] = target_camera_position[i];

     

     for (int i=0;i<6;i++)

 	{

@@ -93,10 +77,9 @@ void FTNoIR_Filter::FilterHeadPoseData(const double* target_camera_position,
                 parabola(a3, vec3, deadzone, s.expt);

         const double result = last_output[0][i] + velocity;

         const bool done = sign > 0 ? result >= target_camera_position[i] : result <= target_camera_position[i];

-        new_camera_position[i] = done ? target_camera_position[i] : result;

         last_output[2][i] = last_output[1][i];

         last_output[1][i] = last_output[0][i];

-        last_output[0][i] = new_camera_position[i];

+        last_output[0][i] = new_camera_position[i] = done ? target_camera_position[i] : result;

 	}

 }

 

diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.h b/ftnoir_filter_accela/ftnoir_filter_accela.h
index 5c89c744..8cf7fe66 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.h
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.h
@@ -3,7 +3,6 @@
 #include "ui_ftnoir_accela_filtercontrols.h"

 #include "facetracknoir/global-settings.h"

 #include <QMutex>

-#include "facetracknoir/timer.hpp"

 

 #define ACCELA_SMOOTHING_ROTATION 60.0

 #define ACCELA_SMOOTHING_TRANSLATION 40.0

@@ -49,10 +48,7 @@ public:
 private:

     settings s;

 	bool first_run;

-    double last_input[6];

-    double last_output[3][6];

-    Timer timer;

-    qint64 frame_delta;

+    double last_input[6], last_output[3][6];

 };

 

 class FilterControls: public QWidget, public IFilterDialog