sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PhongMaterial: Move TBN computation to fragment shader

This commit is contained in:
SirLynix 2022-06-28 08:56:43 +02:00
parent 9f360f6675
commit cefa620b20
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Nazara/Graphics/Resources/Shaders/PhongMaterial.nzsl
View File

@ -75,7 +75,7 @@ struct VertToFrag
[location(1), cond(HasUV)] uv: vec2[f32], [location(1), cond(HasUV)] uv: vec2[f32],
[location(2), cond(HasColor)] color: vec4[f32], [location(2), cond(HasColor)] color: vec4[f32],
[location(3), cond(HasNormal)] normal: vec3[f32], [location(3), cond(HasNormal)] normal: vec3[f32],
[location(4), cond(HasNormalMapping)] tbnMatrix: mat3[f32], [location(4), cond(HasNormalMapping)] tangent: vec3[f32],
[builtin(position)] position: vec4[f32], [builtin(position)] position: vec4[f32],
} }
@ -118,7 +118,14 @@ fn main(input: VertToFrag) -> FragOut
let normal: vec3[f32]; let normal: vec3[f32];
const if (HasNormalMapping) const if (HasNormalMapping)
normal = normalize(input.tbnMatrix * (MaterialNormalMap.Sample(input.uv).xyz * 2.0 - vec3[f32](1.0, 1.0, 1.0))); {
let N = normalize(input.normal);
let T = normalize(input.tangent);
let B = cross(N, T);
let tbnMatrix = mat3[f32](T, B, N);
normal = normalize(tbnMatrix * (MaterialNormalMap.Sample(input.uv).xyz * 2.0 - vec3[f32](1.0, 1.0, 1.0)));
}
else else
normal = normalize(input.normal); normal = normalize(input.normal);
@ -288,7 +295,7 @@ fn main(input: VertIn) -> VertToFrag
output.worldPos = worldPosition.xyz; output.worldPos = worldPosition.xyz;
output.position = viewerData.viewProjMatrix * worldPosition; output.position = viewerData.viewProjMatrix * worldPosition;
let rotationMatrix = mat3[f32](instanceData.worldMatrix); let rotationMatrix = transpose(inverse(mat3[f32](instanceData.worldMatrix)));
const if (HasColor) const if (HasColor)
output.color = input.color; output.color = input.color;
@ -300,12 +307,7 @@ fn main(input: VertIn) -> VertToFrag
output.uv = input.uv; output.uv = input.uv;
const if (HasNormalMapping) const if (HasNormalMapping)
{ output.tangent = rotationMatrix * input.tangent;
let binormal = cross(input.normal, input.tangent);
output.tbnMatrix[0] = normalize(rotationMatrix * input.tangent);
output.tbnMatrix[1] = normalize(rotationMatrix * binormal);
output.tbnMatrix[2] = normalize(rotationMatrix * input.normal);
}
return output; return output;
} }