Skip to content

Transform your 3D texturing workflow with the power of generative AI, directly within Blender!

keep the pixel budget when Add Cameras squares the scene

sakalondf0338a0b4262
diff --git a/stablegen/cameras/geometry.py b/stablegen/cameras/geometry.py
index a856083..5f22c7c 100644
--- a/stablegen/cameras/geometry.py
+++ b/stablegen/cameras/geometry.py
@@ -805,6 +805,28 @@ def _get_resolution_align(context):
return 8
+def _pixel_budget(scene):
+ """Pixel count the user's own resolution asks for. Per-camera aspect
+ replaces the scene resolution with a display square, so while that square
+ is still in place, return the budget it stood in for (#129)."""
+ render = scene.render
+ square = scene.get('sg_display_square')
+ if (square and 'sg_pixel_budget' in scene
+ and render.resolution_x == render.resolution_y == int(square)):
+ return int(scene['sg_pixel_budget'])
+ return render.resolution_x * render.resolution_y
+
+
+def _set_display_square(scene, side):
+ """Set the scene to a *side* square so every camera's crop fits the
+ viewport, remembering the pixel budget it replaces."""
+ budget = _pixel_budget(scene)
+ scene.render.resolution_x = side
+ scene.render.resolution_y = side
+ scene['sg_pixel_budget'] = budget
+ scene['sg_display_square'] = side
+
+
def _apply_auto_aspect(directions_np, context, verts_world):
"""Adjust scene render resolution to match the mesh's average apparent
aspect ratio across the given camera *directions_np*. This is the
@@ -817,7 +839,7 @@ def _apply_auto_aspect(directions_np, context, verts_world):
avg_aspect = float(np.mean(aspects))
render = context.scene.render
- total_px = render.resolution_x * render.resolution_y
+ total_px = _pixel_budget(context.scene)
align = _get_resolution_align(context)
new_x, new_y = _resolution_from_aspect(avg_aspect, total_px, align=align)
render.resolution_x = new_x
diff --git a/stablegen/cameras/operators.py b/stablegen/cameras/operators.py
index 6242dbf..dfefad6 100644
--- a/stablegen/cameras/operators.py
+++ b/stablegen/cameras/operators.py
@@ -14,7 +14,8 @@ from .geometry import (
_gather_target_meshes, _get_mesh_verts_world,
_compute_per_camera_aspect, _resolution_from_aspect,
_get_fov, _compute_silhouette_distance, _perspective_aspect,
- _camera_basis, _rotation_from_basis, _get_resolution_align
+ _camera_basis, _rotation_from_basis, _get_resolution_align,
+ _pixel_budget, _set_display_square,
)
import numpy as np
@@ -53,8 +54,7 @@ class ApplyAutoAspect(bpy.types.Operator):
center_np = center_for_aspect
center_vec = mathutils.Vector(center_np.tolist())
- render = context.scene.render
- total_px = render.resolution_x * render.resolution_y
+ total_px = _pixel_budget(context.scene)
align = _get_resolution_align(context)
updated_count = 0
@@ -111,9 +111,8 @@ class ApplyAutoAspect(bpy.types.Operator):
for c in all_sg_cams
)
if max_side > 0:
- context.scene.render.resolution_x = max_side
- context.scene.render.resolution_y = max_side
-
+ _set_display_square(context.scene, max_side)
+
self.report({'INFO'}, f"Applied Auto Aspect to {updated_count} camera(s)")
return {'FINISHED'}
diff --git a/stablegen/cameras/overlays.py b/stablegen/cameras/overlays.py
index c099ca1..934780f 100644
--- a/stablegen/cameras/overlays.py
+++ b/stablegen/cameras/overlays.py
@@ -9,7 +9,7 @@ from bpy_extras.view3d_utils import location_3d_to_region_2d
from gpu_extras.batch import batch_for_shader
from ..texturing.view_plan import generation_cameras, order_cameras
-from .geometry import _get_camera_resolution
+from .geometry import _get_camera_resolution, _set_display_square
from . import prompt_overlay
_ADDON_PKG = __package__.rsplit('.', 1)[0]
@@ -567,8 +567,7 @@ def _sg_restore_square_display(scene):
for c in cameras
)
if max_side > 0:
- scene.render.resolution_x = max_side
- scene.render.resolution_y = max_side
+ _set_display_square(scene, max_side)
# Refresh viewports
for area in bpy.context.screen.areas if bpy.context.screen else []:
if area.type == 'VIEW_3D':
diff --git a/stablegen/cameras/placement.py b/stablegen/cameras/placement.py
index 0f4c4b7..051dfab 100644
--- a/stablegen/cameras/placement.py
+++ b/stablegen/cameras/placement.py
@@ -19,8 +19,8 @@ from .geometry import (
_occ_fom_generator, _occ_tpr_generator,
_sort_directions_spatially, _classify_camera_direction,
_compute_per_camera_aspect, _perspective_aspect, _resolution_from_aspect,
- _get_resolution_align, _apply_auto_aspect,
- _store_per_camera_resolution, _get_fov,
+ _get_resolution_align, _apply_auto_aspect, _pixel_budget,
+ _set_display_square, _store_per_camera_resolution, _get_fov,
)
from .overlays import (
_sg_hide_label_overlay, _sg_remove_label_overlay,
@@ -758,7 +758,7 @@ class AddCameras(bpy.types.Operator):
f"(merged {n_before - len(directions)} near-duplicates)")
render = context.scene.render
- total_px = render.resolution_x * render.resolution_y
+ total_px = _pixel_budget(context.scene)
center_np_for_aspect = verts_world.mean(axis=0)
if self.auto_aspect == 'shared' and directions:
@@ -1102,8 +1102,7 @@ class AddCameras(bpy.types.Operator):
) if self._cameras else max(context.scene.render.resolution_x,
context.scene.render.resolution_y)
if max_side > 0:
- context.scene.render.resolution_x = max_side
- context.scene.render.resolution_y = max_side
+ _set_display_square(context.scene, max_side)
@staticmethod
def _copy_camera_settings(cam_obj, cam_settings):