diff options
Diffstat (limited to 'ftnoir_filter_accela')
| -rw-r--r-- | ftnoir_filter_accela/ftnoir_filter_accela.cpp | 63 | ||||
| -rw-r--r-- | ftnoir_filter_accela/ftnoir_filter_accela.h | 5 |
2 files changed, 26 insertions, 42 deletions
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp index 9fcf4b92..a82ff077 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp @@ -30,57 +30,40 @@ void FTNoIR_Filter::FilterHeadPoseData(const double* target_camera_position, {
for (int i = 0; i < 6; i++)
{
- new_camera_position[i] = target_camera_position[i];
- last_input[i] = target_camera_position[i];
for (int j = 0; j < 3; j++)
last_output[j][i] = target_camera_position[i];
+ l.write(target_camera_position, new_camera_position);
}
first_run = false;
- return;
- }
-
- bool new_frame = false;
+ return;
+ }
- for (int i = 0; i < 6; i++)
+ if (!l.idempotentp(target_camera_position))
{
- if (target_camera_position[i] != last_input[i])
+ for (int i=0;i<6;i++)
{
- new_frame = true;
- break;
+ const double vec = target_camera_position[i] - last_output[0][i];
+ const double vec2 = target_camera_position[i] - last_output[1][i];
+ const double vec3 = target_camera_position[i] - last_output[2][i];
+ const int sign = vec < 0 ? -1 : 1;
+ const double a = i >= 3 ? s.rotation_alpha : s.translation_alpha;
+ const double a2 = a * s.second_order_alpha;
+ const double a3 = a * s.third_order_alpha;
+ const double deadzone = i >= 3 ? s.rot_deadzone : s.trans_deadzone;
+ const double velocity =
+ parabola(a, vec, deadzone, s.expt) +
+ parabola(a2, vec2, deadzone, s.expt) +
+ 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];
+ last_output[2][i] = last_output[1][i];
+ last_output[1][i] = last_output[0][i];
+ last_output[0][i] = done ? target_camera_position[i] : result;
}
}
- if (!new_frame)
- {
- for (int i = 0; i < 6; i++)
- 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++)
- {
- const double vec = target_camera_position[i] - last_output[0][i];
- const double vec2 = target_camera_position[i] - last_output[1][i];
- const double vec3 = target_camera_position[i] - last_output[2][i];
- const int sign = vec < 0 ? -1 : 1;
- const double a = i >= 3 ? s.rotation_alpha : s.translation_alpha;
- const double a2 = a * s.second_order_alpha;
- const double a3 = a * s.third_order_alpha;
- const double deadzone = i >= 3 ? s.rot_deadzone : s.trans_deadzone;
- const double velocity =
- parabola(a, vec, deadzone, s.expt) +
- parabola(a2, vec2, deadzone, s.expt) +
- 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];
- last_output[2][i] = last_output[1][i];
- last_output[1][i] = last_output[0][i];
- last_output[0][i] = new_camera_position[i] = done ? target_camera_position[i] : result;
- }
+ l.write(last_output[0], new_camera_position);
}
extern "C" FTNOIR_FILTER_BASE_EXPORT IFilter* CALLING_CONVENTION GetConstructor()
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.h b/ftnoir_filter_accela/ftnoir_filter_accela.h index 8cf7fe66..2187fd01 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.h +++ b/ftnoir_filter_accela/ftnoir_filter_accela.h @@ -2,6 +2,7 @@ #include "ftnoir_filter_base/ftnoir_filter_base.h"
#include "ui_ftnoir_accela_filtercontrols.h"
#include "facetracknoir/global-settings.h"
+#include "facetracknoir/lerp.hpp"
#include <QMutex>
#define ACCELA_SMOOTHING_ROTATION 60.0
@@ -44,11 +45,11 @@ public: void receiveSettings() {
s.b->reload();
}
-
private:
+ lerp l;
settings s;
bool first_run;
- double last_input[6], last_output[3][6];
+ double last_output[3][6];
};
class FilterControls: public QWidget, public IFilterDialog
|