diff options
| -rw-r--r-- | Editor/EditorApplication.h | 1 | ||||
| -rw-r--r-- | Editor/EditorMain.cpp | 1 | ||||
| -rw-r--r-- | Editor/Scripting/Editor/EditorApplication.bind.cpp | 10 | ||||
| -rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj.filters | 3 | ||||
| -rw-r--r-- | Resources/Scripts/EditorApplication.lua | 3 |
5 files changed, 6 insertions, 12 deletions
diff --git a/Editor/EditorApplication.h b/Editor/EditorApplication.h index eb08c46..35c427c 100644 --- a/Editor/EditorApplication.h +++ b/Editor/EditorApplication.h @@ -24,7 +24,6 @@ private : LUA_BIND_DECL_METHOD(_New);
LUA_BIND_DECL_METHOD(_SetMainWindow);
- LUA_BIND_DECL_METHOD(_SetupMenu);
LUA_BIND_DECL_METHOD(_PullMessage);
diff --git a/Editor/EditorMain.cpp b/Editor/EditorMain.cpp index 1fdf726..88f7513 100644 --- a/Editor/EditorMain.cpp +++ b/Editor/EditorMain.cpp @@ -28,7 +28,6 @@ void InitLuaState() // https://stackoverflow.com/questions/21495901/loadlibrarya-and-relative-path/21495971
// ll_load装载dll，路径需要设置搜索路径
- //log_info(Win::GetCurrentWorkingDirectory());
std::string workingDir = Win::GetCurrentWorkingDirectory();
Win::SetDllSearchDirectory(workingDir);
diff --git a/Editor/Scripting/Editor/EditorApplication.bind.cpp b/Editor/Scripting/Editor/EditorApplication.bind.cpp index 82abdd5..33d73f7 100644 --- a/Editor/Scripting/Editor/EditorApplication.bind.cpp +++ b/Editor/Scripting/Editor/EditorApplication.bind.cpp @@ -5,7 +5,6 @@ LUA_BIND_REGISTRY(EditorApplication) LUA_BIND_REGISTER_METHODS(state, {"New", EditorApplication::_New}, { "SetMainWindow", _SetMainWindow }, - { "SetupMenu", _SetupMenu }, { "PullMessage", _PullMessage } ); } @@ -36,12 +35,7 @@ LUA_BIND_IMPL_METHOD(EditorApplication, _SetMainWindow) ContainnerWindow* wnd = state.GetUserdata<ContainnerWindow>(2); self->SetMainWindow(wnd); - return 0; -} -LUA_BIND_IMPL_METHOD(EditorApplication, _SetupMenu) -{ - LUA_BIND_PREPARE(L, EditorApplication); - MenuManager::Instance()->Init();
+ MenuManager::Instance()->Init();
return 0; -}
\ No newline at end of file +} diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters index df356e4..fd17b7d 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters +++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters @@ -76,6 +76,9 @@ <Filter Include="Editor\Win">
<UniqueIdentifier>{c2d9fa5b-8087-48e3-90b7-b5e6d02be909}</UniqueIdentifier>
</Filter>
+ <Filter Include="Editor\Serialize">
+ <UniqueIdentifier>{34aaae68-c302-4827-917f-671b0279e8c6}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
diff --git a/Resources/Scripts/EditorApplication.lua b/Resources/Scripts/EditorApplication.lua index c4d9389..d7beb3c 100644 --- a/Resources/Scripts/EditorApplication.lua +++ b/Resources/Scripts/EditorApplication.lua @@ -14,7 +14,6 @@ mainWindow:SetTitle("GameLab") mainWindow:SetIcon("./Icon/GameLab.ico") app:SetMainWindow(mainWindow) -app:SetupMenu() local guiWindow = GUI.GUIWindow.New() guiWindow:SetContainnerWindow(mainWindow) @@ -26,4 +25,4 @@ while true do app:PullMessage() -end
\ No newline at end of file +end |