diff options
Diffstat (limited to 'intern/cycles/blender/addon')
| -rw-r--r-- | intern/cycles/blender/addon/camera.py | 84 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/engine.py | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 57 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 38 |
4 files changed, 152 insertions, 29 deletions
diff --git a/intern/cycles/blender/addon/camera.py b/intern/cycles/blender/addon/camera.py new file mode 100644 index 00000000000..d4133796875 --- /dev/null +++ b/intern/cycles/blender/addon/camera.py @@ -0,0 +1,84 @@ +# +# Copyright 2011-2021 Blender Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# <pep8 compliant> + +# Fit to match default projective camera with focal_length 50 and sensor_width 36. +default_fisheye_polynomial = [-1.1735143712967577e-05, + -0.019988736953434998, + -3.3525322965709175e-06, + 3.099275275886036e-06, + -2.6064646454854524e-08] + +# Utilities to generate lens polynomials to match built-in camera types, only here +# for reference at the moment, not used by the code. +def create_grid(sensor_height, sensor_width): + import numpy as np + if sensor_height is None: + sensor_height = sensor_width / (16 / 9) # Default aspect ration 16:9 + uu, vv = np.meshgrid(np.linspace(0, 1, 100), np.linspace(0, 1, 100)) + uu = (uu - 0.5) * sensor_width + vv = (vv - 0.5) * sensor_height + rr = np.sqrt(uu ** 2 + vv ** 2) + return rr + + +def fisheye_lens_polynomial_from_projective(focal_length=50, sensor_width=36, sensor_height=None): + import numpy as np + rr = create_grid(sensor_height, sensor_width) + polynomial = np.polyfit(rr.flat, (-np.arctan(rr / focal_length)).flat, 4) + return list(reversed(polynomial)) + + +def fisheye_lens_polynomial_from_projective_fov(fov, sensor_width=36, sensor_height=None): + import numpy as np + f = sensor_width / 2 / np.tan(fov / 2) + return fisheye_lens_polynomial_from_projective(f, sensor_width, sensor_height) + + +def fisheye_lens_polynomial_from_equisolid(lens=10.5, sensor_width=36, sensor_height=None): + import numpy as np + rr = create_grid(sensor_height, sensor_width) + x = rr.reshape(-1) + x = np.stack([x**i for i in [1, 2, 3, 4]]) + y = (-2 * np.arcsin(rr / (2 * lens))).reshape(-1) + polynomial = np.linalg.lstsq(x.T, y.T, rcond=None)[0] + return [0] + list(polynomial) + + +def fisheye_lens_polynomial_from_equidistant(fov=180, sensor_width=36, sensor_height=None): + import numpy as np + return [0, -np.radians(fov) / sensor_width, 0, 0, 0] + + +def fisheye_lens_polynomial_from_distorted_projective_polynomial(k1, k2, k3, focal_length=50, sensor_width=36, sensor_height=None): + import numpy as np + rr = create_grid(sensor_height, sensor_width) + r2 = (rr / focal_length) ** 2 + r4 = r2 * r2 + r6 = r4 * r2 + r_coeff = 1 + k1 * r2 + k2 * r4 + k3 * r6 + polynomial = np.polyfit(rr.flat, (-np.arctan(rr / focal_length * r_coeff)).flat, 4) + return list(reversed(polynomial)) + +def fisheye_lens_polynomial_from_distorted_projective_divisions(k1, k2, focal_length=50, sensor_width=36, sensor_height=None): + import numpy as np + rr = create_grid(sensor_height, sensor_width) + r2 = (rr / focal_length) ** 2 + r4 = r2 * r2 + r_coeff = 1 + k1 * r2 + k2 * r4 + polynomial = np.polyfit(rr.flat, (-np.arctan(rr / focal_length / r_coeff)).flat, 4) + return list(reversed(polynomial)) diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index e5bb77a834a..910ac4a373e 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -28,7 +28,7 @@ def _configure_argument_parser(): action='store_true') parser.add_argument("--cycles-device", help="Set the device to use for Cycles, overriding user preferences and the scene setting." - "Valid options are 'CPU', 'CUDA', 'OPTIX', or 'HIP'" + "Valid options are 'CPU', 'CUDA', 'OPTIX', 'HIP' or 'METAL'." "Additionally, you can append '+CPU' to any GPU type for hybrid rendering.", default=None) return parser diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 1e267ccdf4a..a7deae2c05d 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -33,6 +33,7 @@ from math import pi # enums from . import engine +from . import camera enum_devices = ( ('CPU', "CPU", "Use CPU for rendering"), @@ -72,6 +73,8 @@ enum_panorama_types = ( ('FISHEYE_EQUISOLID', "Fisheye Equisolid", "Similar to most fisheye modern lens, takes sensor dimensions into consideration"), ('MIRRORBALL', "Mirror Ball", "Uses the mirror ball mapping"), + ('FISHEYE_LENS_POLYNOMIAL', "Fisheye Lens Polynomial", + "Defines the lens projection as polynomial to allow real world camera lenses to be mimicked."), ) enum_curve_shape = ( @@ -111,7 +114,8 @@ enum_device_type = ( ('CPU', "CPU", "CPU", 0), ('CUDA', "CUDA", "CUDA", 1), ('OPTIX', "OptiX", "OptiX", 3), - ("HIP", "HIP", "HIP", 4) + ('HIP', "HIP", "HIP", 4), + ('METAL', "Metal", "Metal", 5) ) enum_texture_limit = ( @@ -359,7 +363,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): name="Scrambling Distance", default=1.0, min=0.0, max=1.0, - description="Lower values give faster rendering with GPU rendering and less noise with all devices at the cost of possible artifacts if set too low. Only works when not using adaptive sampling", + description="Reduce randomization between pixels to improve GPU rendering performance, at the cost of possible rendering artifacts if set too low. Only works when not using adaptive sampling", ) preview_scrambling_distance: BoolProperty( name="Scrambling Distance viewport", @@ -367,10 +371,10 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): description="Uses the Scrambling Distance value for the viewport. Faster but may flicker", ) - adaptive_scrambling_distance: BoolProperty( - name="Adaptive Scrambling Distance", + auto_scrambling_distance: BoolProperty( + name="Automatic Scrambling Distance", default=False, - description="Uses a formula to adapt the scrambling distance strength based on the sample count", + description="Automatically reduce the randomization between pixels to improve GPU rendering performance, at the cost of possible rendering artifacts. Only works when not using adaptive sampling", ) use_layer_samples: EnumProperty( @@ -429,7 +433,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): ) direct_light_sampling_type: EnumProperty( - name="Direct Light Sampling Type", + name="Direct Light Sampling", description="The type of strategy used for sampling direct light contributions", items=enum_direct_light_sampling_type, default='MULTIPLE_IMPORTANCE_SAMPLING', @@ -790,8 +794,8 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): ) use_auto_tile: BoolProperty( - name="Auto Tiles", - description="Automatically render high resolution images in tiles to reduce memory usage, using the specified tile size. Tiles are cached to disk while rendering to save memory", + name="Use Tiling", + description="Render high resolution images in tiles to reduce memory usage, using the specified tile size. Tiles are cached to disk while rendering to save memory", default=True, ) tile_size: IntProperty( @@ -890,6 +894,32 @@ class CyclesCameraSettings(bpy.types.PropertyGroup): default=pi, ) + fisheye_polynomial_k0: FloatProperty( + name="Fisheye Polynomial K0", + description="Coefficient K0 of the lens polinomial", + default=camera.default_fisheye_polynomial[0], precision=6, step=0.1, subtype='ANGLE', + ) + fisheye_polynomial_k1: FloatProperty( + name="Fisheye Polynomial K1", + description="Coefficient K1 of the lens polinomial", + default=camera.default_fisheye_polynomial[1], precision=6, step=0.1, subtype='ANGLE', + ) + fisheye_polynomial_k2: FloatProperty( + name="Fisheye Polynomial K2", + description="Coefficient K2 of the lens polinomial", + default=camera.default_fisheye_polynomial[2], precision=6, step=0.1, subtype='ANGLE', + ) + fisheye_polynomial_k3: FloatProperty( + name="Fisheye Polynomial K3", + description="Coefficient K3 of the lens polinomial", + default=camera.default_fisheye_polynomial[3], precision=6, step=0.1, subtype='ANGLE', + ) + fisheye_polynomial_k4: FloatProperty( + name="Fisheye Polynomial K4", + description="Coefficient K4 of the lens polinomial", + default=camera.default_fisheye_polynomial[4], precision=6, step=0.1, subtype='ANGLE', + ) + @classmethod def register(cls): bpy.types.Camera.cycles = PointerProperty( @@ -1312,8 +1342,7 @@ class CyclesPreferences(bpy.types.AddonPreferences): def get_device_types(self, context): import _cycles - has_cuda, has_optix, has_hip = _cycles.get_device_types() - + has_cuda, has_optix, has_hip, has_metal = _cycles.get_device_types() list = [('NONE', "None", "Don't use compute device", 0)] if has_cuda: list.append(('CUDA', "CUDA", "Use CUDA for GPU acceleration", 1)) @@ -1321,6 +1350,8 @@ class CyclesPreferences(bpy.types.AddonPreferences): list.append(('OPTIX', "OptiX", "Use OptiX for GPU acceleration", 3)) if has_hip: list.append(('HIP', "HIP", "Use HIP for GPU acceleration", 4)) + if has_metal: + list.append(('METAL', "Metal", "Use Metal for GPU acceleration", 5)) return list @@ -1346,7 +1377,7 @@ class CyclesPreferences(bpy.types.AddonPreferences): def update_device_entries(self, device_list): for device in device_list: - if not device[1] in {'CUDA', 'OPTIX', 'CPU', 'HIP'}: + if not device[1] in {'CUDA', 'OPTIX', 'CPU', 'HIP', 'METAL'}: continue # Try to find existing Device entry entry = self.find_existing_device_entry(device) @@ -1390,7 +1421,7 @@ class CyclesPreferences(bpy.types.AddonPreferences): import _cycles # Ensure `self.devices` is not re-allocated when the second call to # get_devices_for_type is made, freeing items from the first list. - for device_type in ('CUDA', 'OPTIX', 'HIP'): + for device_type in ('CUDA', 'OPTIX', 'HIP', 'METAL'): self.update_device_entries(_cycles.available_devices(device_type)) # Deprecated: use refresh_devices instead. @@ -1442,6 +1473,8 @@ class CyclesPreferences(bpy.types.AddonPreferences): col.label(text="Requires discrete AMD GPU with RDNA architecture", icon='BLANK1') if sys.platform[:3] == "win": col.label(text="and AMD Radeon Pro 21.Q4 driver or newer", icon='BLANK1') + elif device_type == 'METAL': + col.label(text="Requires Apple Silicon and macOS 12.0 or newer", icon='BLANK1') return for device in devices: diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 635d92c2629..e4fbc898070 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -97,6 +97,11 @@ def use_cpu(context): return (get_device_type(context) == 'NONE' or cscene.device == 'CPU') +def use_metal(context): + cscene = context.scene.cycles + + return (get_device_type(context) == 'METAL' and cscene.device == 'GPU') + def use_cuda(context): cscene = context.scene.cycles @@ -295,13 +300,13 @@ class CYCLES_RENDER_PT_sampling_advanced(CyclesButtonsPanel, Panel): layout.separator() - col = layout.column(align=True) - col.active = not (cscene.use_adaptive_sampling and cscene.use_preview_adaptive_sampling) - col.prop(cscene, "scrambling_distance", text="Scrambling Distance") - col.prop(cscene, "adaptive_scrambling_distance", text="Adaptive") - sub = col.row(align=True) + heading = layout.column(align=True, heading="Scrambling Distance") + heading.active = not (cscene.use_adaptive_sampling and cscene.use_preview_adaptive_sampling) + heading.prop(cscene, "auto_scrambling_distance", text="Automatic") + sub = heading.row() sub.active = not cscene.use_preview_adaptive_sampling sub.prop(cscene, "preview_scrambling_distance", text="Viewport") + heading.prop(cscene, "scrambling_distance", text="Multiplier") layout.separator() @@ -1015,7 +1020,7 @@ class CYCLES_OBJECT_PT_motion_blur(CyclesButtonsPanel, Panel): def poll(cls, context): ob = context.object if CyclesButtonsPanel.poll(context) and ob: - if ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'CAMERA'}: + if ob.type in {'MESH', 'CURVE', 'CURVE', 'SURFACE', 'FONT', 'META', 'CAMERA', 'HAIR', 'POINTCLOUD'}: return True if ob.instance_type == 'COLLECTION' and ob.instance_collection: return True @@ -1819,37 +1824,38 @@ class CYCLES_RENDER_PT_debug(CyclesDebugButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True + layout.use_property_decorate = False # No animation. scene = context.scene cscene = scene.cycles - col = layout.column() + col = layout.column(heading="CPU") - col.label(text="CPU Flags:") row = col.row(align=True) row.prop(cscene, "debug_use_cpu_sse2", toggle=True) row.prop(cscene, "debug_use_cpu_sse3", toggle=True) row.prop(cscene, "debug_use_cpu_sse41", toggle=True) row.prop(cscene, "debug_use_cpu_avx", toggle=True) row.prop(cscene, "debug_use_cpu_avx2", toggle=True) - col.prop(cscene, "debug_bvh_layout") + col.prop(cscene, "debug_bvh_layout", text="BVH") col.separator() - col = layout.column() - col.label(text="CUDA Flags:") + col = layout.column(heading="CUDA") col.prop(cscene, "debug_use_cuda_adaptive_compile") + col = layout.column(heading="OptiX") + col.prop(cscene, "debug_use_optix_debug", text="Module Debug") col.separator() - col = layout.column() - col.label(text="OptiX Flags:") - col.prop(cscene, "debug_use_optix_debug") + col.prop(cscene, "debug_bvh_type", text="Viewport BVH") col.separator() - col = layout.column() - col.prop(cscene, "debug_bvh_type") + import _cycles + if _cycles.with_debug: + col.prop(cscene, "direct_light_sampling_type") class CYCLES_RENDER_PT_simplify(CyclesButtonsPanel, Panel): |