df523f3bf1
I had to do a huge refactor in order to do this. The way ReflectionProbe were referencing the UBO data was conflicting with the way EEVEE-Next object should behave. So like light, shadow and irradiance grids, every probe is synced with it's GPU data as base struct and the data is just copied into the UBO when using `set_view`. To simplify many parts of the reflection probe code, I isolated the atlas coordinate of a probe to its own struct that can be easily copied. Pull Request: https://projects.blender.org/blender/blender/pulls/113518
270 lines
7.9 KiB
Python
270 lines
7.9 KiB
Python
# SPDX-FileCopyrightText: 2009-2023 Blender Authors
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
from bpy.types import Panel
|
|
|
|
|
|
class DataButtonsPanel:
|
|
bl_space_type = 'PROPERTIES'
|
|
bl_region_type = 'WINDOW'
|
|
bl_context = "data"
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
engine = context.engine
|
|
return context.lightprobe and (engine in cls.COMPAT_ENGINES)
|
|
|
|
|
|
class DATA_PT_context_lightprobe(DataButtonsPanel, Panel):
|
|
bl_label = ""
|
|
bl_options = {'HIDE_HEADER'}
|
|
COMPAT_ENGINES = {'BLENDER_EEVEE', 'BLENDER_RENDER', 'BLENDER_EEVEE_NEXT'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
|
|
ob = context.object
|
|
probe = context.lightprobe
|
|
space = context.space_data
|
|
|
|
if ob:
|
|
layout.template_ID(ob, "data")
|
|
elif probe:
|
|
layout.template_ID(space, "pin_id")
|
|
|
|
|
|
class DATA_PT_lightprobe(DataButtonsPanel, Panel):
|
|
bl_label = "Probe"
|
|
COMPAT_ENGINES = {'BLENDER_EEVEE', 'BLENDER_RENDER'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
|
|
probe = context.lightprobe
|
|
|
|
# layout.prop(probe, "type")
|
|
|
|
if probe.type == 'VOLUME':
|
|
col = layout.column()
|
|
col.prop(probe, "influence_distance", text="Distance")
|
|
col.prop(probe, "falloff")
|
|
col.prop(probe, "intensity")
|
|
|
|
sub = col.column(align=True)
|
|
sub.prop(probe, "grid_resolution_x", text="Resolution X")
|
|
sub.prop(probe, "grid_resolution_y", text="Y")
|
|
sub.prop(probe, "grid_resolution_z", text="Z")
|
|
|
|
elif probe.type == 'PLANE':
|
|
col = layout.column()
|
|
col.prop(probe, "influence_distance", text="Distance")
|
|
col.prop(probe, "falloff")
|
|
else:
|
|
col = layout.column()
|
|
col.prop(probe, "influence_type")
|
|
|
|
if probe.influence_type == 'ELIPSOID':
|
|
col.prop(probe, "influence_distance", text="Radius")
|
|
else:
|
|
col.prop(probe, "influence_distance", text="Size")
|
|
|
|
col.prop(probe, "falloff")
|
|
col.prop(probe, "intensity")
|
|
|
|
sub = col.column(align=True)
|
|
if probe.type != 'PLANE':
|
|
sub.prop(probe, "clip_start", text="Clipping Start")
|
|
else:
|
|
sub.prop(probe, "clip_start", text="Clipping Offset")
|
|
|
|
if probe.type != 'PLANE':
|
|
sub.prop(probe, "clip_end", text="End")
|
|
|
|
|
|
class DATA_PT_lightprobe_eevee_next(DataButtonsPanel, Panel):
|
|
bl_label = "Probe"
|
|
COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
|
|
probe = context.lightprobe
|
|
|
|
if probe.type == 'VOLUME':
|
|
col = layout.column()
|
|
|
|
sub = col.column(align=True)
|
|
sub.prop(probe, "grid_resolution_x", text="Resolution X")
|
|
sub.prop(probe, "grid_resolution_y", text="Y")
|
|
sub.prop(probe, "grid_resolution_z", text="Z")
|
|
|
|
col.separator()
|
|
|
|
col.prop(probe, "intensity")
|
|
|
|
col.separator()
|
|
|
|
col.operator("object.lightprobe_cache_bake").subset = 'ACTIVE'
|
|
col.operator("object.lightprobe_cache_free").subset = 'ACTIVE'
|
|
|
|
col.separator()
|
|
|
|
col.prop(probe, "grid_bake_samples")
|
|
col.prop(probe, "surfel_density")
|
|
col.prop(probe, "clip_end", text="Capture Distance")
|
|
|
|
col.separator()
|
|
|
|
col.prop(probe, "grid_clamp_direct")
|
|
col.prop(probe, "grid_clamp_indirect")
|
|
|
|
col.separator()
|
|
|
|
col.prop(probe, "grid_normal_bias")
|
|
col.prop(probe, "grid_view_bias")
|
|
col.prop(probe, "grid_irradiance_smoothing")
|
|
col.prop(probe, "grid_validity_threshold")
|
|
|
|
col.separator()
|
|
|
|
col.prop(probe, "grid_surface_bias")
|
|
col.prop(probe, "grid_escape_bias")
|
|
|
|
col.separator()
|
|
|
|
col.prop(probe, "grid_dilation_threshold")
|
|
col.prop(probe, "grid_dilation_radius")
|
|
|
|
col.separator()
|
|
|
|
col.prop(probe, "grid_capture_world")
|
|
col.prop(probe, "grid_capture_indirect")
|
|
col.prop(probe, "grid_capture_emission")
|
|
|
|
elif probe.type == 'SPHERE':
|
|
col = layout.column()
|
|
col.prop(probe, "influence_type")
|
|
|
|
if probe.influence_type == 'ELIPSOID':
|
|
influence_text = "Radius"
|
|
else:
|
|
influence_text = "Size"
|
|
|
|
col.prop(probe, "influence_distance", text=influence_text)
|
|
col.prop(probe, "falloff")
|
|
|
|
sub = layout.column(align=True)
|
|
sub.prop(probe, "clip_start", text="Clipping Start")
|
|
sub.prop(probe, "clip_end", text="End")
|
|
|
|
elif probe.type == 'PLANE':
|
|
col = layout.column()
|
|
row = col.row()
|
|
col.prop(probe, "clip_start", text="Clipping Offset")
|
|
col.prop(probe, "influence_distance", text="Distance")
|
|
pass
|
|
else:
|
|
# Currently unsupported
|
|
pass
|
|
|
|
|
|
class DATA_PT_lightprobe_visibility(DataButtonsPanel, Panel):
|
|
bl_label = "Visibility"
|
|
bl_parent_id = "DATA_PT_lightprobe"
|
|
COMPAT_ENGINES = {'BLENDER_EEVEE', 'BLENDER_RENDER'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
|
|
probe = context.lightprobe
|
|
|
|
col = layout.column()
|
|
|
|
if probe.type == 'VOLUME':
|
|
col.prop(probe, "visibility_buffer_bias", text="Bias")
|
|
col.prop(probe, "visibility_bleed_bias", text="Bleed Bias")
|
|
col.prop(probe, "visibility_blur", text="Blur")
|
|
|
|
row = col.row(align=True)
|
|
row.prop(probe, "visibility_collection")
|
|
row.prop(probe, "invert_visibility_collection", text="", icon='ARROW_LEFTRIGHT')
|
|
|
|
|
|
class DATA_PT_lightprobe_parallax(DataButtonsPanel, Panel):
|
|
bl_label = "Custom Parallax"
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
COMPAT_ENGINES = {'BLENDER_EEVEE', 'BLENDER_RENDER', 'BLENDER_EEVEE_NEXT'}
|
|
|
|
@classmethod
|
|
def poll(cls, context):
|
|
engine = context.engine
|
|
return context.lightprobe and context.lightprobe.type == 'SPHERE' and (engine in cls.COMPAT_ENGINES)
|
|
|
|
def draw_header(self, context):
|
|
probe = context.lightprobe
|
|
self.layout.prop(probe, "use_custom_parallax", text="")
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
|
|
probe = context.lightprobe
|
|
|
|
col = layout.column()
|
|
col.active = probe.use_custom_parallax
|
|
|
|
col.prop(probe, "parallax_type")
|
|
|
|
if probe.parallax_type == 'ELIPSOID':
|
|
col.prop(probe, "parallax_distance", text="Radius")
|
|
else:
|
|
col.prop(probe, "parallax_distance", text="Size")
|
|
|
|
|
|
class DATA_PT_lightprobe_display(DataButtonsPanel, Panel):
|
|
bl_label = "Viewport Display"
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
COMPAT_ENGINES = {'BLENDER_EEVEE', 'BLENDER_RENDER'}
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
layout.use_property_split = True
|
|
|
|
ob = context.object
|
|
probe = context.lightprobe
|
|
|
|
col = layout.column()
|
|
|
|
if probe.type == 'PLANE':
|
|
col.prop(ob, "empty_display_size", text="Arrow Size")
|
|
col.prop(probe, "show_influence")
|
|
col.prop(probe, "show_data")
|
|
|
|
if probe.type in {'VOLUME', 'SPHERE'}:
|
|
col.prop(probe, "show_influence")
|
|
col.prop(probe, "show_clip")
|
|
|
|
if probe.type == 'SPHERE':
|
|
sub = col.column()
|
|
sub.active = probe.use_custom_parallax
|
|
sub.prop(probe, "show_parallax")
|
|
|
|
|
|
classes = (
|
|
DATA_PT_context_lightprobe,
|
|
DATA_PT_lightprobe,
|
|
DATA_PT_lightprobe_eevee_next,
|
|
DATA_PT_lightprobe_visibility,
|
|
DATA_PT_lightprobe_parallax,
|
|
DATA_PT_lightprobe_display,
|
|
)
|
|
|
|
if __name__ == "__main__": # only for live edit.
|
|
from bpy.utils import register_class
|
|
for cls in classes:
|
|
register_class(cls)
|