diff options
Diffstat (limited to 'Editor')
| -rw-r--r-- | Editor/EditorGlobals.h | 3 | ||||
| -rw-r--r-- | Editor/GUI/GUIWindow.cpp | 4 | ||||
| -rw-r--r-- | Editor/GUI/IMGUI/GUIButton.cpp | 0 | ||||
| -rw-r--r-- | Editor/Scripting/EditorScripting.cpp | 6 | ||||
| -rw-r--r-- | Editor/Scripting/Window/ContainerWindow.bind.cpp (renamed from Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp) | 0 | ||||
| -rw-r--r-- | Editor/Scripting/Window/EditorGUI.bind.cpp (renamed from Editor/Scripting/EditorGUI/EditorGUI.bind.cpp) | 8 | ||||
| -rw-r--r-- | Editor/Scripting/Window/GUIWindow.bind.cpp (renamed from Editor/Scripting/EditorGUI/GUIWindow.bind.cpp) | 2 | ||||
| -rw-r--r-- | Editor/Scripting/Window/SplitWindow.bind.cpp (renamed from Editor/Scripting/EditorGUI/SplitWindow.bind.cpp) | 0 |
8 files changed, 14 insertions, 9 deletions
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 --- a/Editor/GUI/IMGUI/GUIButton.cpp +++ /dev/null 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/EditorGUI/ContainerWindow.bind.cpp b/Editor/Scripting/Window/ContainerWindow.bind.cpp index 6c73116..6c73116 100644 --- a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp +++ b/Editor/Scripting/Window/ContainerWindow.bind.cpp diff --git a/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp b/Editor/Scripting/Window/EditorGUI.bind.cpp index ed26604..838e752 100644 --- a/Editor/Scripting/EditorGUI/EditorGUI.bind.cpp +++ b/Editor/Scripting/Window/EditorGUI.bind.cpp @@ -86,17 +86,17 @@ static luaL_Reg guiFuncs[] = { {0, 0} }; -// GameLab.Editor.GUI -int luaopen_GameLab_Editor_GUI(lua_State* L) +// GameLab.Editor.Window +int luaopen_GameLab_Editor_Window(lua_State* L) { - log_info_tag("Scripting", "luaopen_GameLab_Editor_GUI()"); + log_info_tag("Scripting", "luaopen_GameLab_Editor_Window()"); LUA_BIND_STATE(L); state.PushGlobalNamespace(); state.PushNamespace("GameLab"); state.PushNamespace("Editor"); - state.PushNamespace("GUI"); + state.PushNamespace("Window"); state.PushNamespace("Internal"); state.RegisterNativeClass<ContainerWindow>(); diff --git a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp b/Editor/Scripting/Window/GUIWindow.bind.cpp index 212cb50..604c26a 100644 --- a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp +++ b/Editor/Scripting/Window/GUIWindow.bind.cpp @@ -24,7 +24,7 @@ LUA_BIND_IMPL_METHOD(GUIWindow, _New) GUIWindow* wnd = new GUIWindow(state.GetVM()); - if (LuaHelper::IsType(state, "GameLab.Editor.GUI.GUIWindow", -1)) + if (LuaHelper::IsType(state, "GameLab.Editor.Window.GUIWindow", -1)) wnd->SetMemberRef(state, wnd->m_Script, -1); wnd->PushUserdata(state); diff --git a/Editor/Scripting/EditorGUI/SplitWindow.bind.cpp b/Editor/Scripting/Window/SplitWindow.bind.cpp index e69de29..e69de29 100644 --- a/Editor/Scripting/EditorGUI/SplitWindow.bind.cpp +++ b/Editor/Scripting/Window/SplitWindow.bind.cpp |