summaryrefslogtreecommitdiff
path: root/Data/Scripts
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-11-03 09:52:26 +0800
committerchai <chaifix@163.com>2021-11-03 09:52:26 +0800
commitc10e0d92f46e5eaf25a69e1fafe5f4dbd8eaab9d (patch)
tree2eb1a91339b35fea68f48b2774355f496519db83 /Data/Scripts
parent3898f2c648b1a731dead8337aad8912d2b8b80d7 (diff)
*misc
Diffstat (limited to 'Data/Scripts')
-rw-r--r--Data/Scripts/Editor/AssetBrowser.lua6
-rw-r--r--Data/Scripts/EditorApplication.lua2
2 files changed, 5 insertions, 3 deletions
diff --git a/Data/Scripts/Editor/AssetBrowser.lua b/Data/Scripts/Editor/AssetBrowser.lua
index ecaecda..0c2d03f 100644
--- a/Data/Scripts/Editor/AssetBrowser.lua
+++ b/Data/Scripts/Editor/AssetBrowser.lua
@@ -27,7 +27,7 @@ AssetBrowser.OnGUI = function(self)
end
local ortho = Matrix44.New()
- ortho:SetOrtho(0, 400, 0, 400, 0.1, 10)
+ ortho:SetOrtho(0, 400, 400, 0, 0.1, 10)
Debug.Log("AssetBrowser.OnGUI()")
GL.ClearColor({0.1,0.1,0.1,1})
@@ -35,9 +35,11 @@ AssetBrowser.OnGUI = function(self)
Engine.Rendering.UseShader(shader)
Engine.Rendering.SetMatrix44("gamelab_mat_mvp", ortho)
+ Engine.Rendering.SetVector2("gamelab_ui_position", {0, 0})
--Engine.Rendering.SetTexture("gamelab_main_tex", tex)
--Engine.Rendering.DrawUIQuad({0, 0, 10, 20})
- _G["default_font"]:GetCharacters("你好世界!Hello,World! Project Window Properties", 12)
+ -- _G["default_font"]:GetCharacters("你好世界!Hello,World! Project Window Properties", 15)
+ _G["default_font"]:GetCharacters("A", 17)
Engine.Rendering.ResetUniformState()
end
diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua
index 103dcdf..0aae504 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/consola.ttf", {512, 512}, 5, 5)
+local font = Engine.GUI.Font.New("./Resources/Font/simsun.ttc", {512, 512}, 5, 5)
_G["default_font"] = font
while true do