diff --git a/leenkx/blender/lnx/props_renderpath.py b/leenkx/blender/lnx/props_renderpath.py index 6134b71..29e770e 100644 --- a/leenkx/blender/lnx/props_renderpath.py +++ b/leenkx/blender/lnx/props_renderpath.py @@ -66,7 +66,7 @@ def update_preset(self, context): rpdat.rp_stereo = False rpdat.rp_voxelgi_resolution = '32' rpdat.lnx_voxelgi_size = 0.125 - rpdat.rp_voxels = 'Voxel AO' + rpdat.rp_voxels = 'Voxel GI' rpdat.rp_render_to_texture = True rpdat.rp_supersampling = '1' rpdat.rp_antialiasing = 'SMAA' @@ -152,7 +152,7 @@ def update_preset(self, context): rpdat.rp_antialiasing = 'TAA' rpdat.rp_compositornodes = True rpdat.rp_volumetriclight = False - rpdat.rp_ssgi = 'RTAO' + rpdat.rp_ssgi = 'SSGI' rpdat.lnx_ssrs = False rpdat.lnx_micro_shadowing = True rpdat.rp_ssr = True @@ -330,6 +330,7 @@ class LnxRPListItem(bpy.types.PropertyGroup): rp_shadowmap_atlas: BoolProperty(name="Shadow Map Atlasing", description="Group shadow maps of lights of the same type in the same texture", default=False, update=update_renderpath) rp_shadowmap_atlas_single_map: BoolProperty(name="Shadow Map Atlas single map", description="Use a single texture for all different light types.", default=False, update=update_renderpath) rp_shadowmap_atlas_lod: BoolProperty(name="Shadow Map Atlas LOD (Experimental)", description="When enabled, the size of the shadow map will be determined on runtime based on the distance of the light to the camera", default=False, update=update_renderpath) + rp_shadowmap_transparent: BoolProperty(name="Transparency", description="Enable transparent shadowmaps", default=False, update=update_renderpath) rp_shadowmap_atlas_lod_subdivisions: EnumProperty( items=[('2', '2', '2'), ('3', '3', '3'), @@ -391,7 +392,8 @@ class LnxRPListItem(bpy.types.PropertyGroup): rp_ssgi: EnumProperty( items=[('Off', 'No AO', 'Off'), ('SSAO', 'SSAO', 'Screen space ambient occlusion'), - ('RTAO', 'RTAO', 'Ray-traced ambient occlusion') + ('SSGI', 'SSGI', 'Screen space global illumination') + #('RTAO', 'RTAO', 'Ray-traced ambient occlusion') # ('RTGI', 'RTGI', 'Ray-traced global illumination') ], name="SSGI", description="Screen space global illumination", default='SSAO', update=update_renderpath) @@ -507,7 +509,7 @@ class LnxRPListItem(bpy.types.PropertyGroup): ('1', '1', '1'), ('2', '2', '2')], name="Bounces", description="Trace multiple light bounces", default='1', update=update_renderpath) - lnx_voxelgi_clipmap_count: IntProperty(name="Clipmap count", description="Number of clipmaps", default=3, update=assets.invalidate_compiled_data) + lnx_voxelgi_clipmap_count: IntProperty(name="Clipmap count", description="Number of clipmaps", default=5, update=assets.invalidate_compiled_data) lnx_voxelgi_temporal: BoolProperty(name="Temporal Filter", description="Use temporal filtering to stabilize voxels", default=False, update=assets.invalidate_shader_cache) lnx_voxelgi_shadows: BoolProperty(name="Shadows", description="Use voxels to render shadows", default=False, update=update_renderpath) lnx_samples_per_pixel: EnumProperty( @@ -529,6 +531,7 @@ class LnxRPListItem(bpy.types.PropertyGroup): lnx_voxelgi_spec: FloatProperty(name="Reflection", description="", default=1.0, update=assets.invalidate_shader_cache) lnx_voxelgi_refr: FloatProperty(name="Refraction", description="", default=1.0, update=assets.invalidate_shader_cache) lnx_voxelgi_shad: FloatProperty(name="Shadows", description="Contrast for voxels shadows", default=1.0, update=assets.invalidate_shader_cache) + lnx_voxelgi_env: FloatProperty(name="Environment", description="", default=1.0, update=assets.invalidate_shader_cache) lnx_voxelgi_occ: FloatProperty(name="Occlusion", description="", default=1.0, update=assets.invalidate_shader_cache) lnx_voxelgi_size: FloatProperty(name="Size", description="Voxel size", default=0.25, update=assets.invalidate_shader_cache) lnx_voxelgi_step: FloatProperty(name="Step", description="Step size", default=1.0, update=assets.invalidate_shader_cache) @@ -544,15 +547,17 @@ class LnxRPListItem(bpy.types.PropertyGroup): lnx_water_density: FloatProperty(name="Density", default=1.0, update=assets.invalidate_shader_cache) lnx_water_refract: FloatProperty(name="Refract", default=1.0, update=assets.invalidate_shader_cache) lnx_water_reflect: FloatProperty(name="Reflect", default=1.0, update=assets.invalidate_shader_cache) - lnx_ssgi_strength: FloatProperty(name="Strength", default=1.0, update=assets.invalidate_shader_cache) + lnx_ssgi_strength: FloatProperty(name="Strength", default=8.0, update=assets.invalidate_shader_cache) lnx_ssgi_radius: FloatProperty(name="Radius", default=1.0, update=assets.invalidate_shader_cache) lnx_ssgi_step: FloatProperty(name="Step", default=2.0, update=assets.invalidate_shader_cache) - lnx_ssgi_max_steps: IntProperty(name="Max Steps", default=8, update=assets.invalidate_shader_cache) + lnx_ssgi_max_steps: IntProperty(name="Samples", default=32, update=assets.invalidate_shader_cache) + """ lnx_ssgi_rays: EnumProperty( items=[('9', '9', '9'), ('5', '5', '5'), ], name="Rays", description="Number of rays to trace for RTAO", default='5', update=assets.invalidate_shader_cache) + """ lnx_ssgi_half_res: BoolProperty(name="Half Res", description="Trace in half resolution", default=False, update=assets.invalidate_shader_cache) lnx_bloom_threshold: FloatProperty(name="Threshold", description="Brightness above which a pixel is contributing to the bloom effect", min=0, default=0.8, update=assets.invalidate_shader_cache) lnx_bloom_knee: FloatProperty(name="Knee", description="Smoothen transition around the threshold (higher values = smoother transition)", min=0, max=1, default=0.5, update=assets.invalidate_shader_cache)