hyzboy/RuntimeData
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.shader中的WorldMatrix增加viewport resolution数据

Browse Source 
2.Push constant中只保留local to world数据
This commit is contained in:
hyzboy 2020-06-12 15:54:36 +08:00
parent 31bfc6df93
commit 0249968785
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shader/OnlyPosition.vert
View File

@ -16,7 +16,8 @@ layout(binding=0) uniform WorldMatrix // hgl/math/Math.h
mat4 inverse_mvp; mat4 inverse_mvp;
vec4 view_pos; vec4 view_pos;
vec2 resolution; vec2 canvas_resolution;
vec2 viewport_resolution;
} world; } world;
void main() void main()

5
shader/OnlyPosition3D.vert
View File

@ -1,4 +1,4 @@
#version 450 core #version 450 core
layout(location = 0) in vec3 Vertex; layout(location = 0) in vec3 Vertex;
@ -16,7 +16,8 @@ layout(binding=0) uniform WorldMatrix // hgl/math/Math.h
mat4 inverse_mvp; mat4 inverse_mvp;
vec4 view_pos; vec4 view_pos;
vec2 resolution; vec2 canvas_resolution;
vec2 viewport_resolution;
} world; } world;
layout(push_constant) uniform Consts { layout(push_constant) uniform Consts {

8
shader/PositionColor3D.vert
View File

@ -1,4 +1,4 @@
#version 450 core #version 450 core
layout(location = 0) in vec3 Vertex; layout(location = 0) in vec3 Vertex;
layout(location = 1) in vec4 Color; layout(location = 1) in vec4 Color;
@ -17,15 +17,13 @@ layout(binding=0) uniform WorldMatrix // hgl/math/Math.h
mat4 inverse_mvp; mat4 inverse_mvp;
vec4 view_pos; vec4 view_pos;
vec2 resolution; vec2 canvas_resolution;
vec2 viewport_resolution;
} world; } world;
layout(push_constant) uniform Consts layout(push_constant) uniform Consts
{ {
mat4 local_to_world; mat4 local_to_world;
mat3 normal;
vec3 object_position;
vec3 object_size;
}pc; }pc;
layout(location = 0) out vec4 FragmentColor; layout(location = 0) out vec4 FragmentColor;