From b215d811a1981e20f35bb31df4e6cd2a74146193 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 4 Nov 2021 10:00:00 +0800 Subject: *misc --- Data/Scripts/Editor/AssetBrowser.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Data/Scripts/Editor/AssetBrowser.lua') diff --git a/Data/Scripts/Editor/AssetBrowser.lua b/Data/Scripts/Editor/AssetBrowser.lua index a0cb295..89d4eba 100644 --- a/Data/Scripts/Editor/AssetBrowser.lua +++ b/Data/Scripts/Editor/AssetBrowser.lua @@ -1,5 +1,5 @@ local Debug = GameLab.Debug -local AssetBrowser = GameLab.Editor.GUI.EditorWindow.Extend("GameLab.Editor.AssetBrowser") +local AssetBrowser = GameLab.Editor.EditorWindow.Extend("GameLab.Editor.AssetBrowser") local GL = GameLab.Engine.GL local Matrix44 = GameLab.Engine.Math.Matrix44 local Engine = GameLab.Engine @@ -15,7 +15,6 @@ local shader = nil local tex AssetBrowser.OnGUI = function(self) - if tex == nil then tex = Engine.Resource.LoadTexture("./Resources/Images/tile.png") --tex = Engine.Resource.LoadTexture("./Resources/Images/brickwall_small.jpg") @@ -24,7 +23,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.gls") + shader = Engine.Rendering.Shader.CreateFromFile("./Resources/Shaders/Editor-Text.glsl") end local ortho = Matrix44.New() @@ -36,11 +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.SetVector2("gamelab_ui_position", {0, 30}) --Engine.Rendering.SetTexture("gamelab_main_tex", tex) --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.DrawUI9Slicing(1, {25, 25}, {25, 25}, {80, 80}, {400, 50} ) Engine.Rendering.ResetUniformState() end -- cgit v1.1-26-g67d0