From 0e0aa82ab2ebc9f15519cea710a52c5895690152 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 11 Nov 2021 18:27:36 +0800 Subject: * rename Editor.GUI to Editor.Window --- .../Libraries/GameLab/Engine/GUI/IMGUI.lua | 39 +++++++ .../Libraries/GameLab/Engine/GUI/init.lua | 3 + .../Libraries/GameLab/Engine/Math/Rect.lua | 4 + .../GameLab/Editor/GUI/ContainerWindow.lua | 20 ---- Data/Libraries/GameLab/Editor/GUI/FontManager.lua | 0 Data/Libraries/GameLab/Editor/GUI/GUIWindow.lua | 65 ------------ Data/Libraries/GameLab/Editor/GUI/IMGUI.lua | 10 -- Data/Libraries/GameLab/Editor/GUI/SplitWindow.lua | 32 ------ Data/Libraries/GameLab/Editor/GUI/init.lua | 9 -- .../GameLab/Editor/Window/ContainerWindow.lua | 20 ++++ .../GameLab/Editor/Window/FontManager.lua | 0 Data/Libraries/GameLab/Editor/Window/GUIWindow.lua | 70 ++++++++++++ .../GameLab/Editor/Window/SplitWindow.lua | 32 ++++++ Data/Libraries/GameLab/Editor/Window/init.lua | 9 ++ Data/Scripts/EditorApplication.lua | 2 +- Data/Scripts/EditorGUI/EditorWindowManager.lua | 6 +- Data/boot.lua | 3 +- Editor/EditorGlobals.h | 3 + Editor/GUI/GUIWindow.cpp | 4 + Editor/GUI/IMGUI/GUIButton.cpp | 0 .../Scripting/EditorGUI/ContainerWindow.bind.cpp | 64 ----------- Editor/Scripting/EditorGUI/EditorGUI.bind.cpp | 118 --------------------- Editor/Scripting/EditorGUI/GUIWindow.bind.cpp | 70 ------------ Editor/Scripting/EditorGUI/SplitWindow.bind.cpp | 0 Editor/Scripting/EditorScripting.cpp | 6 +- Editor/Scripting/Window/ContainerWindow.bind.cpp | 64 +++++++++++ Editor/Scripting/Window/EditorGUI.bind.cpp | 118 +++++++++++++++++++++ Editor/Scripting/Window/GUIWindow.bind.cpp | 70 ++++++++++++ Editor/Scripting/Window/SplitWindow.bind.cpp | 0 Projects/VisualStudio/Editor/Editor.vcxproj | 10 +- .../VisualStudio/Editor/Editor.vcxproj.filters | 42 ++++---- Runtime/Events/InputEvent.cpp | 4 + Runtime/Lua/LuaBind/LuaBindInvoker.cpp | 2 + Runtime/Scripting/RuntimeScriptGlobals.cpp | 5 + Runtime/Scripting/RuntimeScriptGlobals.h | 5 + 35 files changed, 483 insertions(+), 426 deletions(-) create mode 100644 Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua create mode 100644 Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua delete mode 100644 Data/Libraries/GameLab/Editor/GUI/ContainerWindow.lua delete mode 100644 Data/Libraries/GameLab/Editor/GUI/FontManager.lua delete mode 100644 Data/Libraries/GameLab/Editor/GUI/GUIWindow.lua delete mode 100644 Data/Libraries/GameLab/Editor/GUI/IMGUI.lua delete mode 100644 Data/Libraries/GameLab/Editor/GUI/SplitWindow.lua delete mode 100644 Data/Libraries/GameLab/Editor/GUI/init.lua create mode 100644 Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua create mode 100644 Data/Libraries/GameLab/Editor/Window/FontManager.lua create mode 100644 Data/Libraries/GameLab/Editor/Window/GUIWindow.lua create mode 100644 Data/Libraries/GameLab/Editor/Window/SplitWindow.lua create mode 100644 Data/Libraries/GameLab/Editor/Window/init.lua create mode 100644 Editor/EditorGlobals.h delete mode 100644 Editor/GUI/IMGUI/GUIButton.cpp delete mode 100644 Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp delete mode 100644 Editor/Scripting/EditorGUI/EditorGUI.bind.cpp delete mode 100644 Editor/Scripting/EditorGUI/GUIWindow.bind.cpp delete mode 100644 Editor/Scripting/EditorGUI/SplitWindow.bind.cpp create mode 100644 Editor/Scripting/Window/ContainerWindow.bind.cpp create mode 100644 Editor/Scripting/Window/EditorGUI.bind.cpp create mode 100644 Editor/Scripting/Window/GUIWindow.bind.cpp create mode 100644 Editor/Scripting/Window/SplitWindow.bind.cpp diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua new file mode 100644 index 0000000..f8cc33b --- /dev/null +++ b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/IMGUI.lua @@ -0,0 +1,39 @@ +local Debug = GameLab.Debug + +local GUI = GameLab.Engine.GUI or {} +GameLab.Engine.GUI = GUI + +local Event = GameLab.Events.Event + +local imgui = { + currentId = 0, -- 当前可分配的controlID +} + +GUI.GetControlID = function() + imgui.currentId = imgui.currentId + 1 + return imgui.currentId +end + +-- 每次调用OnGUI（无论是哪个事件）都要重新调用BeginOnGUI方法进行重置 +GUI.BeginOnGUI = function() + imgui.currentId = 0 +end + +GUI.EndOnGUI = function() + imgui.currentId = 0 +end + +GUI.BeginFrame = function() + +end + +GUI.EndFrame = function() + +end + +GUI.Button = function() + local id = GUI.GetControlID() + +end + +return GUI \ No newline at end of file diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua new file mode 100644 index 0000000..4b83ddc --- /dev/null +++ b/Data/DefaultContent/Libraries/GameLab/Engine/GUI/init.lua @@ -0,0 +1,3 @@ +local import = GameLab.import(...) + +import("IMGUI") diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua index f603ed5..75b550d 100644 --- a/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua +++ b/Data/DefaultContent/Libraries/GameLab/Engine/Math/Rect.lua @@ -14,4 +14,8 @@ Rect.Set = function(self, rect) self.w = rect.w or rect[4] end +Rect.Contains = function(self, point) + +end + return Rect \ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/GUI/ContainerWindow.lua b/Data/Libraries/GameLab/Editor/GUI/ContainerWindow.lua deleted file mode 100644 index b270110..0000000 --- a/Data/Libraries/GameLab/Editor/GUI/ContainerWindow.lua +++ /dev/null @@ -1,20 +0,0 @@ -local NativeContainWidow = GameLab.Editor.GUI.Internal.ContainerWindow -local ContainerWindow = GameLab.GlobalClass("GameLab.Editor.GUI.ContainerWindow") - -ContainerWindow.Ctor = function(self, position, showMode, min, max) - self.m_Native = NativeContainWidow.New(position, showMode, min, max) -end - -ContainerWindow.SetTitle = function(self) - self.m_Native:SetTitle(self) -end - -ContainerWindow.SetIcon = function(self) - self.m_Native:SetIcon(self) -end - -ContainerWindow.GetNative = function(self) - return self.m_Native -end - -return ContainerWindow \ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/GUI/FontManager.lua b/Data/Libraries/GameLab/Editor/GUI/FontManager.lua deleted file mode 100644 index e69de29..0000000 diff --git a/Data/Libraries/GameLab/Editor/GUI/GUIWindow.lua b/Data/Libraries/GameLab/Editor/GUI/GUIWindow.lua deleted file mode 100644 index 8165faa..0000000 --- a/Data/Libraries/GameLab/Editor/GUI/GUIWindow.lua +++ /dev/null @@ -1,65 +0,0 @@ -local GUIWindow = GameLab.GlobalClass("GameLab.Editor.GUI.GUIWindow") -local NativeGUIWindow = GameLab.Editor.GUI.Internal.GUIWindow - -local inspect = require("inspect") - -local Debug = GameLab.Debug -local GL = GameLab.Engine.GL -local Math = GameLab.Engine.Math -local Rendering = GameLab.Engine.Rendering - -local Rect = Math.Rect - -local i = 0 -local col = { - {1, 0, 0, 1}, - {1, 1, 0, 1}, - {1, 0, 1, 1}, -} - -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) -- 在父窗口中的位置和大小 - self.m_EditorWindows = {} -- 编辑器脚本 - - i = i + 1 - self.m_ClearColor = col[i] -end - -GUIWindow.SetContainerWindow = function(self, containerWindow) - self.m_ContainerWindow = containerWindow - self.m_Native:SetContainerWindow(containerWindow:GetNative()) -end - -GUIWindow.SetPosition = function(self, pos) - self.m_Position:Set(pos) - self.m_Native:SetPosition(pos) -end - -GUIWindow.GetNative = function(self) - return self.m_Native -end - -GUIWindow.OnGUI = function(self) - self:ClearBackground() - - -end - -GUIWindow.GetContainerWindow = function(self) - return self.m_ContainerWindow -end - -GUIWindow.OnFocus = function(self) - Debug.Log("GUIWindow.OnFocus") -end - -GUIWindow.ClearBackground = function(self) - GL.ClearColor(self.m_ClearColor) - GL.Clear(GL.EBufferType.ColorBuffer) - -end - -return GUIWindow \ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua b/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua deleted file mode 100644 index 334b569..0000000 --- a/Data/Libraries/GameLab/Editor/GUI/IMGUI.lua +++ /dev/null @@ -1,10 +0,0 @@ -local imgui = GameLab.Editor.GUI or {} -GameLab.Editor.GUI = imgui - -local Event = GameLab.Events.Event - -imgui.Button = function() - -end - -return imgui \ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/GUI/SplitWindow.lua b/Data/Libraries/GameLab/Editor/GUI/SplitWindow.lua deleted file mode 100644 index 214eed6..0000000 --- a/Data/Libraries/GameLab/Editor/GUI/SplitWindow.lua +++ /dev/null @@ -1,32 +0,0 @@ -local Splitter = GameLab.Class("GameLab.Editor.GUI.Internal.Splitter") - -Splitter.Ctor = function(self) - self.width = 10 -end - --- 抽象的窗口，用来处理布局 -local SplitWindow = GameLab.GlobalClass("GameLab.Editor.GUI.SplitWindow") - -local ESplitMode = GameLab.GlobalEnum("GameLab.Editor.GUI.ESplitMode", { - "Vertical", - "Horizontal" -}) - -SplitWindow.Ctor = function(self) - self.m_Splitter = {} - self.m_SplitMode = ESplitMode.Horizontal - self.m_GUIWindows = {} - self.m_Parent = nil -- 父节点也是一个split window - self.m_SubSplit = {} -- 子节点也是split windows -end - -SplitWindow.DoSplit = function(self) - -end - --- 返回guiWnd -SplitWindow.IndexOfGUIWindow = function(self, guiWnd) - -end - -return SplitWindow \ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/GUI/init.lua b/Data/Libraries/GameLab/Editor/GUI/init.lua deleted file mode 100644 index 5507a16..0000000 --- a/Data/Libraries/GameLab/Editor/GUI/init.lua +++ /dev/null @@ -1,9 +0,0 @@ -GameLab.Editor.GUI = GameLab.Editor.GUI or {} -local m = GameLab.Editor.GUI - -local import = GameLab.import(...) - -import("ContainerWindow") -import("GUIWindow") - -return m \ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua b/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua new file mode 100644 index 0000000..2936101 --- /dev/null +++ b/Data/Libraries/GameLab/Editor/Window/ContainerWindow.lua @@ -0,0 +1,20 @@ +local NativeContainWidow = GameLab.Editor.Window.Internal.ContainerWindow +local ContainerWindow = GameLab.GlobalClass("GameLab.Editor.Window.ContainerWindow") + +ContainerWindow.Ctor = function(self, position, showMode, min, max) + self.m_Native = NativeContainWidow.New(position, showMode, min, max) +end + +ContainerWindow.SetTitle = function(self) + self.m_Native:SetTitle(self) +end + +ContainerWindow.SetIcon = function(self) + self.m_Native:SetIcon(self) +end + +ContainerWindow.GetNative = function(self) + return self.m_Native +end + +return ContainerWindow \ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/Window/FontManager.lua b/Data/Libraries/GameLab/Editor/Window/FontManager.lua new file mode 100644 index 0000000..e69de29 diff --git a/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua new file mode 100644 index 0000000..cb05518 --- /dev/null +++ b/Data/Libraries/GameLab/Editor/Window/GUIWindow.lua @@ -0,0 +1,70 @@ +local GUIWindow = GameLab.GlobalClass("GameLab.Editor.Window.GUIWindow") +local NativeGUIWindow = GameLab.Editor.Window.Internal.GUIWindow + +local inspect = require("inspect") + +local Debug = GameLab.Debug +local GL = GameLab.Engine.GL +local Math = GameLab.Engine.Math +local Rendering = GameLab.Engine.Rendering + +local Rect = Math.Rect +local Event = GameLab.Events.Event + +local i = 0 +local col = { + {1, 0, 0, 1}, + {1, 1, 0, 1}, + {1, 0, 1, 1}, +} + +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) -- 在父窗口中的位置和大小 + self.m_EditorWindows = {} -- 编辑器脚本 + + i = i + 1 + self.m_ClearColor = col[i] +end + +GUIWindow.SetContainerWindow = function(self, containerWindow) + self.m_ContainerWindow = containerWindow + self.m_Native:SetContainerWindow(containerWindow:GetNative()) +end + +GUIWindow.SetPosition = function(self, pos) + self.m_Position:Set(pos) + self.m_Native:SetPosition(pos) +end + +GUIWindow.GetNative = function(self) + return self.m_Native +end + +GUIWindow.OnGUI = function(self) + self:ClearBackground() + + local event = Event.current + + if self.m_SplitWindow then + self.m_SplitWindow:DoSplit(event) + end +end + +GUIWindow.GetContainerWindow = function(self) + return self.m_ContainerWindow +end + +GUIWindow.OnFocus = function(self) + Debug.Log("GUIWindow.OnFocus") +end + +GUIWindow.ClearBackground = function(self) + GL.ClearColor(self.m_ClearColor) + GL.Clear(GL.EBufferType.ColorBuffer) + +end + +return GUIWindow \ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/Window/SplitWindow.lua b/Data/Libraries/GameLab/Editor/Window/SplitWindow.lua new file mode 100644 index 0000000..f5d410c --- /dev/null +++ b/Data/Libraries/GameLab/Editor/Window/SplitWindow.lua @@ -0,0 +1,32 @@ +local Splitter = GameLab.Class("GameLab.Editor.Window.Internal.Splitter") + +Splitter.Ctor = function(self) + self.width = 10 +end + +-- 抽象的窗口，用来处理布局 +local SplitWindow = GameLab.GlobalClass("GameLab.Editor.Window.SplitWindow") + +local ESplitMode = GameLab.GlobalEnum("GameLab.Editor.Window.ESplitMode", { + "Vertical", + "Horizontal" +}) + +SplitWindow.Ctor = function(self) + self.m_Splitter = {} + self.m_SplitMode = ESplitMode.Horizontal + self.m_GUIWindows = {} + self.m_Parent = nil -- 父节点也是一个split window + self.m_SubSplit = {} -- 子节点也是split windows +end + +SplitWindow.DoSplit = function(self, event) + +end + +-- 返回guiWnd +SplitWindow.IndexOfGUIWindow = function(self, guiWnd) + +end + +return SplitWindow \ No newline at end of file diff --git a/Data/Libraries/GameLab/Editor/Window/init.lua b/Data/Libraries/GameLab/Editor/Window/init.lua new file mode 100644 index 0000000..07f2a92 --- /dev/null +++ b/Data/Libraries/GameLab/Editor/Window/init.lua @@ -0,0 +1,9 @@ +GameLab.Editor.Window = GameLab.Editor.Window or {} +local m = GameLab.Editor.Window + +local import = GameLab.import(...) + +import("ContainerWindow") +import("GUIWindow") + +return m \ No newline at end of file diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua index 9e2b632..4c4a708 100644 --- a/Data/Scripts/EditorApplication.lua +++ b/Data/Scripts/EditorApplication.lua @@ -8,7 +8,7 @@ local Engine = GameLab.Engine local Resource = GameLab.Engine.Resource local Rendering = GameLab.Engine.Rendering local Debug = GameLab.Debug -local GUI = GameLab.Editor.GUI +local GUI = GameLab.Editor.Window local GL = GameLab.Engine.GL local app = GameLab.Editor.EditorApplication.New() diff --git a/Data/Scripts/EditorGUI/EditorWindowManager.lua b/Data/Scripts/EditorGUI/EditorWindowManager.lua index 693cb9e..27dd16d 100644 --- a/Data/Scripts/EditorGUI/EditorWindowManager.lua +++ b/Data/Scripts/EditorGUI/EditorWindowManager.lua @@ -1,6 +1,6 @@ -local ContainerWindow = require("GameLab.Editor.GUI.ContainerWindow") -local GUIWindow = require("GameLab.Editor.GUI.GUIWindow") -local SplitWindow = require("GameLab.Editor.GUI.SplitWindow") +local ContainerWindow = require("GameLab.Editor.Window.ContainerWindow") +local GUIWindow = require("GameLab.Editor.Window.GUIWindow") +local SplitWindow = require("GameLab.Editor.Window.SplitWindow") local EditorWindowManager = {} diff --git a/Data/boot.lua b/Data/boot.lua index 6f583bc..bb95b16 100644 --- a/Data/boot.lua +++ b/Data/boot.lua @@ -26,12 +26,13 @@ end require "GameLab" require "GameLab.Events" require "GameLab.Engine" +require "GameLab.Engine.GUI" require "GameLab.Engine.Math" require "GameLab.Engine.Rendering" require "GameLab.Engine.Resource" require "GameLab.Engine.GL" require "GameLab.Editor" -require "GameLab.Editor.GUI" +require "GameLab.Editor.Window" -- debugging require("LuaPanda").start("127.0.0.1",8818) diff --git a/Editor/EditorGlobals.h b/Editor/EditorGlobals.h new file mode 100644 index 0000000..96786d7 --- /dev/null +++ b/Editor/EditorGlobals.h @@ -0,0 +1,3 @@ +#pragma once + + diff --git a/Editor/GUI/GUIWindow.cpp b/Editor/GUI/GUIWindow.cpp index a4049c8..aaab6a8 100644 --- a/Editor/GUI/GUIWindow.cpp +++ b/Editor/GUI/GUIWindow.cpp @@ -267,11 +267,15 @@ void GUIWindow::ProcessEventMessages(UINT message, WPARAM wParam, LPARAM lParam) SCRIPT_GLOBAL.setCurrentEvent.AddTable(state, ie); SCRIPT_GLOBAL.setCurrentEvent.Invoke(state, 0); + SCRIPT_GLOBAL.guiBeginOnGUI.Invoke(state, 0); + LuaBind::MemberInvoker invoker = LuaBind::MemberInvoker(state, this); invoker.member = m_Script; invoker.method = "OnGUI"; invoker.AddMember(m_Script); invoker.Invoke(0); + + SCRIPT_GLOBAL.guiEndOnGUI.Invoke(state, 0); } bool GUIWindow::SetRenderContext() diff --git a/Editor/GUI/IMGUI/GUIButton.cpp b/Editor/GUI/IMGUI/GUIButton.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp deleted file mode 100644 index 6c73116..0000000 --- a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "Editor/GUI/EditorWindows.h" -#include "Runtime/Math/Math.h" - -using namespace LuaBind; - -LUA_BIND_REGISTRY(ContainerWindow) -{ - LUA_BIND_REGISTER_METHODS(state, - { "New", _New }, - { "SetTitle", _SetTitle }, - { "SetIcon", _SetIcon }, - { "DoPaint", _DoPaint } - ); -} - -LUA_BIND_POSTPROCESS(ContainerWindow) -{ -} - -LUA_BIND_IMPL_METHOD(ContainerWindow, _SetTitle) -{ - LUA_BIND_PREPARE(L, ContainerWindow); - - cc8* title = state.GetValue(2, ""); - self->SetTitle(title); - - return 0; -} - -LUA_BIND_IMPL_METHOD(ContainerWindow, _SetIcon) -{ - LUA_BIND_PREPARE(L, ContainerWindow); - - cc8* path = state.GetValue(2, ""); - self->SetIcon(path); - - return 0; -} - -LUA_BIND_IMPL_METHOD(ContainerWindow, _DoPaint) -{ - LUA_BIND_PREPARE(L, ContainerWindow); - self->DoPaint(); - return 0; -} - -LUA_BIND_IMPL_METHOD(ContainerWindow, ContainerWindow::_New) -{ - LUA_BIND_STATE(L, ContainerWindow); - LUA_BIND_CHECK(L, "TNTT"); - - ContainerWindow* wnd = new ContainerWindow(state.GetVM()); - - Rect rect = state.GetValue(state, Rect()); - int showMode = state.GetValue(2, 0); - Vector2 min = state.GetValue(state, Vector2()); - Vector2 max = state.GetValue(state, Vector2()); - - wnd->Init(rect, showMode, min, max); - - wnd->PushUserdata(state); - - return 1; -} diff --git a/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp b/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp deleted file mode 100644 index ed26604..0000000 --- a/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp +++ /dev/null @@ -1,118 +0,0 @@ -#include "Editor/GUI/EditorWindows.h" -#include "Runtime/GUI/Font.h" -#include "Runtime/Graphics/Shader.h" -#include "Runtime/Debug/Log.h" -#include "Runtime/Graphics/GfxDevice.h" -#include "Runtime/Common/DataBuffer.h" -#include "Runtime/GUI/utf8.h" -#include "Runtime/Utilities/StaticInitiator.h" -#include "Runtime/GUI/UITextMesh.h" -#include "Runtime/Math/Math.h" -#include "Runtime/GUI/TextMeshGenerator.h" -#include "Runtime/Utilities/AutoInvoke.h" - -using namespace LuaBind; - -static std::vector* s_Codepoints; - -InitializeStaticVariables([]() { - s_Codepoints = new std::vector(); -}); - -// Editor.GUI.Text(font, str, pixelSize, lineHeight, color, anchor, alignment, wordwrap, preferred, encoding) -static int Text(lua_State* L) -{ - LUA_BIND_STATE(L); - - Font* font = (Font*)state.GetUserdata(1); - char* buf = (char*)state.GetValue(2, ""); - int pixelSize = state.GetValue(3, 12); - int lineHeight = state.GetValue(4, pixelSize + 3); - Color32 color = state.GetValue(5, Color32::white); - int anchor = state.GetValue(6, TextAnchor_UpperLeft); - int alignment = state.GetValue(7, TextAlignment_Left); - bool wordwrap = state.GetValue(8, false); - int preferred = state.GetValue(9, 0); - int encoding = state.GetValue(10, EEncoding::Encoding_UTF8); - - s_Codepoints->clear(); - InvokeWhenLeave([]() { - s_Codepoints->clear(); - }); - - if (encoding == EEncoding::Encoding_UTF8) - { - while (*buf != 0) { - int err; - s_Codepoints->push_back(utf8::getu8c(&buf, &err)); - if (err != 0) - { - log_warning("Illegal utf8 bytes %d", err); - } - } - } - else if (encoding == EEncoding::Encoding_UTF16) - { - while (*buf != 0) { - unsigned short* s = (unsigned short*)(buf); - s_Codepoints->push_back(*s); - buf += 2; - } - } - else if (encoding == EEncoding::Encoding_ASCII) - { - while (*buf != 0) { - s_Codepoints->push_back(*buf); - buf += 1; - } - } - - font->RenderCharacters(*s_Codepoints, pixelSize); - - UnicodeString str; - str.str = s_Codepoints->data(); - str.length = s_Codepoints->size(); - - WipeGLError(); - - const UITextMesh* tm = g_TextMeshGenerator.GetTextMesh(str, font, pixelSize, lineHeight, color, (ETextAnchor)anchor, (ETextAlignment)alignment, wordwrap, preferred); - tm->Draw(); - - return 0; -} - -static luaL_Reg guiFuncs[] = { - {"Text", Text}, - {0, 0} -}; - -// GameLab.Editor.GUI -int luaopen_GameLab_Editor_GUI(lua_State* L) -{ - log_info_tag("Scripting", "luaopen_GameLab_Editor_GUI()"); - - LUA_BIND_STATE(L); - - state.PushGlobalNamespace(); - state.PushNamespace("GameLab"); - state.PushNamespace("Editor"); - state.PushNamespace("GUI"); - - state.PushNamespace("Internal"); - state.RegisterNativeClass(); - state.RegisterNativeClass(); - state.PopNamespace(); - - LUA_BIND_REGISTER_ENUM(state, "EShowMode", - { "NormalWindow", ContainerWindow::kShowNormalWindow }, - { "ShowPopupMenu", ContainerWindow::kShowPopupMenu }, - { "Utility ", ContainerWindow::kShowUtility }, - { "NoShadow", ContainerWindow::kShowNoShadow }, - { "MainWindow", ContainerWindow::kShowMainWindow }, - { "AuxWindow", ContainerWindow::kShowAuxWindow } - ); - - state.RegisterMethods(guiFuncs); - - return 1; -} \ No newline at end of file diff --git a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp deleted file mode 100644 index 212cb50..0000000 --- a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "Editor/GUI/EditorWindows.h" -#include "Runtime/Math/Math.h" - -LUA_BIND_REGISTRY(GUIWindow) -{ - LUA_BIND_REGISTER_METHODS(state, - { "DoPaint", _DoPaint }, - { "Focus", _Focus }, - { "SetContainerWindow", _SetContainerWindow }, - { "SetPosition", _SetPosition }, - { "New", _New } - ); -} - -LUA_BIND_POSTPROCESS(GUIWindow) -{ -} - -// GUIWindow.New([script]) -LUA_BIND_IMPL_METHOD(GUIWindow, _New) -{ - LUA_BIND_STATE(L, GUIWindow); - LUA_BIND_CHECK(L, "T"); - - GUIWindow* wnd = new GUIWindow(state.GetVM()); - - if (LuaHelper::IsType(state, "GameLab.Editor.GUI.GUIWindow", -1)) - wnd->SetMemberRef(state, wnd->m_Script, -1); - - wnd->PushUserdata(state); - return 1; -} - -LUA_BIND_IMPL_METHOD(GUIWindow, _DoPaint) -{ - LUA_BIND_PREPARE(L, GUIWindow); - self->DoPaint(); - return 0; -} - -LUA_BIND_IMPL_METHOD(GUIWindow, _Focus) -{ - LUA_BIND_PREPARE(L, GUIWindow); - self->Focus(); - return 0; -} - -LUA_BIND_IMPL_METHOD(GUIWindow, _SetContainerWindow) -{ - LUA_BIND_PREPARE(L, GUIWindow); - ContainerWindow* wnd = state.GetUserdata(2); - self->SetContainerWindow(wnd); - return 0; -} - -// GUIWindow.SetPosition(self, {x, y, width, height}) -LUA_BIND_IMPL_METHOD(GUIWindow, _SetPosition) -{ - LUA_BIND_PREPARE(L, GUIWindow); - if (!state.CheckParams(1, "UT")) - return 0; - - Rect rect; - rect.x = state.GetField(2, 1, 0); - rect.y = state.GetField(2, 2, 0); - rect.width = state.GetField(2, 3, 0); - rect.height = state.GetField(2, 4, 0); - self->SetPosition(rect); - return 0; -} diff --git a/Editor/Scripting/EditorGUI/SplitWindow.bind.cpp b/Editor/Scripting/EditorGUI/SplitWindow.bind.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/Editor/Scripting/EditorScripting.cpp b/Editor/Scripting/EditorScripting.cpp index c8cfbbb..244dd78 100644 --- a/Editor/Scripting/EditorScripting.cpp +++ b/Editor/Scripting/EditorScripting.cpp @@ -17,9 +17,7 @@ extern int luaopen_GameLab_Engine_Resource(lua_State* L); // GameLab.Engine.Reso extern int luaopen_GameLab_Engine_GUI(lua_State* L); extern int luaopen_GameLab_Editor(lua_State* L); // GameLab.Editor -extern int luaopen_GameLab_Editor_GUI(lua_State* L); // GameLab.Editor.GUI -extern int luaopen_GameLab_Editor_GUILayout(lua_State* L); // GameLab.Editor.GUILayout -extern int luaopen_GameLab_Editor_IMGUI(lua_State* L); // GameLab.Editor.IMGUI +extern int luaopen_GameLab_Editor_Window(lua_State* L); // GameLab.Editor.Window extern int luaopen_GameLab_Editor_Resource(lua_State* L); // GameLab.Editor.Resource extern int luaopen_GameLab_Editor_Profiling(lua_State* L); // GameLab.Editor.Profiling extern int luaopen_GameLab_Editor_Animation(lua_State* L); // GameLab.Editor.Animation @@ -49,7 +47,7 @@ bool SetupGameLabEditorScripting(lua_State* L) openlib(luaopen_GameLab_Engine_GUI); openlib(luaopen_GameLab_Editor); - openlib(luaopen_GameLab_Editor_GUI); + openlib(luaopen_GameLab_Editor_Window); return true; } diff --git a/Editor/Scripting/Window/ContainerWindow.bind.cpp b/Editor/Scripting/Window/ContainerWindow.bind.cpp new file mode 100644 index 0000000..6c73116 --- /dev/null +++ b/Editor/Scripting/Window/ContainerWindow.bind.cpp @@ -0,0 +1,64 @@ +#include "Editor/GUI/EditorWindows.h" +#include "Runtime/Math/Math.h" + +using namespace LuaBind; + +LUA_BIND_REGISTRY(ContainerWindow) +{ + LUA_BIND_REGISTER_METHODS(state, + { "New", _New }, + { "SetTitle", _SetTitle }, + { "SetIcon", _SetIcon }, + { "DoPaint", _DoPaint } + ); +} + +LUA_BIND_POSTPROCESS(ContainerWindow) +{ +} + +LUA_BIND_IMPL_METHOD(ContainerWindow, _SetTitle) +{ + LUA_BIND_PREPARE(L, ContainerWindow); + + cc8* title = state.GetValue(2, ""); + self->SetTitle(title); + + return 0; +} + +LUA_BIND_IMPL_METHOD(ContainerWindow, _SetIcon) +{ + LUA_BIND_PREPARE(L, ContainerWindow); + + cc8* path = state.GetValue(2, ""); + self->SetIcon(path); + + return 0; +} + +LUA_BIND_IMPL_METHOD(ContainerWindow, _DoPaint) +{ + LUA_BIND_PREPARE(L, ContainerWindow); + self->DoPaint(); + return 0; +} + +LUA_BIND_IMPL_METHOD(ContainerWindow, ContainerWindow::_New) +{ + LUA_BIND_STATE(L, ContainerWindow); + LUA_BIND_CHECK(L, "TNTT"); + + ContainerWindow* wnd = new ContainerWindow(state.GetVM()); + + Rect rect = state.GetValue(state, Rect()); + int showMode = state.GetValue(2, 0); + Vector2 min = state.GetValue(state, Vector2()); + Vector2 max = state.GetValue(state, Vector2()); + + wnd->Init(rect, showMode, min, max); + + wnd->PushUserdata(state); + + return 1; +} diff --git a/Editor/Scripting/Window/EditorGUI.bind.cpp b/Editor/Scripting/Window/EditorGUI.bind.cpp new file mode 100644 index 0000000..838e752 --- /dev/null +++ b/Editor/Scripting/Window/EditorGUI.bind.cpp @@ -0,0 +1,118 @@ +#include "Editor/GUI/EditorWindows.h" +#include "Runtime/GUI/Font.h" +#include "Runtime/Graphics/Shader.h" +#include "Runtime/Debug/Log.h" +#include "Runtime/Graphics/GfxDevice.h" +#include "Runtime/Common/DataBuffer.h" +#include "Runtime/GUI/utf8.h" +#include "Runtime/Utilities/StaticInitiator.h" +#include "Runtime/GUI/UITextMesh.h" +#include "Runtime/Math/Math.h" +#include "Runtime/GUI/TextMeshGenerator.h" +#include "Runtime/Utilities/AutoInvoke.h" + +using namespace LuaBind; + +static std::vector* s_Codepoints; + +InitializeStaticVariables([]() { + s_Codepoints = new std::vector(); +}); + +// Editor.GUI.Text(font, str, pixelSize, lineHeight, color, anchor, alignment, wordwrap, preferred, encoding) +static int Text(lua_State* L) +{ + LUA_BIND_STATE(L); + + Font* font = (Font*)state.GetUserdata(1); + char* buf = (char*)state.GetValue(2, ""); + int pixelSize = state.GetValue(3, 12); + int lineHeight = state.GetValue(4, pixelSize + 3); + Color32 color = state.GetValue(5, Color32::white); + int anchor = state.GetValue(6, TextAnchor_UpperLeft); + int alignment = state.GetValue(7, TextAlignment_Left); + bool wordwrap = state.GetValue(8, false); + int preferred = state.GetValue(9, 0); + int encoding = state.GetValue(10, EEncoding::Encoding_UTF8); + + s_Codepoints->clear(); + InvokeWhenLeave([]() { + s_Codepoints->clear(); + }); + + if (encoding == EEncoding::Encoding_UTF8) + { + while (*buf != 0) { + int err; + s_Codepoints->push_back(utf8::getu8c(&buf, &err)); + if (err != 0) + { + log_warning("Illegal utf8 bytes %d", err); + } + } + } + else if (encoding == EEncoding::Encoding_UTF16) + { + while (*buf != 0) { + unsigned short* s = (unsigned short*)(buf); + s_Codepoints->push_back(*s); + buf += 2; + } + } + else if (encoding == EEncoding::Encoding_ASCII) + { + while (*buf != 0) { + s_Codepoints->push_back(*buf); + buf += 1; + } + } + + font->RenderCharacters(*s_Codepoints, pixelSize); + + UnicodeString str; + str.str = s_Codepoints->data(); + str.length = s_Codepoints->size(); + + WipeGLError(); + + const UITextMesh* tm = g_TextMeshGenerator.GetTextMesh(str, font, pixelSize, lineHeight, color, (ETextAnchor)anchor, (ETextAlignment)alignment, wordwrap, preferred); + tm->Draw(); + + return 0; +} + +static luaL_Reg guiFuncs[] = { + {"Text", Text}, + {0, 0} +}; + +// GameLab.Editor.Window +int luaopen_GameLab_Editor_Window(lua_State* L) +{ + log_info_tag("Scripting", "luaopen_GameLab_Editor_Window()"); + + LUA_BIND_STATE(L); + + state.PushGlobalNamespace(); + state.PushNamespace("GameLab"); + state.PushNamespace("Editor"); + state.PushNamespace("Window"); + + state.PushNamespace("Internal"); + state.RegisterNativeClass(); + state.RegisterNativeClass(); + state.PopNamespace(); + + LUA_BIND_REGISTER_ENUM(state, "EShowMode", + { "NormalWindow", ContainerWindow::kShowNormalWindow }, + { "ShowPopupMenu", ContainerWindow::kShowPopupMenu }, + { "Utility ", ContainerWindow::kShowUtility }, + { "NoShadow", ContainerWindow::kShowNoShadow }, + { "MainWindow", ContainerWindow::kShowMainWindow }, + { "AuxWindow", ContainerWindow::kShowAuxWindow } + ); + + state.RegisterMethods(guiFuncs); + + return 1; +} \ No newline at end of file diff --git a/Editor/Scripting/Window/GUIWindow.bind.cpp b/Editor/Scripting/Window/GUIWindow.bind.cpp new file mode 100644 index 0000000..604c26a --- /dev/null +++ b/Editor/Scripting/Window/GUIWindow.bind.cpp @@ -0,0 +1,70 @@ +#include "Editor/GUI/EditorWindows.h" +#include "Runtime/Math/Math.h" + +LUA_BIND_REGISTRY(GUIWindow) +{ + LUA_BIND_REGISTER_METHODS(state, + { "DoPaint", _DoPaint }, + { "Focus", _Focus }, + { "SetContainerWindow", _SetContainerWindow }, + { "SetPosition", _SetPosition }, + { "New", _New } + ); +} + +LUA_BIND_POSTPROCESS(GUIWindow) +{ +} + +// GUIWindow.New([script]) +LUA_BIND_IMPL_METHOD(GUIWindow, _New) +{ + LUA_BIND_STATE(L, GUIWindow); + LUA_BIND_CHECK(L, "T"); + + GUIWindow* wnd = new GUIWindow(state.GetVM()); + + if (LuaHelper::IsType(state, "GameLab.Editor.Window.GUIWindow", -1)) + wnd->SetMemberRef(state, wnd->m_Script, -1); + + wnd->PushUserdata(state); + return 1; +} + +LUA_BIND_IMPL_METHOD(GUIWindow, _DoPaint) +{ + LUA_BIND_PREPARE(L, GUIWindow); + self->DoPaint(); + return 0; +} + +LUA_BIND_IMPL_METHOD(GUIWindow, _Focus) +{ + LUA_BIND_PREPARE(L, GUIWindow); + self->Focus(); + return 0; +} + +LUA_BIND_IMPL_METHOD(GUIWindow, _SetContainerWindow) +{ + LUA_BIND_PREPARE(L, GUIWindow); + ContainerWindow* wnd = state.GetUserdata(2); + self->SetContainerWindow(wnd); + return 0; +} + +// GUIWindow.SetPosition(self, {x, y, width, height}) +LUA_BIND_IMPL_METHOD(GUIWindow, _SetPosition) +{ + LUA_BIND_PREPARE(L, GUIWindow); + if (!state.CheckParams(1, "UT")) + return 0; + + Rect rect; + rect.x = state.GetField(2, 1, 0); + rect.y = state.GetField(2, 2, 0); + rect.width = state.GetField(2, 3, 0); + rect.height = state.GetField(2, 4, 0); + self->SetPosition(rect); + return 0; +} diff --git a/Editor/Scripting/Window/SplitWindow.bind.cpp b/Editor/Scripting/Window/SplitWindow.bind.cpp new file mode 100644 index 0000000..e69de29 diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj index aaaf748..7fab991 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj +++ b/Projects/VisualStudio/Editor/Editor.vcxproj @@ -153,7 +153,6 @@ - @@ -162,15 +161,15 @@ - - - - + + + + @@ -251,6 +250,7 @@ + diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters index fafbf97..a9af0ec 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters +++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters @@ -28,12 +28,6 @@ {5b8dba28-42d0-450a-98e1-ca4a65a4fc76} - - {848489fc-f661-4b10-91f5-db1687293b95} - - - {87edd159-c171-4ccb-9094-9e5061c980d0} - {476cedf1-fc4a-48a5-8782-bed16dabb86e} @@ -76,9 +70,6 @@ {78c0524a-9039-474a-9a2e-fa243e84d60e} - - {47032dd6-dca2-478f-b594-d08c0b22e119} - {dbc5b9a8-4107-4324-aa71-e6a9a7b6d23d} @@ -118,6 +109,9 @@ {ebaa23ba-fd66-4554-8a90-959097e25cf3} + + {848489fc-f661-4b10-91f5-db1687293b95} + @@ -159,21 +153,9 @@ Editor\Resource - - Editor\Scripting\EditorGUI - Editor\Scripting - - Editor\Scripting\EditorGUI - - - Editor\Scripting\EditorGUI - - - Editor\Scripting\EditorGUI - Editor\Scripting\IMGUI @@ -243,9 +225,6 @@ Editor\GUI - - Editor\GUI\IMGUI - Runtime\Graphics @@ -424,6 +403,18 @@ Editor\Scripting + + Editor\Scripting\Window + + + Editor\Scripting\Window + + + Editor\Scripting\Window + + + Editor\Scripting\Window + @@ -762,6 +753,9 @@ Editor\Scripting + + Editor\Scripting + diff --git a/Runtime/Events/InputEvent.cpp b/Runtime/Events/InputEvent.cpp index c5994ef..07d8778 100644 --- a/Runtime/Events/InputEvent.cpp +++ b/Runtime/Events/InputEvent.cpp @@ -249,6 +249,10 @@ void InputEvent::CastToTable(LuaBind::State& state) const lua_pushnumber(state, type); lua_setfield(state, table, "type"); + // "used" + lua_pushboolean(state, use); + lua_setfield(state, table, "use"); + // "mousePosition" state.PushLuaObject(mousePosition); lua_setfield(state, table, "mousePosition"); diff --git a/Runtime/Lua/LuaBind/LuaBindInvoker.cpp b/Runtime/Lua/LuaBind/LuaBindInvoker.cpp index d6780d7..90ab078 100644 --- a/Runtime/Lua/LuaBind/LuaBindInvoker.cpp +++ b/Runtime/Lua/LuaBind/LuaBindInvoker.cpp @@ -106,6 +106,8 @@ namespace LuaBind lua_replace(state, -2); lua_insert(state, -1 - argc); state.Call(argc, nReturns); + + argc = 0; } } \ No newline at end of file diff --git a/Runtime/Scripting/RuntimeScriptGlobals.cpp b/Runtime/Scripting/RuntimeScriptGlobals.cpp index 5f140a1..bb3139c 100644 --- a/Runtime/Scripting/RuntimeScriptGlobals.cpp +++ b/Runtime/Scripting/RuntimeScriptGlobals.cpp @@ -6,5 +6,10 @@ namespace Scripting void FillRuntimeScriptGlobals(RuntimeScriptGlobals& globals) { globals.setCurrentEvent = "GameLab.Events.Event.SetCurrentEvent"; + + globals.guiBeginFrame = "GameLab.Engine.GUI.BeginFrame"; + globals.guiEndFrame = "GameLab.Engine.GUI.EndFrame"; + globals.guiBeginOnGUI = "GameLab.Engine.GUI.BeginOnGUI"; + globals.guiEndOnGUI = "GameLab.Engine.GUI.EndOnGUI"; } } \ No newline at end of file diff --git a/Runtime/Scripting/RuntimeScriptGlobals.h b/Runtime/Scripting/RuntimeScriptGlobals.h index 76448a9..e6e6347 100644 --- a/Runtime/Scripting/RuntimeScriptGlobals.h +++ b/Runtime/Scripting/RuntimeScriptGlobals.h @@ -13,6 +13,11 @@ struct RuntimeScriptGlobals { DECL_LUA_FUNC(setCurrentEvent); + + DECL_LUA_FUNC(guiBeginFrame); + DECL_LUA_FUNC(guiEndFrame); + DECL_LUA_FUNC(guiBeginOnGUI); + DECL_LUA_FUNC(guiEndOnGUI); }; namespace Scripting -- cgit v1.1-26-g67d0