diff --git a/bin/resources/deferred_frag.nzsl b/bin/resources/deferred_frag.nzsl index 34997f16e..f307c7617 100644 --- a/bin/resources/deferred_frag.nzsl +++ b/bin/resources/deferred_frag.nzsl @@ -41,9 +41,9 @@ external struct InputData { - [location(0)] vertNormal: vec3, - [location(1)] vertUV: vec2, - [location(2)] vertPos: vec3 + [location(0)] normal: vec3, + [location(1)] uv: vec2, + [location(2)] pos: vec3 } struct OutputData @@ -73,7 +73,7 @@ fn main(input: InputData) -> OutputData let output: OutputData; output.diffuseMap = diffuseColor; - output.normalMap = vec4((vec3(1.0, 1.0, 1.0) + input.vertNormal) * 0.5, 1.0); - output.positionMap = vec4(input.vertPos, 1.0); + output.normalMap = vec4((vec3(1.0, 1.0, 1.0) + input.normal) * 0.5, 1.0); + output.positionMap = vec4(input.pos, 1.0); return output; } diff --git a/bin/resources/deferred_vert.nzsl b/bin/resources/deferred_vert.nzsl index 68cf179a9..69d810dae 100644 --- a/bin/resources/deferred_vert.nzsl +++ b/bin/resources/deferred_vert.nzsl @@ -35,28 +35,28 @@ external struct InputData { - [location(0)] inPos: vec3, - [location(1)] inNormals: vec3, - [location(2)] inTexCoord: vec2 + [location(0)] pos: vec3, + [location(1)] normal: vec3, + [location(2)] uv: vec2 } struct OutputData { - [location(0)] vertNormal: vec3, - [location(1)] vertUV: vec2, - [location(2)] vertPos: vec3, + [location(0)] normal: vec3, + [location(1)] uv: vec2, + [location(2)] pos: vec3, [builtin(position)] position: vec4 } [entry(vert)] fn main(input: InputData) -> OutputData { - let worldPos = instanceData.worldMatrix * vec4(input.inPos, 1.0); + let worldPos = instanceData.worldMatrix * vec4(input.pos, 1.0); let output: OutputData; - output.vertUV = input.inTexCoord; - output.vertNormal = input.inNormals; - output.vertPos = worldPos.xyz; - output.position = viewerData.viewProjMatrix * instanceData.worldMatrix * vec4(input.inPos, 1.0); + output.uv = input.uv; + output.normal = input.normal; + output.pos = worldPos.xyz; + output.position = viewerData.viewProjMatrix * instanceData.worldMatrix * vec4(input.pos, 1.0); return output; } diff --git a/src/Nazara/Graphics/Resources/Shaders/basicmaterial.nzsl b/src/Nazara/Graphics/Resources/Shaders/basicmaterial.nzsl index 3cdf582f4..8416f120a 100644 --- a/src/Nazara/Graphics/Resources/Shaders/basicmaterial.nzsl +++ b/src/Nazara/Graphics/Resources/Shaders/basicmaterial.nzsl @@ -62,7 +62,7 @@ fn main(input: FragIn) -> FragOut const if (HAS_ALPHA_TEXTURE) // TODO: diffuseColor.w *= MaterialAlphaMap.Sample(input.uv)).x - diffuseColor = vec4(diffuseColor.x, diffuseColor.y, diffuseColor.z, ((MaterialAlphaMap.Sample(input.uv)).x) * diffuseColor.w); + diffuseColor = vec4(diffuseColor.x, diffuseColor.y, diffuseColor.z, (MaterialAlphaMap.Sample(input.uv)).x * diffuseColor.w); const if (ALPHA_TEST) {