*rename

6 files changed, 14 insertions, 19 deletions

diff --git a/Data/Libraries/GameLab/Editor/EditorWindow.lua b/Data/Libraries/GameLab/Editor/EditorWindow.lua
index 94a7464..e9df099 100644
--- a/Data/Libraries/GameLab/Editor/EditorWindow.lua
+++ b/Data/Libraries/GameLab/Editor/EditorWindow.lua
@@ -1,15 +1,12 @@
-local EditorWindowManager = require("EditorGUI.EditorWindowManager")
+local delegate = require("GameLab.Delegate")
 
--- EditorWindow是应用级别的逻辑窗口
--- ContainerWindow
---   |- SplitWindow
---      |- GUIWindow
---         |- EditorWindow
 local EditorWindow = GameLab.GlobalClass("GameLab.Editor.EditorWindow")
 
 EditorWindow.Ctor = function(self, title) 
     self.title = title    -- 编辑器名称
-    self.guiWindow = nil  -- 绑定的GUIWindow 
+    self.guiWindow = nil  -- 绑定的GUIWindow
+
+    self.onUpdate = delegate()
 end
 
 EditorWindow.OnGUI = function(self)
diff --git a/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua b/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua
index 4b6f1bc..4852b16 100644
--- a/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua
+++ b/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua
@@ -40,7 +40,7 @@ ContainerWindow.OnSizeChanged = function(self)
         return 
     end 
     local pos = self:GetSize()
-    local position = Rect.New() 
+    local position = Rect() 
     position.x = 0 
     position.y = 0 
     position.width = pos.x
diff --git a/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua
index bbd368e..6e15c9d 100644
--- a/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua
+++ b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua
@@ -37,7 +37,7 @@ GUIWindow.Ctor = function(self)
     self.m_Native          = NativeGUIWindow.New(self)

     self.m_ContainerWindow = nil

     self.m_SplitWindow     = nil -- parent window

-    self.m_Position        = Rect.New(0,0,0,0) -- 在父ContainerWindow中的位置和大小

+    self.m_Position        = Rect(0,0,0,0) -- 在父ContainerWindow中的位置和大小

     self.m_EditorWindows   = {} -- 编辑器脚本

 

     i = i + 1

@@ -50,7 +50,7 @@ GUIWindow.SetContainerWindow = function(self, containerWindow)
 end

 

 GUIWindow.AddEditorWindow = function(self)

-    

+

 end

 

 GUIWindow.SetPosition = function(self, pos)

diff --git a/Data/Libraries/GameLab/Editor/Window/SplitWindow.lua b/Data/Libraries/GameLab/Editor/Window/SplitWindow.lua
index 9a398c2..1419d34 100644
--- a/Data/Libraries/GameLab/Editor/Window/SplitWindow.lua
+++ b/Data/Libraries/GameLab/Editor/Window/SplitWindow.lua
@@ -26,7 +26,9 @@ local SplitState = {
 }
 
 -- 抽象的窗口，用来处理布局
-local SplitWindow = GameLab.GlobalClass("GameLab.Editor.Window.SplitWindow", function(self, mode, splitter)
+local SplitWindow = GameLab.GlobalClass("GameLab.Editor.Window.SplitWindow")
+
+SplitWindow.Ctor = function(self, mode, splitter)
     self.m_ControlID       = nil 
     self.m_ContainerWindow = nil 
     self.m_SplitMode       = mode
@@ -40,7 +42,7 @@ local SplitWindow = GameLab.GlobalClass("GameLab.Editor.Window.SplitWindow", fun
             table.insert(self.m_Splitter, sp)
         end 
     end
-end)
+end
 
 -- 布局，设置GUIWindow的大小
 SplitWindow.DoSplit = function(self, event)
@@ -51,7 +53,7 @@ SplitWindow.DoSplit = function(self, event)
     self.m_ControlID = GUI.GetControlID() 
 
     if event.type == EEventType.MouseDown then 
-        for i, sp in ipairs(self.m_Splitter) do 
+        for _, sp in ipairs(self.m_Splitter) do 
             local rect = Rect()
             if self.m_SplitMode == ESplitMode.Horizontal then 
                 local x = sp.value * self.m_Position.width + self.m_Position.x - sp.size / 2 
diff --git a/Data/Libraries/GameLab/Editor/Window/init.lua b/Data/Libraries/GameLab/Editor/Window/init.lua
index 430e8f9..6d526e9 100644
--- a/Data/Libraries/GameLab/Editor/Window/init.lua
+++ b/Data/Libraries/GameLab/Editor/Window/init.lua
@@ -1,6 +1,4 @@
-GameLab.Editor.Window = GameLab.Editor.Window or {}

-local m = GameLab.Editor.Window

-

+local m = GameLab.Package("GameLab.Editor.Window")

 local import = GameLab.import(...)

 

 import("ContainerWindow")

diff --git a/Data/Libraries/GameLab/Editor/init.lua b/Data/Libraries/GameLab/Editor/init.lua
index c151aab..8ddf079 100644
--- a/Data/Libraries/GameLab/Editor/init.lua
+++ b/Data/Libraries/GameLab/Editor/init.lua
@@ -1,6 +1,4 @@
-local m = GameLab.Editor or {} 

-GameLab.Editor = m

-

+local m = GameLab.Package("GameLab.Editor") 

 local import = GameLab.import(...)

 

 m.AssetManager = import("AssetManager")