From cc68bba3a4e1a78bc8b62a5902230a4ae5043ccb Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 3 Nov 2021 19:14:51 +0800 Subject: * rename .GLSL(gamelab shading language) to .GLS(gamelab shader) --- Data/Resources/Shaders/BaseColor.gls | 43 ++++++++++++++++++++++++++++++ Data/Resources/Shaders/BaseColor.glsl | 43 ------------------------------ Data/Resources/Shaders/Editor-Text.gls | 47 +++++++++++++++++++++++++++++++++ Data/Resources/Shaders/Editor-Text.glsl | 47 --------------------------------- Data/Resources/Shaders/Editor-UI.gls | 45 +++++++++++++++++++++++++++++++ Data/Resources/Shaders/Editor-UI.glsl | 46 -------------------------------- Data/Scripts/Editor/AssetBrowser.lua | 2 +- 7 files changed, 136 insertions(+), 137 deletions(-) create mode 100644 Data/Resources/Shaders/BaseColor.gls delete mode 100644 Data/Resources/Shaders/BaseColor.glsl create mode 100644 Data/Resources/Shaders/Editor-Text.gls delete mode 100644 Data/Resources/Shaders/Editor-Text.glsl create mode 100644 Data/Resources/Shaders/Editor-UI.gls delete mode 100644 Data/Resources/Shaders/Editor-UI.glsl (limited to 'Data') diff --git a/Data/Resources/Shaders/BaseColor.gls b/Data/Resources/Shaders/BaseColor.gls new file mode 100644 index 0000000..b1aed17 --- /dev/null +++ b/Data/Resources/Shaders/BaseColor.gls @@ -0,0 +1,43 @@ +#version 330 core + +VSH_BEGIN + +vec3 vPos; +vec3 vNormal; +vec4 vTangent; +vec4 vColor; +vec2 vUV; +vec2 vUV2; +vec2 vUV3; +vec2 vUV4; + +uniform mat4 gamelab_mat_model; +uniform mat4 gamelab_mat_vp; +uniform vec4 gamelab_screen; +uniform vec4 gamelab_time; + +uniform mat4 mvp; + +out vec2 uv; + +void main() +{ + vec4 clip = mvp * vec4(vPos, -1, 1.0); + gl_Position = clip; + uv = vUV; +} + +VSH_END + +FSH_BEGIN +uniform sampler2D uiTex; + +in vec2 uv; + +out vec4 FragColor; + +void main() +{ + FragColor = texture(uiTex, uv); +} +FSH_END diff --git a/Data/Resources/Shaders/BaseColor.glsl b/Data/Resources/Shaders/BaseColor.glsl deleted file mode 100644 index b1aed17..0000000 --- a/Data/Resources/Shaders/BaseColor.glsl +++ /dev/null @@ -1,43 +0,0 @@ -#version 330 core - -VSH_BEGIN - -vec3 vPos; -vec3 vNormal; -vec4 vTangent; -vec4 vColor; -vec2 vUV; -vec2 vUV2; -vec2 vUV3; -vec2 vUV4; - -uniform mat4 gamelab_mat_model; -uniform mat4 gamelab_mat_vp; -uniform vec4 gamelab_screen; -uniform vec4 gamelab_time; - -uniform mat4 mvp; - -out vec2 uv; - -void main() -{ - vec4 clip = mvp * vec4(vPos, -1, 1.0); - gl_Position = clip; - uv = vUV; -} - -VSH_END - -FSH_BEGIN -uniform sampler2D uiTex; - -in vec2 uv; - -out vec4 FragColor; - -void main() -{ - FragColor = texture(uiTex, uv); -} -FSH_END diff --git a/Data/Resources/Shaders/Editor-Text.gls b/Data/Resources/Shaders/Editor-Text.gls new file mode 100644 index 0000000..7548507 --- /dev/null +++ b/Data/Resources/Shaders/Editor-Text.gls @@ -0,0 +1,47 @@ +// 渲染编辑器文字 + +#version 330 core + +CMD_BEGIN +Cull Off +Blend SrcAlpha OneMinusSrcAlpha +DepthTest Off +CMD_END + +uniform mat4 gamelab_mat_mvp; +uniform sampler2D gamelab_main_tex; +uniform vec2 gamelab_ui_position; + +VSH_BEGIN +layout (location = 0) in vec2 vPos; +layout (location = 1) in vec2 vUV; +layout (location = 2) in vec4 vColor; + +out vec2 uv; +out vec4 color; + +void main() +{ + vec2 pos = vPos + gamelab_ui_position; + vec4 clip = gamelab_mat_mvp * vec4(pos, -1, 1.0); + gl_Position = clip; + uv = vUV; + color = vColor; +} +VSH_END + +FSH_BEGIN +in vec2 uv; +in vec4 color; + +out vec4 FragColor; + +void main() +{ + //vec2 uv = vec2(uv.x, 1 - uv.y); + vec4 sampled = vec4(0.8,0.8,0.8,texture(gamelab_main_tex, uv).r); + sampled *= color; + //sampled = vec4(1,1,1,1); + FragColor = sampled; +} +FSH_END diff --git a/Data/Resources/Shaders/Editor-Text.glsl b/Data/Resources/Shaders/Editor-Text.glsl deleted file mode 100644 index 7548507..0000000 --- a/Data/Resources/Shaders/Editor-Text.glsl +++ /dev/null @@ -1,47 +0,0 @@ -// 渲染编辑器文字 - -#version 330 core - -CMD_BEGIN -Cull Off -Blend SrcAlpha OneMinusSrcAlpha -DepthTest Off -CMD_END - -uniform mat4 gamelab_mat_mvp; -uniform sampler2D gamelab_main_tex; -uniform vec2 gamelab_ui_position; - -VSH_BEGIN -layout (location = 0) in vec2 vPos; -layout (location = 1) in vec2 vUV; -layout (location = 2) in vec4 vColor; - -out vec2 uv; -out vec4 color; - -void main() -{ - vec2 pos = vPos + gamelab_ui_position; - vec4 clip = gamelab_mat_mvp * vec4(pos, -1, 1.0); - gl_Position = clip; - uv = vUV; - color = vColor; -} -VSH_END - -FSH_BEGIN -in vec2 uv; -in vec4 color; - -out vec4 FragColor; - -void main() -{ - //vec2 uv = vec2(uv.x, 1 - uv.y); - vec4 sampled = vec4(0.8,0.8,0.8,texture(gamelab_main_tex, uv).r); - sampled *= color; - //sampled = vec4(1,1,1,1); - FragColor = sampled; -} -FSH_END diff --git a/Data/Resources/Shaders/Editor-UI.gls b/Data/Resources/Shaders/Editor-UI.gls new file mode 100644 index 0000000..b2b348b --- /dev/null +++ b/Data/Resources/Shaders/Editor-UI.gls @@ -0,0 +1,45 @@ +#version 330 core + +CMD_BEGIN +Cull Off +Blend SrcAlpha OneMinusSrcAlpha +DepthTest Off +CMD_END + +uniform mat4 gamelab_mat_mvp; +uniform sampler2D gamelab_main_tex; +uniform vec2 gamelab_ui_position; + +VSH_BEGIN +layout (location = 0) in vec2 vPos; +layout (location = 1) in vec2 vUV; +layout (location = 2) in vec4 vColor; + +out vec2 uv; +out vec4 color; + +void main() +{ + vec2 pos = vPos + gamelab_ui_position; + vec4 clip = gamelab_mat_mvp * vec4(pos, -1, 1.0); + gl_Position = clip; + uv = vUV; + color = vColor; +} +VSH_END + +FSH_BEGIN +in vec2 uv; +in vec4 color; + +out vec4 FragColor; + +void main() +{ + //vec2 uv = vec2(uv.x, 1 - uv.y); + vec4 sampled = texture(gamelab_main_tex, uv); + // sampled *= color; + //sampled = vec4(1,1,1,1); + FragColor = sampled; +} +FSH_END diff --git a/Data/Resources/Shaders/Editor-UI.glsl b/Data/Resources/Shaders/Editor-UI.glsl deleted file mode 100644 index b831d6c..0000000 --- a/Data/Resources/Shaders/Editor-UI.glsl +++ /dev/null @@ -1,46 +0,0 @@ - -#version 330 core - -CMD_BEGIN -Cull Off -Blend SrcAlpha OneMinusSrcAlpha -DepthTest Off -CMD_END - -uniform mat4 gamelab_mat_mvp; -uniform sampler2D gamelab_main_tex; -uniform vec2 gamelab_ui_position; - -VSH_BEGIN -layout (location = 0) in vec2 vPos; -layout (location = 1) in vec2 vUV; -layout (location = 2) in vec4 vColor; - -out vec2 uv; -out vec4 color; - -void main() -{ - vec2 pos = vPos + gamelab_ui_position; - vec4 clip = gamelab_mat_mvp * vec4(pos, -1, 1.0); - gl_Position = clip; - uv = vUV; - color = vColor; -} -VSH_END - -FSH_BEGIN -in vec2 uv; -in vec4 color; - -out vec4 FragColor; - -void main() -{ - //vec2 uv = vec2(uv.x, 1 - uv.y); - vec4 sampled = texture(gamelab_main_tex, uv); - // sampled *= color; - //sampled = vec4(1,1,1,1); - FragColor = sampled; -} -FSH_END diff --git a/Data/Scripts/Editor/AssetBrowser.lua b/Data/Scripts/Editor/AssetBrowser.lua index 177d073..a0cb295 100644 --- a/Data/Scripts/Editor/AssetBrowser.lua +++ b/Data/Scripts/Editor/AssetBrowser.lua @@ -24,7 +24,7 @@ AssetBrowser.OnGUI = function(self) if shader == nil then -- local glsl = IO.ReadFile("./Resources/Shaders/Editor-Text.glsl", IO.EFileMode.Text) -- shader = Engine.Rendering.Shader.New(glsl) - shader = Engine.Rendering.Shader.CreateFromFile("./Resources/Shaders/Editor-Text.glsl") + shader = Engine.Rendering.Shader.CreateFromFile("./Resources/Shaders/Editor-Text.gls") end local ortho = Matrix44.New() -- cgit v1.1-26-g67d0