From 4dafefe46a72ba47468b13d011f8299055081b0f Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 22 Oct 2021 23:59:54 +0800 Subject: *LuaBind --- Editor/Scripting/Editor/EditorApplication.bind.cpp | 2 +- Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp | 2 +- Editor/Scripting/EditorGUI/GUIWindow.bind.cpp | 14 +++----------- 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'Editor/Scripting') diff --git a/Editor/Scripting/Editor/EditorApplication.bind.cpp b/Editor/Scripting/Editor/EditorApplication.bind.cpp index 672bdcd..c6ea9f7 100644 --- a/Editor/Scripting/Editor/EditorApplication.bind.cpp +++ b/Editor/Scripting/Editor/EditorApplication.bind.cpp @@ -16,7 +16,7 @@ LUA_BIND_POSTPROCESS(EditorApplication) LUA_BIND_IMPL_METHOD(EditorApplication, EditorApplication::_New) { LUA_BIND_PREPARE(L, EditorApplication); - EditorApplication* app = new EditorApplication(); + EditorApplication* app = new EditorApplication(state.GetVM()); app->PushUserdata(state); return 1; } diff --git a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp index 75d28aa..ce0efc8 100644 --- a/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp +++ b/Editor/Scripting/EditorGUI/ContainerWindow.bind.cpp @@ -54,7 +54,7 @@ LUA_BIND_IMPL_METHOD(ContainerWindow, ContainerWindow::_New) LUA_BIND_STATE(L, ContainerWindow); LUA_BIND_CHECK(L, "TNTT"); - ContainerWindow* wnd = new ContainerWindow(); + ContainerWindow* wnd = new ContainerWindow(state.GetVM()); Rectf rect = state.GetValue(state, Rectf()); int showMode = state.GetValue(2, 0); diff --git a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp index 78ea635..075bce5 100644 --- a/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp +++ b/Editor/Scripting/EditorGUI/GUIWindow.bind.cpp @@ -7,8 +7,7 @@ LUA_BIND_REGISTRY(GUIWindow) { "Focus", _Focus }, { "SetContainerWindow", _SetContainerWindow }, { "SetPosition", _SetPosition }, - { "New", _New }, - { "__gc", _GC } + { "New", _New } ); } @@ -16,13 +15,6 @@ LUA_BIND_POSTPROCESS(GUIWindow) { } -LUA_BIND_IMPL_METHOD(GUIWindow, _GC) -{ - LUA_BIND_PREPARE(L, GUIWindow); - - return 0; -} - LUA_BIND_IMPL_METHOD(GUIWindow, _DoPaint) { LUA_BIND_PREPARE(L, GUIWindow); @@ -64,8 +56,8 @@ LUA_BIND_IMPL_METHOD(GUIWindow, _SetPosition) LUA_BIND_IMPL_METHOD(GUIWindow, _New) { LUA_BIND_PREPARE(L, GUIWindow); - GUIWindow* wnd = new GUIWindow(); - wnd->PushUserdata(state); + GUIWindow* wnd = new GUIWindow(state.GetVM()); wnd->Init(); + wnd->PushUserdata(state); return 1; } \ No newline at end of file -- cgit v1.1-26-g67d0