diff options
Diffstat (limited to 'Resources/Scripts/EditorApplication.lua')
| -rw-r--r-- | Resources/Scripts/EditorApplication.lua | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Resources/Scripts/EditorApplication.lua b/Resources/Scripts/EditorApplication.lua index f09a197..8a175db 100644 --- a/Resources/Scripts/EditorApplication.lua +++ b/Resources/Scripts/EditorApplication.lua @@ -1,5 +1,7 @@ local json = require "LiteJson.json" local inspect = require "inspect" +local AssetBrowser = require "./Scripts/Editor/AssetBrowser" +local EditorWindowManager = require "./Scripts/EditorGUI/EditorWindowManager" local Debug = GameLab.Debug local GUI = GameLab.Editor.GUI @@ -17,10 +19,8 @@ mainWindow:SetIcon("./Icon/GameLab.ico") app:SetMainWindow(mainWindow) local guiWindow = GUI.GUIWindow.New() ---guiWindow:SetContainerWindow(mainWindow) ---guiWindow:SetPosition({0,0, 500, 400}) -guiWindow.a = 10 -guiWindow = nil +guiWindow:SetContainerWindow(mainWindow) +guiWindow:SetPosition({0,0, 500, 400}) collectgarbage() @@ -28,14 +28,17 @@ Debug.Log(GameLab.Path.GetRootDirectory()) Debug.Log(inspect{foo=1,2,3,4}) -local wnd = GUI.EditorWindow.New() +local wnd = AssetBrowser.New() Debug.Log(inspect(mainWindow._type)) +guiWindow:SetInstance(wnd) local v = GameLab.Engine.Math.Vector4.New(1,2,3,4) Debug.Log(inspect(v)) local V4 = GameLab.Engine.Math.Vector4.Extend("V4", "GameLab.Engine.Math") +Debug.Log(EditorWindowManager.name) + while true do app:PullMessage() |