From 02499687855b7858b017b49aca65fe3af37b81ee Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 12 Jun 2020 15:54:36 +0800 Subject: [PATCH] =?UTF-8?q?1.shader=E4=B8=AD=E7=9A=84WorldMatrix=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0viewport=20resolution=E6=95=B0=E6=8D=AE=202.Push=20con?= =?UTF-8?q?stant=E4=B8=AD=E5=8F=AA=E4=BF=9D=E7=95=99local=20to=20world?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shader/OnlyPosition.vert | 3 ++- shader/OnlyPosition3D.vert | 5 +++-- shader/PositionColor3D.vert | 8 +++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/shader/OnlyPosition.vert b/shader/OnlyPosition.vert index f1a7f77..536faf1 100644 --- a/shader/OnlyPosition.vert +++ b/shader/OnlyPosition.vert @@ -16,7 +16,8 @@ layout(binding=0) uniform WorldMatrix // hgl/math/Math.h mat4 inverse_mvp; vec4 view_pos; - vec2 resolution; + vec2 canvas_resolution; + vec2 viewport_resolution; } world; void main() diff --git a/shader/OnlyPosition3D.vert b/shader/OnlyPosition3D.vert index c6d3b25..a190865 100644 --- a/shader/OnlyPosition3D.vert +++ b/shader/OnlyPosition3D.vert @@ -1,4 +1,4 @@ -#version 450 core +#version 450 core layout(location = 0) in vec3 Vertex; @@ -16,7 +16,8 @@ layout(binding=0) uniform WorldMatrix // hgl/math/Math.h mat4 inverse_mvp; vec4 view_pos; - vec2 resolution; + vec2 canvas_resolution; + vec2 viewport_resolution; } world; layout(push_constant) uniform Consts { diff --git a/shader/PositionColor3D.vert b/shader/PositionColor3D.vert index 1f42239..54b024e 100644 --- a/shader/PositionColor3D.vert +++ b/shader/PositionColor3D.vert @@ -1,4 +1,4 @@ -#version 450 core +#version 450 core layout(location = 0) in vec3 Vertex; layout(location = 1) in vec4 Color; @@ -17,15 +17,13 @@ layout(binding=0) uniform WorldMatrix // hgl/math/Math.h mat4 inverse_mvp; vec4 view_pos; - vec2 resolution; + vec2 canvas_resolution; + vec2 viewport_resolution; } world; layout(push_constant) uniform Consts { mat4 local_to_world; - mat3 normal; - vec3 object_position; - vec3 object_size; }pc; layout(location = 0) out vec4 FragmentColor;