diff options
Diffstat (limited to 'Data/Libraries')
-rw-r--r-- | Data/Libraries/GameLab/Editor/GUI/IMGUI.lua | 10 | ||||
-rw-r--r-- | Data/Libraries/GameLab/Editor/Window/GUIWindow.lua | 24 |
2 files changed, 28 insertions, 6 deletions
diff --git a/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua b/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua index 2f47c80..f76dc38 100644 --- a/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua +++ b/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua @@ -50,8 +50,14 @@ EditorGUI.Toggle = function() end
-EditorGUI.Label = function()
-
+EditorGUI.Label = function(rect, content, color)
+ if Event.current.type ~= EEventType.Repaint then
+ return
+ end
+ Rendering.UseShader(editor_res.shaders["EditorShape"])
+ Rendering.SetVector2("gamelab_ui_position", rect.position)
+ Rendering.SetColor("gamelab_color", color)
+ GUI.DrawText(editor_res.fonts["Default"], content, rect.size.height)
end
EditorGUI.Box = function(rect, color)
diff --git a/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua index ceb026e..b7f373d 100644 --- a/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua +++ b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua @@ -7,7 +7,7 @@ local Math = require "GameLab.Engine.Math" local Rendering = require "GameLab.Engine.Rendering"
local Utils = require "GameLab.Utils"
local Events = require "GameLab.Events"
-local GUI = require "GameLab.Editor.GUI"
+local EditorGUI = require "GameLab.Editor.GUI"
local Rect = Math.Rect
local Event = Events.Event
@@ -125,17 +125,33 @@ GUIWindow.OnGUI = function(self) -- 框架
local guiSize = Vector2(windowSize.x - kSideBorders*2, windowSize.y - kSideBorders*2)
local bgRect = Rect(kSideBorders, kSideBorders, guiSize.x, guiSize.y)
- GUI.Box(bgRect, Color(0.22, 0.22, 0.22, 1))
- GUI.BoxFrame(bgRect, Color(0.13, 0.13, 0.13, 1))
+ EditorGUI.Box(bgRect, Color(0.22, 0.22, 0.22, 1))
+ EditorGUI.BoxFrame(bgRect, Color(0.13, 0.13, 0.13, 1))
+
+ -- title
+ local titleRect = Rect(kSideBorders, kSideBorders, windowSize.width - kSideBorders*2, kTabHeight)
+ EditorGUI.Label(titleRect, "hello", Color(1,1,1,1))
-- 编辑器
local editorPos = Vector2(kSideBorders + kEditorSpace, kSideBorders + kEditorSpace + kTabHeight)
local editorRect = Rect(editorPos.x, editorPos.y, windowSize.x - editorPos.x * 2, windowSize.y - editorPos.y)
GL.Viewport(editorRect.x, windowSize.y - editorRect.height - editorPos.y, editorRect.width, editorRect.height)
- GUI.Line(Vector2(0,0), Vector2(100, 100), Color(1,0,0,1))
+ EditorGUI.Line(Vector2(0,0), Vector2(100, 100), Color(1,0,0,1))
end
+GUIWindow.DoTitle = function(self)
+
+end
+
+GUIWindow.DoTab = function(self)
+
+end
+
+GUIWindow.DoEditorWindows = function(self)
+
+end
+
GUIWindow.GetContainerWindow = function(self)
return self.m_ContainerWindow
end
|