From a8c689a9f11badbdd10748d247e60ec47725dc36 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sat, 11 Jan 2025 13:28:44 +0100 Subject: add normal map bind group --- client/src/shader.wgsl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'client/src/shader.wgsl') diff --git a/client/src/shader.wgsl b/client/src/shader.wgsl index 3f93223..7ed6c0e 100644 --- a/client/src/shader.wgsl +++ b/client/src/shader.wgsl @@ -26,8 +26,12 @@ struct VertexOut { @group(0) @binding(0) var tex_albedo: texture_2d; @group(0) @binding(1) var tex_albedo_sampler: sampler; +@group(1) @binding(0) var tex_normal: texture_2d; +@group(1) @binding(1) var tex_normal_sampler: sampler; var project: mat4x4; +const LIGHT: vec3 = vec3(0.64, 0.64, 0.64); + @vertex fn vs_main(vi: VertexIn) -> VertexOut { var clip = project * vec4(vi.position, 1.); @@ -36,5 +40,15 @@ fn vs_main(vi: VertexIn) -> VertexOut { } @fragment fn fs_main(vo: VertexOut) -> @location(0) vec4 { - return textureSample(tex_albedo, tex_albedo_sampler, vo.texcoord); + let t_albedo = textureSample(tex_albedo, tex_albedo_sampler, vo.texcoord); + let t_normal = textureSample(tex_normal, tex_normal_sampler, vo.texcoord); + + + let lighting = mix(1., saturate(dot(LIGHT, vo.normal)), 0.9); + + let alpha = t_albedo.a; + let color = t_albedo.rgb * lighting; + // let color = vo.normal + t_normal.rgb; + + return vec4(color, alpha); } -- cgit v1.2.3-70-g09d2