From 14fa5cd8b00cf10d53c829caa0d5f9b40a3d8d3f Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 15 Nov 2021 03:10:34 +0800 Subject: *rename --- Data/Scripts/Editor/AssetBrowser.lua | 2 +- Data/Scripts/EditorApplication.lua | 7 +++++-- Data/Scripts/EditorGUI/EditorWindowManager.lua | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'Data/Scripts') diff --git a/Data/Scripts/Editor/AssetBrowser.lua b/Data/Scripts/Editor/AssetBrowser.lua index 6d02579..866eb62 100644 --- a/Data/Scripts/Editor/AssetBrowser.lua +++ b/Data/Scripts/Editor/AssetBrowser.lua @@ -27,7 +27,7 @@ AssetBrowser.OnGUI = function(self) shader = Engine.Rendering.Shader.CreateFromFile("./Resources/Shaders/Editor-Text.glsl") end - local ortho = Matrix44.New() + local ortho = Matrix44() ortho:SetOrtho(0, 400, 400, 0, 0.1, 10) Debug.Log("AssetBrowser.OnGUI()") diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua index c8d3d99..5614e2a 100644 --- a/Data/Scripts/EditorApplication.lua +++ b/Data/Scripts/EditorApplication.lua @@ -10,6 +10,7 @@ local Rendering = GameLab.Engine.Rendering local Debug = GameLab.Debug local Window = GameLab.Editor.Window local GL = GameLab.Engine.GL +local delegate = GameLab.Delegate local app = GameLab.Editor.EditorApplication.New() @@ -34,9 +35,9 @@ EditorWindowManager.TestGUIWindow() -- guiWindow2:SetContainerWindow(mainWindow) -- guiWindow2:SetPosition({400,0, 400, 400}) -local v = GameLab.Engine.Math.Vector4.New(1,2,3,4) +local v = GameLab.Engine.Math.Vector4(1,2,3,4) -local c = Engine.Rendering.Color.New(1,1,1,1) +local c = Engine.Rendering.Color(1,1,1,1) GL.ClearColor({1,1,1,1}) GL.Clear(GL.EBufferType.ColorBuffer) @@ -62,6 +63,8 @@ local request = Engine.Resource.LoadImageDataAsync("./Resources/Images/brickwall local font = Engine.GUI.Font.New("./Resources/Font/msyh.ttc", {512, 512}, 5, 5) _G["default_font"] = font +local v = GameLab.Engine.Math.Vector2(10.002, 2.334) + while true do app:OnStep() diff --git a/Data/Scripts/EditorGUI/EditorWindowManager.lua b/Data/Scripts/EditorGUI/EditorWindowManager.lua index 56083df..c28379a 100644 --- a/Data/Scripts/EditorGUI/EditorWindowManager.lua +++ b/Data/Scripts/EditorGUI/EditorWindowManager.lua @@ -65,7 +65,7 @@ EditorWindowManager.TestGUIWindow = function() guiWindow3.m_SplitWindow = splitWnd2 local mainWindowSize = EditorWindowManager.mainWindow:GetSize() - local position = Rect.New() + local position = Rect() position.x = 0 position.y = 0 position.width = mainWindowSize.x -- cgit v1.1-26-g67d0