From 73dc62da054cbc18afc694f803ebff7fe24f4eca Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 13 Nov 2021 17:29:45 +0800
Subject: * split

---
 Data/DefaultContent/Libraries/GameLab/Debug.lua           |  6 ------
 Data/DefaultContent/Libraries/GameLab/Debug/init.lua      |  4 ++++
 .../DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua |  6 +++---
 Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua |  5 +++++
 .../DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua | 15 +++++++++++----
 .../DefaultContent/Libraries/GameLab/Engine/Math/init.lua | 12 ++++++++++++
 6 files changed, 35 insertions(+), 13 deletions(-)
 delete mode 100644 Data/DefaultContent/Libraries/GameLab/Debug.lua

(limited to 'Data/DefaultContent')

diff --git a/Data/DefaultContent/Libraries/GameLab/Debug.lua b/Data/DefaultContent/Libraries/GameLab/Debug.lua
deleted file mode 100644
index 9f68160..0000000
--- a/Data/DefaultContent/Libraries/GameLab/Debug.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-
-local c_log = GameLab.Debug.Log 
-local c_log_editor = GameLab.Debug.LogEditor 
-local c_log_warning = GameLab.Debug.LogWarning
-local c_log_error = GameLab.Debug.LogError
-
diff --git a/Data/DefaultContent/Libraries/GameLab/Debug/init.lua b/Data/DefaultContent/Libraries/GameLab/Debug/init.lua
index 47a507d..0b6bd7c 100644
--- a/Data/DefaultContent/Libraries/GameLab/Debug/init.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Debug/init.lua
@@ -1,5 +1,9 @@
 local Debug = GameLab.Debug or {} 
 GameLab.Debug = Debug 
 
+local c_log = GameLab.Debug.Log 
+local c_log_editor = GameLab.Debug.LogEditor 
+local c_log_warning = GameLab.Debug.LogWarning
+local c_log_error = GameLab.Debug.LogError
 
 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 33299a2..4c10780 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua
@@ -25,11 +25,11 @@ GUI.EndOnGUI = function()
 end 
 
 GUI.BeginFrame = function() 
-
+    imgui.hotControl = 0
 end 
 
 GUI.EndFrame = function() 
-
+    imgui.hotControl = 0
 end 
 
 GUI.SetHotControl = function(id)
@@ -46,7 +46,7 @@ end
 
 GUI.Button = function(rect, content )
     local id = GUI.GetControlID() 
-    
+
 end
 
 GUI.Toggle = function() 
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua
index 4424a2a..d8bd558 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua
@@ -1,3 +1,8 @@
+local GUI = GameLab.Engine.GUI or {} 
+GameLab.Engine.GUI = GUI
+
 local import = GameLab.import(...)
 
 import("imgui")
+
+return GUI 
\ No newline at end of file
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua
index e52f8f0..5284cf9 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua
@@ -8,10 +8,17 @@ Rect.Ctor = function(self, x, y, width, height)
 end
 
 Rect.Set = function(self, rect)
-    self.x = rect.x or rect[1]
-    self.y = rect.y or rect[2]
-    self.z = rect.z or rect[3]
-    self.w = rect.w or rect[4]
+    if rect._type and rect._type.fullName == "GameLab.Engine.Math.Rect" then 
+        self.x = rect.x or rect.x
+        self.y = rect.y or rect.y
+        self.width = rect.z or rect.width
+        self.height = rect.w or rect.height
+    else 
+        self.x = rect.x or rect[1]
+        self.y = rect.y or rect[2]
+        self.width = rect.z or rect[3]
+        self.height = rect.w or rect[4]
+    end
 end
 
 Rect.GetPosition = function(self)
diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Math/init.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Math/init.lua
index 5131b07..68934e5 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/Math/init.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/Math/init.lua
@@ -14,4 +14,16 @@ import("Rect")
 
 GameLab.Debug.Log("GameLab.Engine.Math loaded")
 
+m.Max = function(a, b)
+    return a >= b and a or b
+end 
+
+m.Min = function(a, b)
+    return a <= b and a or b
+end 
+
+m.Clamp = function(v, min, max)
+    return m.Min(m.Max(v, min), max)
+end 
+
 return m
\ No newline at end of file
-- 
cgit v1.1-26-g67d0