Set the Rolling Shutter Content Distance parameter in 3DE4 R6+.

Issue #128.
david-cattermole · Dec 5, 2020 · 43f5f68 · 43f5f68
1 parent 8a7b608
commit 43f5f68
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/3dequalizer/python/export_track_mmsolver.py b/3dequalizer/python/export_track_mmsolver.py
@@ -107,10 +107,7 @@ def main():
         if rs_enabled is True:
             rs_distance = tde4.getWidgetValue(req, 'rs_distance_widget')
             rs_distance = float(rs_distance)
-            with_project_notes = uvtrack_format.SUPPORT_PROJECT_NOTES
-            with_rs_distance = uvtrack_format.SUPPORT_RS_DISTANCE
-            if with_project_notes is True and with_rs_distance is False:
-                uvtrack_format.set_rs_distance_into_project_notes(rs_distance)
+            uvtrack_format.set_rs_distance(camera, rs_distance)
 
         # Generate file contents
         data_str = uvtrack_format.generate(

diff --git a/3dequalizer/python/uvtrack_format.py b/3dequalizer/python/uvtrack_format.py
@@ -145,6 +145,7 @@ def set_rs_distance_into_project_notes(rs_distance):
 
 def get_rs_distance(camera):
     if SUPPORT_RS_DISTANCE is True:
+        # For 3DE4 Release 6 and above.
         rs_distance = tde4.getCameraRollingShutterContentDistance(camera)
     else:
         # For 3DE4 Release 5 and below, use the default content
@@ -156,6 +157,18 @@ def get_rs_distance(camera):
     return rs_distance
 
 
+def set_rs_distance(camera, rs_distance):
+    assert isinstance(rs_distance, float)
+    if SUPPORT_RS_DISTANCE is True:
+        # For 3DE4 Release 6 and above.
+        tde4.setCameraRollingShutterContentDistance(camera, rs_distance)
+    elif SUPPORT_PROJECT_NOTES is True:
+        # For 3DE4 Release 2 to Release 5 (with support for project
+        # notes), set a special tag in the 3DE project notes.
+        set_rs_distance_into_project_notes(rs_distance)
+    return
+
+
 def _apply_rs_correction(dt, q_minus, q_center, q_plus):
     """
     Apply time-blend between three different 3D positions.

diff --git a/3dequalizer/scriptdb/export_track_mmsolver.py b/3dequalizer/scriptdb/export_track_mmsolver.py
@@ -150,10 +150,7 @@ def main():
         if rs_enabled is True:
             rs_distance = tde4.getWidgetValue(req, 'rs_distance_widget')
             rs_distance = float(rs_distance)
-            with_project_notes = SUPPORT_PROJECT_NOTES
-            with_rs_distance = SUPPORT_RS_DISTANCE
-            if with_project_notes is True and with_rs_distance is False:
-                set_rs_distance_into_project_notes(rs_distance)
+            set_rs_distance(camera, rs_distance)
 
         # Generate file contents
         data_str = generate(
@@ -247,6 +244,7 @@ def set_rs_distance_into_project_notes(rs_distance):
 
 def get_rs_distance(camera):
     if SUPPORT_RS_DISTANCE is True:
+        # For 3DE4 Release 6 and above.
         rs_distance = tde4.getCameraRollingShutterContentDistance(camera)
     else:
         # For 3DE4 Release 5 and below, use the default content
@@ -258,6 +256,18 @@ def get_rs_distance(camera):
     return rs_distance
 
 
+def set_rs_distance(camera, rs_distance):
+    assert isinstance(rs_distance, float)
+    if SUPPORT_RS_DISTANCE is True:
+        # For 3DE4 Release 6 and above.
+        tde4.setCameraRollingShutterContentDistance(camera, rs_distance)
+    elif SUPPORT_PROJECT_NOTES is True:
+        # For 3DE4 Release 2 to Release 5 (with support for project
+        # notes), set a special tag in the 3DE project notes.
+        set_rs_distance_into_project_notes(rs_distance)
+    return
+
+
 def _apply_rs_correction(dt, q_minus, q_center, q_plus):
     """
     Apply time-blend between three different 3D positions.