From 6e4f4a9329b440787eb0a92eaa691e989497e9bd Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 17 Sep 2020 21:43:36 +0800 Subject: [PATCH] add material subfolder. --- material/Atmosphere.material | Bin 0 -> 11497 bytes shader/gbuffer_opaque.vert | 19 +++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 material/Atmosphere.material diff --git a/material/Atmosphere.material b/material/Atmosphere.material new file mode 100644 index 0000000000000000000000000000000000000000..a1f344d3a4ce8077902aef0ea404f95c7270c6df GIT binary patch literal 11497 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 Ruh(vYQ|QSCEBxp9{{gvU|84*P literal 0 HcmV?d00001 diff --git a/shader/gbuffer_opaque.vert b/shader/gbuffer_opaque.vert index 80f272a..71c5fd4 100644 --- a/shader/gbuffer_opaque.vert +++ b/shader/gbuffer_opaque.vert @@ -26,10 +26,13 @@ layout(push_constant) uniform Consts { mat4 local_to_world; } pc; -layout(location = 0) out vec3 FragmentNormal; -layout(location = 1) out vec3 FragmentTangent; -layout(location = 2) out vec3 FragmentPosition; -layout(location = 3) out vec2 FragmentTexCoord; +layout(location = 0) out struct +{ + vec3 Normal; + vec3 Tangent; + vec3 Position; + vec2 TexCoord; +}vs_out; void main() { @@ -37,11 +40,11 @@ void main() gl_Position=pos*world.mvp; - FragmentPosition=(pos*world.modelview).xyz; - FragmentTexCoord=TexCoord; + vs_out.Position=(pos*world.modelview).xyz; + vs_out.TexCoord=TexCoord; mat3 n=mat3(pc.local_to_world*world.modelview); - FragmentNormal=normalize(Normal)*n; - FragmentTangent=normalize(Tangent)*n; + vs_out.Normal=normalize(Normal)*n; + vs_out.Tangent=normalize(Tangent)*n; }