Fix incorrect logic for rolling shutter 2D point blend.

The operator precedence was incorrect from my previous change.
david-cattermole · Dec 19, 2022 · 92011b8 · 92011b8
1 parent 3b4844e
commit 92011b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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