diff options
| author | chai <chaifix@163.com> | 2021-11-03 19:14:51 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2021-11-03 19:14:51 +0800 |
| commit | cc68bba3a4e1a78bc8b62a5902230a4ae5043ccb (patch) | |
| tree | 7fdfac53e0a79699393537e671ccde6e7b482c0d /Data | |
| parent | 08ddd44b634d4da78edd0964f539a310544c7883 (diff) | |
* rename .GLSL(gamelab shading language) to .GLS(gamelab shader)
Diffstat (limited to 'Data')
| -rw-r--r-- | Data/Resources/Shaders/BaseColor.gls (renamed from Data/Resources/Shaders/BaseColor.glsl) | 0 | ||||
| -rw-r--r-- | Data/Resources/Shaders/Editor-Text.gls (renamed from Data/Resources/Shaders/Editor-Text.glsl) | 0 | ||||
| -rw-r--r-- | Data/Resources/Shaders/Editor-UI.gls (renamed from Data/Resources/Shaders/Editor-UI.glsl) | 1 | ||||
| -rw-r--r-- | Data/Scripts/Editor/AssetBrowser.lua | 2 |
4 files changed, 1 insertions, 2 deletions
diff --git a/Data/Resources/Shaders/BaseColor.glsl b/Data/Resources/Shaders/BaseColor.gls index b1aed17..b1aed17 100644 --- a/Data/Resources/Shaders/BaseColor.glsl +++ b/Data/Resources/Shaders/BaseColor.gls diff --git a/Data/Resources/Shaders/Editor-Text.glsl b/Data/Resources/Shaders/Editor-Text.gls index 7548507..7548507 100644 --- a/Data/Resources/Shaders/Editor-Text.glsl +++ b/Data/Resources/Shaders/Editor-Text.gls diff --git a/Data/Resources/Shaders/Editor-UI.glsl b/Data/Resources/Shaders/Editor-UI.gls index b831d6c..b2b348b 100644 --- a/Data/Resources/Shaders/Editor-UI.glsl +++ b/Data/Resources/Shaders/Editor-UI.gls @@ -1,4 +1,3 @@ - #version 330 core CMD_BEGIN 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()
|