rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-01-16 13:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate duplicate return values

Browse Source
This commit is contained in:
Hanno Braun 2022-10-13 12:05:10 +02:00
parent ecb0301cc6
commit 5fa849d883
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/fj-viewer/src/graphics/shader.wgsl
View File

@ -18,6 +18,10 @@ struct VertexOutput {
@location(1) color: vec4<f32>, @location(1) color: vec4<f32>,
}; };
struct FragmentOutput {
@location(0) color: vec4<f32>,
}
@vertex @vertex
fn vertex(in: VertexInput) -> VertexOutput { fn vertex(in: VertexInput) -> VertexOutput {
var out: VertexOutput; var out: VertexOutput;
@ -32,7 +36,7 @@ fn vertex(in: VertexInput) -> VertexOutput {
let pi: f32 = 3.14159265359; let pi: f32 = 3.14159265359;
@fragment @fragment
fn frag_model(in: VertexOutput) -> @location(0) vec4<f32> { fn frag_model(in: VertexOutput) -> FragmentOutput {
let light = vec3<f32>(0.0, 0.0, -1.0); let light = vec3<f32>(0.0, 0.0, -1.0);
let angle = acos(dot(light, -in.normal)); let angle = acos(dot(light, -in.normal));
@ -40,17 +44,22 @@ fn frag_model(in: VertexOutput) -> @location(0) vec4<f32> {
let f_normal = max(1.0 - f_angle, 0.0); let f_normal = max(1.0 - f_angle, 0.0);
let color = vec4<f32>(in.color.rgb * f_normal, in.color.a); var out: FragmentOutput;
out.color = vec4<f32>(in.color.rgb * f_normal, in.color.a);
return color; return out;
} }
@fragment @fragment
fn frag_mesh(in: VertexOutput) -> @location(0) vec4<f32> { fn frag_mesh(in: VertexOutput) -> FragmentOutput {
return vec4<f32>(1.0 - in.color.rgb, in.color.a); var out: FragmentOutput;
out.color = vec4<f32>(1.0 - in.color.rgb, in.color.a);
return out;
} }
@fragment @fragment
fn frag_lines(in: VertexOutput) -> @location(0) vec4<f32> { fn frag_lines(in: VertexOutput) -> FragmentOutput {
return vec4<f32>(in.color.rgb, in.color.a); var out: FragmentOutput;
out.color = vec4<f32>(in.color.rgb, in.color.a);
return out;
} }