forgecad 0.9.4 → 0.9.6

package/dist-cli/blender/render.py

@@ -28,7 +28,7 @@ import sys
 import json
 import math
 import os
-from mathutils import Vector
+from mathutils import Matrix, Vector
 
 
 # ---------------------------------------------------------------------------
@@ -414,18 +414,26 @@ def setup_camera(config, objects):
 
     cam_config = config.get('camera') or {}
 
-    # Set FOV
-    fov = cam_config.get('fov', 45)
-    cam_data.lens_unit = 'FOV'
-    cam_data.angle = math.radians(fov)
+    projection_mode = cam_config.get('projectionMode') or cam_config.get('type') or 'perspective'
+    if projection_mode == 'orthographic':
+        cam_data.type = 'ORTHO'
+        if cam_config.get('orthoScale'):
+            cam_data.ortho_scale = float(cam_config['orthoScale'])
+        elif cam_config.get('orthoZoom'):
+            cam_data.ortho_scale = 960.0 / float(cam_config['orthoZoom'])
+        else:
+            cam_data.ortho_scale = 960.0
+    else:
+        cam_data.type = 'PERSP'
+        fov = cam_config.get('fov', 45)
+        cam_data.lens_unit = 'FOV'
+        cam_data.angle = math.radians(fov)
 
     if cam_config.get('position') and cam_config.get('target'):
         pos = Vector(cam_config['position'])
         target = Vector(cam_config['target'])
         cam_obj.location = pos
-        direction = target - pos
-        rot_quat = direction.to_track_quat('-Z', 'Y')
-        cam_obj.rotation_euler = rot_quat.to_euler()
+        set_camera_orientation(cam_obj, pos, target, cam_config.get('up'))
     else:
         # Auto-frame: compute bounding box of all mesh objects
         auto_frame_camera(cam_obj, objects)
@@ -433,6 +441,33 @@ def setup_camera(config, objects):
     return cam_obj
 
 
+def set_camera_orientation(cam_obj, pos, target, up_values=None):
+    direction = target - pos
+    if direction.length <= 1e-8:
+        return
+
+    if up_values:
+        forward = direction.normalized()
+        up = Vector(up_values)
+        if up.length > 1e-8:
+            up.normalize()
+            right = up.cross(forward)
+            if right.length > 1e-8:
+                right.normalize()
+                true_up = forward.cross(right)
+                true_up.normalize()
+                rotation = Matrix((
+                    (right.x, true_up.x, -forward.x),
+                    (right.y, true_up.y, -forward.y),
+                    (right.z, true_up.z, -forward.z),
+                ))
+                cam_obj.rotation_euler = rotation.to_euler()
+                return
+
+    rot_quat = direction.to_track_quat('-Z', 'Y')
+    cam_obj.rotation_euler = rot_quat.to_euler()
+
+
 def auto_frame_camera(cam_obj, objects):
     """Position camera to frame all objects nicely — iso view."""
     if not objects: