From 74ca8143a7c2352425d549b681b2838bda5ee218 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 20 Nov 2021 14:10:24 +0800
Subject: *misc

---
 Data/BuiltIn/Libraries/GameLab/Class.lua           |  9 +++++++
 .../BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua | 31 +++++++++++-----------
 Data/BuiltIn/Libraries/GameLab/GlobalClass.lua     |  2 ++
 3 files changed, 27 insertions(+), 15 deletions(-)

(limited to 'Data/BuiltIn/Libraries')

diff --git a/Data/BuiltIn/Libraries/GameLab/Class.lua b/Data/BuiltIn/Libraries/GameLab/Class.lua
index e30aab7..7e2502d 100644
--- a/Data/BuiltIn/Libraries/GameLab/Class.lua
+++ b/Data/BuiltIn/Libraries/GameLab/Class.lua
@@ -113,4 +113,13 @@ end
 
 GameLab.Class = class
 
+local function affirmClass(_, classname) 
+    return function()
+        return "foookok"
+    end 
+end  
+CLASS = setmetatable({}, {__index = affirmClass})
+
+Class = class
+
 return class
\ No newline at end of file
diff --git a/Data/BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua b/Data/BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua
index cf84bff..084cc81 100644
--- a/Data/BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua
+++ b/Data/BuiltIn/Libraries/GameLab/Engine/GUI/IMGUI.lua
@@ -14,6 +14,9 @@ local Matrix44 = find "GameLab.Engine.Math.Matrix44"
 local Rendering = GameLab.Engine.Rendering
 local EEventType = GameLab.Events.EEventType
 local Resource = GameLab.Engine.Resource
+local Vector2  = GameLab.Engine.Math.Vector2
+local Vector4  = GameLab.Engine.Math.Vector4
+local Color    = Rendering.Color
 
 local EditorRes 
 if GAMELAB_EDITOR then
@@ -51,8 +54,6 @@ end
 GUI.Label = function() 
 
 end 
-local shader 
-local tex
 
 GUI.Box = function(position, color, size) 
     if Event.current.type == EEventType.Repaint then 
@@ -61,23 +62,16 @@ GUI.Box = function(position, color, size)
         --Rendering.UseShader(Res.shaders["EditorShape"])
         local ortho = Matrix44() 
         ortho:SetOrtho(0, size.x, size.y, 0,  0.1, 10)
-        if shader == nil then   
-            shader = Rendering.Shader.CreateFromFile("./Resources/Shaders/Editor-Text.glsl")
-            --shader = Rendering.Shader.CreateFromFile("./Resources/Shaders/Editor-UI.glsl")
-        end 
-        if tex == nil then 
-            tex = Resource.LoadTexture("./Resources/Images/tile.png")
-            --tex = Engine.Resource.LoadTexture("./Resources/Images/brickwall_small.jpg")
-        end
     
-        Rendering.UseShader(shader)
+        Rendering.UseShader(Res.shaders["EditorShape"])
         Rendering.SetMatrix44("gamelab_mat_mvp", ortho)
         Rendering.SetVector2("gamelab_ui_position", {0, 0})
+        Rendering.SetVector4("gamelab_color", Vector4(0.12, 0.12, 0.12, 1))
         --Rendering.SetTexture("gamelab_main_tex", tex)
         --Rendering.DrawUIQuad({0, 0, 200, 200})
         --Rendering.DrawUI9Slicing(1, {25, 25}, {25, 25}, {80, 80}, {400, 30} )
-        EditorGUI.Text(_G["default_font"], "你好世界！\nMaterials\nHello,World!\nProject Window Properties", 12)	
-        --EditorGUI.Text(_G["default_font"], "hello", 12)	
+        --GUI.DrawText(_G["default_font"], "你好世界！\nMaterials\nHello,World!\nProject Window Properties", 12)	
+        GUI.Line(Vector2(0, 0), Vector2(100, 100))
     end
 end
 
@@ -109,8 +103,15 @@ GUI.HorizontalScrollbar = function()
 
 end 
 
-GUI.DrawLine = function()
+GUI.Line = function(from, to) 
+    if Event.current.type ~= EEventType.Repaint then 
+        return 
+    end 
+    GUI.DrawLine(from, to)
+end 
+
+GUI.BoxFrame = function(topleft, size) 
 
 end 
 
-return GUI 
\ No newline at end of file
+return GUI
\ No newline at end of file
diff --git a/Data/BuiltIn/Libraries/GameLab/GlobalClass.lua b/Data/BuiltIn/Libraries/GameLab/GlobalClass.lua
index 7104480..3d2b166 100644
--- a/Data/BuiltIn/Libraries/GameLab/GlobalClass.lua
+++ b/Data/BuiltIn/Libraries/GameLab/GlobalClass.lua
@@ -18,4 +18,6 @@ end
 
 GameLab.GlobalClass = GlobalClass
 
+GClass = GlobalClass
+
 return GlobalClass
\ No newline at end of file
-- 
cgit v1.1-26-g67d0