From 9b1f8214eea0c86d41f903a5feba9aac78603df1 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Fri, 12 Nov 2021 19:13:03 +0800
Subject: *misc

---
 .../Libraries/GameLab/Debug/init.lua               |  5 +++++
 .../Libraries/GameLab/Engine/GUI/IMGUI.lua         | 11 ++++++++++-
 .../Libraries/GameLab/Engine/GUI/init.lua          |  2 +-
 .../Libraries/GameLab/Engine/Math/Rect.lua         | 13 +++++++++++-
 .../Libraries/GameLab/Engine/Math/Vector2.lua      | 12 +++++++++++
 .../Libraries/GameLab/Engine/Utils/EventCenter.lua | 23 ----------------------
 .../GameLab/Engine/Utils/StateMachine.lua          |  0
 .../Libraries/GameLab/Engine/Utils/Util.lua        |  0
 .../Libraries/GameLab/Utils/init.lua               |  4 ++++
 9 files changed, 44 insertions(+), 26 deletions(-)
 create mode 100644 Data/DefaultContent/Libraries/GameLab/Debug/init.lua
 delete mode 100644 Data/DefaultContent/Libraries/GameLab/Engine/Utils/EventCenter.lua
 delete mode 100644 Data/DefaultContent/Libraries/GameLab/Engine/Utils/StateMachine.lua
 delete mode 100644 Data/DefaultContent/Libraries/GameLab/Engine/Utils/Util.lua
 create mode 100644 Data/DefaultContent/Libraries/GameLab/Utils/init.lua

(limited to 'Data/DefaultContent/Libraries')

diff --git a/Data/DefaultContent/Libraries/GameLab/Debug/init.lua b/Data/DefaultContent/Libraries/GameLab/Debug/init.lua
new file mode 100644
index 0000000..47a507d
--- /dev/null
+++ b/Data/DefaultContent/Libraries/GameLab/Debug/init.lua
@@ -0,0 +1,5 @@
+local Debug = GameLab.Debug or {} 
+GameLab.Debug = Debug 
+
+
+return Debug 
\ No newline at end of file
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua
index 2b763e7..33299a2 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua
@@ -7,7 +7,8 @@ local Event = GameLab.Events.Event
 
 local imgui = {
     currentId = 0,    -- 当前可分配的controlID
-} 
+    hotControl = 0,
+}
 
 GUI.GetControlID = function() 
     imgui.currentId = imgui.currentId  + 1
@@ -31,6 +32,14 @@ GUI.EndFrame = function()
 
 end 
 
+GUI.SetHotControl = function(id)
+    imgui.hotControl = id
+end 
+
+GUI.GetHotControl = function()
+    return imgui.hotControl
+end 
+
 ------------------------------------------------------------------------------------------------
 -- 控件
 ------------------------------------------------------------------------------------------------
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua
index 4b83ddc..4424a2a 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua
@@ -1,3 +1,3 @@
 local import = GameLab.import(...)
 
-import("IMGUI")
+import("imgui")
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua
index ba18637..e52f8f0 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua
@@ -14,6 +14,16 @@ Rect.Set = function(self, rect)
     self.w = rect.w or rect[4]
 end
 
+Rect.GetPosition = function(self)
+    local v = GameLab.Engine.Math.Vector2.New(self.x, self.y)
+    return v
+end 
+
+Rect.GetSize = function(self)
+    local v = GameLab.Engine.Math.Vector2.New(self.width, self.height)
+    return v
+end 
+
 Rect.CopyFrom = function(self, rect)
     self.x = rect.x 
     self.y = rect.y 
@@ -22,7 +32,8 @@ Rect.CopyFrom = function(self, rect)
 end 
 
 Rect.Contains = function(self, point)
-    
+    return point.x >= self.x and point.x <= self.x + self.width
+    and point.y >= self.y and point.y <= self.y + self.height
 end
 
 return Rect
\ No newline at end of file
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua
index 9a0e0a3..eb4c14b 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Vector2.lua
@@ -5,4 +5,16 @@ Vector2.Ctor = function(self, x, y)
     self.y = y or 0
 end
 
+Vector2.__add = function(self, other)
+    self.x = self.x + other.x 
+    self.y = self.y + other.y
+    return self
+end 
+
+Vector2.Add = function(self, other)
+    self.x = self.x + other.x 
+    self.y = self.y + other.y
+    return self
+end 
+
 return Vector2
\ No newline at end of file
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Utils/EventCenter.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Utils/EventCenter.lua
deleted file mode 100644
index 664ecba..0000000
--- a/Data/DefaultContent/Libraries/GameLab/Engine/Utils/EventCenter.lua
+++ /dev/null
@@ -1,23 +0,0 @@
-local EventCenter = {} 
-
-EventCenter.Subscribe = function(event, callback) 
-
-end
-
-EventCenter.Unsubscribe = function(event, callback) 
-
-end
-
-EventCenter.UnsubscribeAll = function(event) 
-
-end
-
-EventCenter.Publish = function(event, ...) 
-
-end 
-
-EventCenter.Clear = function() 
-
-end
-
-Jin.EventCenter = EventCenter
\ No newline at end of file
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Utils/StateMachine.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Utils/StateMachine.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Utils/Util.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Utils/Util.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/Data/DefaultContent/Libraries/GameLab/Utils/init.lua b/Data/DefaultContent/Libraries/GameLab/Utils/init.lua
new file mode 100644
index 0000000..0ca5131
--- /dev/null
+++ b/Data/DefaultContent/Libraries/GameLab/Utils/init.lua
@@ -0,0 +1,4 @@
+local utils = GameLab.Utils or {}
+GameLab.Utils = utils
+
+return uitls 
\ No newline at end of file
-- 
cgit v1.1-26-g67d0