diff options
author | chai <chaifix@163.com> | 2021-11-02 21:52:09 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2021-11-02 21:52:09 +0800 |
commit | 3898f2c648b1a731dead8337aad8912d2b8b80d7 (patch) | |
tree | da06ea76f91ead6ba13722dd73ebbd8e8fb9b30c /Data | |
parent | 72812a7b47f90f9460e54e8149ba9199a7841244 (diff) |
*misc
Diffstat (limited to 'Data')
-rw-r--r-- | Data/Resources/Font/consola.ttf | bin | 0 -> 459180 bytes | |||
-rw-r--r-- | Data/Resources/Font/consolab.ttf | bin | 0 -> 397896 bytes | |||
-rw-r--r-- | Data/Resources/Font/consolai.ttf | bin | 0 -> 467584 bytes | |||
-rw-r--r-- | Data/Resources/Font/consolaz.ttf | bin | 0 -> 407956 bytes | |||
-rw-r--r-- | Data/Resources/Font/msyhbd.ttc | bin | 0 -> 16829116 bytes | |||
-rw-r--r-- | Data/Resources/Shaders/Editor-Text.glsl | 2 | ||||
-rw-r--r-- | Data/Scripts/EditorApplication.lua | 2 |
7 files changed, 2 insertions, 2 deletions
diff --git a/Data/Resources/Font/consola.ttf b/Data/Resources/Font/consola.ttf Binary files differnew file mode 100644 index 0000000..e881ca4 --- /dev/null +++ b/Data/Resources/Font/consola.ttf diff --git a/Data/Resources/Font/consolab.ttf b/Data/Resources/Font/consolab.ttf Binary files differnew file mode 100644 index 0000000..77f5d60 --- /dev/null +++ b/Data/Resources/Font/consolab.ttf diff --git a/Data/Resources/Font/consolai.ttf b/Data/Resources/Font/consolai.ttf Binary files differnew file mode 100644 index 0000000..2de4de8 --- /dev/null +++ b/Data/Resources/Font/consolai.ttf diff --git a/Data/Resources/Font/consolaz.ttf b/Data/Resources/Font/consolaz.ttf Binary files differnew file mode 100644 index 0000000..d9df211 --- /dev/null +++ b/Data/Resources/Font/consolaz.ttf diff --git a/Data/Resources/Font/msyhbd.ttc b/Data/Resources/Font/msyhbd.ttc Binary files differnew file mode 100644 index 0000000..7949a5f --- /dev/null +++ b/Data/Resources/Font/msyhbd.ttc diff --git a/Data/Resources/Shaders/Editor-Text.glsl b/Data/Resources/Shaders/Editor-Text.glsl index c58bd48..34412e3 100644 --- a/Data/Resources/Shaders/Editor-Text.glsl +++ b/Data/Resources/Shaders/Editor-Text.glsl @@ -36,7 +36,7 @@ out vec4 FragColor; void main() { //vec2 uv = vec2(uv.x, 1 - uv.y); - vec4 sampled = vec4(1,1,1,texture(gamelab_main_tex, uv).r); + vec4 sampled = vec4(0.8,0.8,0.8,texture(gamelab_main_tex, uv).r); sampled *= color; // vec4 sampled = vec4(1,1,1,1); FragColor = sampled; diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua index 535136b..103dcdf 100644 --- a/Data/Scripts/EditorApplication.lua +++ b/Data/Scripts/EditorApplication.lua @@ -113,7 +113,7 @@ local fsh = [[ BeforeMainLoop() -local font = Engine.GUI.Font.New("./Resources/Font/msyh.ttc", {512, 512}, 5, 5) +local font = Engine.GUI.Font.New("./Resources/Font/consola.ttf", {512, 512}, 5, 5) _G["default_font"] = font while true do |