From 92011b85f91eb5e626e383017aa14636d6ff12ff Mon Sep 17 00:00:00 2001 From: David Cattermole Date: Mon, 19 Dec 2022 17:25:25 +1100 Subject: [PATCH] Fix incorrect logic for rolling shutter 2D point blend. The operator precedence was incorrect from my previous change. --- share/3dequalizer/python/uvtrack_format.py | 3 ++- share/3dequalizer/scriptdb/copy_track_mmsolver.py | 3 ++- share/3dequalizer/scriptdb/export_track_mmsolver.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/share/3dequalizer/python/uvtrack_format.py b/share/3dequalizer/python/uvtrack_format.py index f38c44cda..8ee90f9d0 100644 --- a/share/3dequalizer/python/uvtrack_format.py +++ b/share/3dequalizer/python/uvtrack_format.py @@ -197,8 +197,9 @@ def _apply_rs_correction(dt, q_minus, q_center, q_plus): a = q_center b = q_plus - q_minus b = vl_sdv.vec3d(b[0] / 2.0, b[1] / 2.0, b[2] / 2.0) - c = -q_center + (q_plus + q_minus) + c = q_plus + q_minus c = vl_sdv.vec3d(c[0] / 2.0, c[1] / 2.0, c[2] / 2.0) + c = -q_center + c return a + dt * b + dt * dt * c diff --git a/share/3dequalizer/scriptdb/copy_track_mmsolver.py b/share/3dequalizer/scriptdb/copy_track_mmsolver.py index 28d79a38f..8cf8a6f16 100644 --- a/share/3dequalizer/scriptdb/copy_track_mmsolver.py +++ b/share/3dequalizer/scriptdb/copy_track_mmsolver.py @@ -286,8 +286,9 @@ def _apply_rs_correction(dt, q_minus, q_center, q_plus): a = q_center b = q_plus - q_minus b = vl_sdv.vec3d(b[0] / 2.0, b[1] / 2.0, b[2] / 2.0) - c = -q_center + (q_plus + q_minus) + c = q_plus + q_minus c = vl_sdv.vec3d(c[0] / 2.0, c[1] / 2.0, c[2] / 2.0) + c = -q_center + c return a + dt * b + dt * dt * c diff --git a/share/3dequalizer/scriptdb/export_track_mmsolver.py b/share/3dequalizer/scriptdb/export_track_mmsolver.py index 1b1103b90..f96de1665 100644 --- a/share/3dequalizer/scriptdb/export_track_mmsolver.py +++ b/share/3dequalizer/scriptdb/export_track_mmsolver.py @@ -296,8 +296,9 @@ def _apply_rs_correction(dt, q_minus, q_center, q_plus): a = q_center b = q_plus - q_minus b = vl_sdv.vec3d(b[0] / 2.0, b[1] / 2.0, b[2] / 2.0) - c = -q_center + (q_plus + q_minus) + c = q_plus + q_minus c = vl_sdv.vec3d(c[0] / 2.0, c[1] / 2.0, c[2] / 2.0) + c = -q_center + c return a + dt * b + dt * dt * c