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

Cleaning up pbr shader

Browse source
This commit is contained in:
Lauri Räsänen 2023-11-11 17:37:48 +02:00
parent f9798743b8
commit 89c9b1e569
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/shaders/globals.wgsl
View file

@ -29,7 +29,7 @@ var<uniform> global_uniforms: GlobalUniforms;
struct MaterialUniform { struct MaterialUniform {
metallic_factor: f32, metallic_factor: f32,
rougness_factor: f32, roughness_factor: f32,
_padding1: f32, _padding1: f32,
_padding2: f32, _padding2: f32,
} }

16
res/shaders/pbr.wgsl
View file

@ -73,21 +73,21 @@ var<uniform> material_uniform: MaterialUniform;
@fragment @fragment
fn fs_main(vert: VertexOutput) -> @location(0) vec4<f32> { fn fs_main(vert: VertexOutput) -> @location(0) vec4<f32> {
// textures // textures
let object_color: vec4<f32> = textureSample(t_diffuse, s_diffuse, vert.tex_coords); let tex_diffuse: vec4<f32> = textureSample(t_diffuse, s_diffuse, vert.tex_coords);
let object_normal: vec4<f32> = textureSample(t_normal, s_normal, vert.tex_coords); let tex_normal: vec4<f32> = textureSample(t_normal, s_normal, vert.tex_coords);
let object_roughness_metalness: vec4<f32> = textureSample( let tex_rm: vec4<f32> = textureSample(
t_roughness_metalness, s_roughness_metalness, vert.tex_coords); t_roughness_metalness, s_roughness_metalness, vert.tex_coords);
let albedo = object_color.xyz; let albedo = tex_diffuse.rgb;
let roughness = object_roughness_metalness.y * material_uniform.rougness_factor; let roughness = tex_rm.g * material_uniform.roughness_factor;
let metalness = object_roughness_metalness.z * material_uniform.metallic_factor; let metalness = tex_rm.b * material_uniform.metallic_factor;
var total_radiance: vec3<f32>; var total_radiance: vec3<f32>;
let in_light = sample_direct_light(vert.world_position); let in_light = sample_direct_light(vert.world_position);
if (in_light > 0.0) { if (in_light > 0.0) {
// lighting vecs // lighting vecs
let normal_dir = object_normal.xyz * 2.0 - 1.0; let normal_dir = tex_normal.xyz * 2.0 - 1.0;
var light_dir = normalize(vert.tangent_light_position - vert.tangent_position); var light_dir = normalize(vert.tangent_light_position - vert.tangent_position);
let view_dir = normalize(vert.tangent_view_position - vert.tangent_position); let view_dir = normalize(vert.tangent_view_position - vert.tangent_position);
let half_dir = normalize(view_dir + light_dir); let half_dir = normalize(view_dir + light_dir);
@ -122,5 +122,5 @@ fn fs_main(vert: VertexOutput) -> @location(0) vec4<f32> {
// tonemap // tonemap
result = result / (result + vec3(1.0)); result = result / (result + vec3(1.0));
return vec4<f32>(result, object_color.a); return vec4<f32>(result, tex_diffuse.a);
} }