diff options
Diffstat (limited to 'Data/Scripts')
| -rw-r--r-- | Data/Scripts/Editor/AssetBrowser.lua | 10 | ||||
| -rw-r--r-- | Data/Scripts/EditorApplication.lua | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Data/Scripts/Editor/AssetBrowser.lua b/Data/Scripts/Editor/AssetBrowser.lua index 8d8efa6..177d073 100644 --- a/Data/Scripts/Editor/AssetBrowser.lua +++ b/Data/Scripts/Editor/AssetBrowser.lua @@ -17,7 +17,8 @@ local tex AssetBrowser.OnGUI = function(self)
if tex == nil then
- tex = Engine.Resource.LoadTexture("./Resources/Images/brickwall.jpg")
+ tex = Engine.Resource.LoadTexture("./Resources/Images/tile.png")
+ --tex = Engine.Resource.LoadTexture("./Resources/Images/brickwall_small.jpg")
end
if shader == nil then
@@ -30,15 +31,16 @@ AssetBrowser.OnGUI = function(self) ortho:SetOrtho(0, 400, 400, 0, 0.1, 10)
Debug.Log("AssetBrowser.OnGUI()")
- GL.ClearColor({0.1,0.1,0.1,1})
+ GL.ClearColor({0.13, 0.13, 0.13, 1})
GL.Clear(GL.EBufferType.ColorBuffer)
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)
+ --Engine.Rendering.DrawUIQuad({0, 0, 200, 200})
+ _G["default_font"]:GetCharacters("你好世界！Hello,World! Project Window Properties", 12)
+ --Engine.Rendering.DrawUI9Slicing(1, {25, 25}, {25, 25}, {80, 80}, {200, 200} )
Engine.Rendering.ResetUniformState()
end
diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua index 0aae504..535136b 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/simsun.ttc", {512, 512}, 5, 5) +local font = Engine.GUI.Font.New("./Resources/Font/msyh.ttc", {512, 512}, 5, 5) _G["default_font"] = font while true do |