nullprop/wgpu-renderer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: don't draw fog past scene depth

Browse source
This commit is contained in:
Lauri Räsänen 2023-11-08 23:16:31 +02:00
parent 9acbec9a6a
commit 5a8dec8d02
3 changed files with 146 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

53
res/shaders/fog.wgsl
View file

@ -8,6 +8,8 @@ struct FogVertexOutput {
@location(1) light_world_position: vec3<f32>,
}
// Vertex shader
@vertex
fn vs_main(
model: VertexInput,
@ -30,6 +32,33 @@ fn vs_main(
return out;
}
// Fragment shader
@group(2)@binding(0)
var t_light_depth: texture_depth_2d_array;
@group(2) @binding(1)
var s_light_depth: sampler_comparison;
@group(2)@binding(2)
var t_geometry_depth: texture_depth_2d;
@group(2) @binding(3)
var s_geometry_depth: sampler;
@group(3) @binding(0)
var t_diffuse: texture_2d<f32>;
@group(3)@binding(1)
var s_diffuse: sampler;
@group(3)@binding(2)
var t_normal: texture_2d<f32>;
@group(3) @binding(3)
var s_normal: sampler;
@group(3)@binding(4)
var t_roughness_metalness: texture_2d<f32>;
@group(3) @binding(5)
var s_roughness_metalness: sampler;
fn fog_noise(pos: vec3<f32>) -> f32 {
var p = pos * FOG_SCALE;
p.x += global_uniforms.time * 0.01;
@ -59,13 +88,31 @@ fn ray_march(origin: vec3<f32>, direction: vec3<f32>, scene_depth: f32) -> f32 {
return density;
}
// FIXME: always 0???
fn scene_depth(clip_position: vec4<f32>) -> f32 {
if (clip_position.w <= 0.0) {
return 0.0;
}
let ndc = clip_position.xy / clip_position.w;
let uv = ndc * vec2<f32>(0.5, -0.5) + vec2<f32>(0.5, 0.5);
return textureSample(t_geometry_depth, s_geometry_depth, uv);
}
@fragment
fn fs_main(vert: FogVertexOutput) -> @location(0) vec4<f32> {
var color = vec4<f32>(0.5, 0.5, 0.5, 1.0);
let direction = normalize(vert.world_position.xyz - camera.position.xyz);
let scene_depth = FOG_MAX_DIST; // TODO: sample geometry pass depth buffer
let density = ray_march(vert.world_position.xyz, direction, scene_depth);
let cam_to_volume = vert.world_position.xyz - camera.position.xyz;
let distance_to_volume = length(cam_to_volume);
let direction = cam_to_volume / distance_to_volume;
// TODO: pass near and far plane in uniforms
let geometry_depth = scene_depth(vert.clip_position) * (3000.0 - 1.0) + 1.0 - distance_to_volume;
if (geometry_depth <= 0.0)
{
return vec4<f32>(0.0);
}
let density = ray_march(vert.world_position.xyz, direction, geometry_depth);
color.a *= density;
return color;