From a14d4095488d72aebf49ea7545e9095ff791b5a3 Mon Sep 17 00:00:00 2001 From: sphynx-owner Date: Mon, 8 Jul 2024 16:43:05 +0300 Subject: [PATCH] Improvements: smoother blur, better defaults --- .../jfp_backtracking_experimental.glsl | 36 +++++++++++++++---- .../MyJumpFloodIteration/jump_flood_blur.gd | 12 ++++--- .../MyJumpFloodIteration/jump_flood_blur.glsl | 8 +++-- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/addons/MyJumpFloodIteration/jfp_backtracking_experimental.glsl b/addons/MyJumpFloodIteration/jfp_backtracking_experimental.glsl index b614956..c7eaf39 100644 --- a/addons/MyJumpFloodIteration/jfp_backtracking_experimental.glsl +++ b/addons/MyJumpFloodIteration/jfp_backtracking_experimental.glsl @@ -23,7 +23,7 @@ layout(push_constant, std430) uniform Params float velocity_match_threshold; float parallel_sensitivity; float perpendicular_sensitivity; - float nan3; + float depth_match_threshold; float nan4; } params; @@ -144,6 +144,14 @@ vec4 get_backtracked_sample(vec2 uvn, vec2 chosen_uv, vec2 chosen_velocity, vec4 float general_velocity_multiplier = min(best_sample_fitness.y, max_dilation_radius); + vec2 best_uv = chosen_uv; + + float best_velocity_match_threshold = params.velocity_match_threshold; + + int initial_steps_to_compare = 2; + + int steps_to_compare = initial_steps_to_compare; + for(int i = -step_count; i < step_count + 1; i++) { float velocity_multiplier = general_velocity_multiplier * (1 + float(i) / float(step_count)); @@ -153,7 +161,7 @@ vec4 get_backtracked_sample(vec2 uvn, vec2 chosen_uv, vec2 chosen_velocity, vec4 continue; } - vec2 new_sample = uvn - chosen_velocity * velocity_multiplier; + vec2 new_sample = round((uvn - chosen_velocity * velocity_multiplier) * render_size) / render_size; if((new_sample.x < 0.) || (new_sample.x > 1.) || (new_sample.y < 0.) || (new_sample.y > 1.)) { @@ -162,11 +170,25 @@ vec4 get_backtracked_sample(vec2 uvn, vec2 chosen_uv, vec2 chosen_velocity, vec4 vec2 velocity_test = textureLod(velocity_sampler, new_sample, 0.0).xy; - if(get_motion_difference(chosen_velocity, velocity_test, params.parallel_sensitivity, params.perpendicular_sensitivity) <= params.velocity_match_threshold) + float depth_test = textureLod(depth_sampler, new_sample, 0.0).x; + + float velocity_match = get_motion_difference(chosen_velocity, velocity_test, params.parallel_sensitivity, params.perpendicular_sensitivity); + + if((abs(depth_test - npd / best_sample_fitness.z) < params.depth_match_threshold) && (velocity_match <= best_velocity_match_threshold)) { - chosen_uv = new_sample; - best_sample_fitness.x = velocity_multiplier; - return vec4(chosen_uv, best_sample_fitness.x, 0); + best_uv = new_sample; + if(steps_to_compare == 0) + { + chosen_uv = best_uv; + best_velocity_match_threshold = velocity_match; + return vec4(chosen_uv, 0, 0); + } + steps_to_compare--; + } + else if(initial_steps_to_compare > steps_to_compare) + { + chosen_uv = best_uv; + return vec4(chosen_uv, 0, 0); } } @@ -181,7 +203,7 @@ void main() { return; } - vec2 uvn = (vec2(uvi) + vec2(0.5)) / render_size; + vec2 uvn = (vec2(uvi)) / render_size; int iteration_index = params.iteration_index; diff --git a/addons/MyJumpFloodIteration/jump_flood_blur.gd b/addons/MyJumpFloodIteration/jump_flood_blur.gd index 74900ab..02024ef 100644 --- a/addons/MyJumpFloodIteration/jump_flood_blur.gd +++ b/addons/MyJumpFloodIteration/jump_flood_blur.gd @@ -35,15 +35,19 @@ class_name MotionBlurSphynxJumpFlood @export var sample_step_multiplier : float = 8 ## how sensitive the backtracking for velocities be -@export var backtracking_velocity_match_threshold : float = 0.49 +@export var backtracking_velocity_match_threshold : float = 0.9 ## how sensitively the backtracking should treat velocities that are a different ## length along that velocity -@export var backtracking_velocity_match_parallel_sensitivity : float = 0.5; +@export var backtracking_velocity_match_parallel_sensitivity : float = 1 ## how sensitively the backtracking should treat velcoities that have perpendicular ## offset to that velocity -@export var backtracking_velcoity_match_perpendicular_sensitivity : float = 0.1; +@export var backtracking_velcoity_match_perpendicular_sensitivity : float = 0.05 + +## how closely does the depth of the backtracked sample has to match the original sample to be +## considered (in NDC space) +@export var backtracbing_depth_match_threshold : float = 0.001 ## the number of passes performed by the jump flood algorithm based dilation, ## each pass added doubles the maximum radius of dilation available @@ -236,7 +240,7 @@ func _render_callback(p_effect_callback_type, p_render_data): backtracking_velocity_match_threshold, backtracking_velocity_match_parallel_sensitivity, backtracking_velcoity_match_perpendicular_sensitivity, - 0, + backtracbing_depth_match_threshold, 0 ] diff --git a/addons/MyJumpFloodIteration/jump_flood_blur.glsl b/addons/MyJumpFloodIteration/jump_flood_blur.glsl index da7c695..263ad19 100644 --- a/addons/MyJumpFloodIteration/jump_flood_blur.glsl +++ b/addons/MyJumpFloodIteration/jump_flood_blur.glsl @@ -159,7 +159,7 @@ void main() return; } - vec2 uvn = (vec2(uvi) + vec2(0.5)) / render_size; + vec2 uvn = vec2(uvi) / render_size; int iteration_count = int(params.motion_blur_samples); @@ -182,7 +182,9 @@ void main() return; } - float velocity_step_coef = min(params.motion_blur_intensity, max_dialtion_radius / (length(velocity) * params.motion_blur_intensity)) / max(1.0, params.motion_blur_samples - 1.0) * (1 + (interleaved_gradient_noise(uvi, int(params.frame)) - 0.5)); + float noise_offset = (interleaved_gradient_noise(uvi, int(params.frame)) - 1); + + float velocity_step_coef = min(params.motion_blur_intensity, max_dialtion_radius / (length(velocity) * params.motion_blur_intensity)) / max(1.0, params.motion_blur_samples - 1.0); vec3 sample_step = velocity * velocity_step_coef; @@ -193,7 +195,7 @@ void main() float total_weight = 1;// max(0.0001, length(naive_velocity)); - vec2 offset = vec2(0.0); + vec2 offset = vec2(sample_step * noise_offset); vec4 col = base * total_weight;