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

Pass roughness & metalness factors to shader

Browse source
This commit is contained in:
Lauri Räsänen 2023-11-11 17:31:04 +02:00
parent 8b99a617f4
commit f9798743b8
4 changed files with 50 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
res/shaders/globals.wgsl
View file

@ -27,6 +27,13 @@ struct GlobalUniforms {
@group(0) @binding(2)
var<uniform> global_uniforms: GlobalUniforms;
struct MaterialUniform {
metallic_factor: f32,
rougness_factor: f32,
_padding1: f32,
_padding2: f32,
}
struct VertexInput {
@location(0) position: vec3<f32>,
@location(1) tex_coords: vec2<f32>,

10
res/shaders/pbr.wgsl
View file

@ -67,6 +67,9 @@ var t_roughness_metalness: texture_2d<f32>;
@group(2) @binding(5)
var s_roughness_metalness: sampler;
@group(2) @binding(6)
var<uniform> material_uniform: MaterialUniform;
@fragment
fn fs_main(vert: VertexOutput) -> @location(0) vec4<f32> {
// textures
@ -76,10 +79,9 @@ fn fs_main(vert: VertexOutput) -> @location(0) vec4<f32> {
t_roughness_metalness, s_roughness_metalness, vert.tex_coords);
let albedo = object_color.xyz;
// TODO: pass factors to shader
let roughness = object_roughness_metalness.y * 1.0;
let metalness = object_roughness_metalness.z * 1.0;
let roughness = object_roughness_metalness.y * material_uniform.rougness_factor;
let metalness = object_roughness_metalness.z * material_uniform.metallic_factor;
var total_radiance: vec3<f32>;
let in_light = sample_direct_light(vert.world_position);