From b7310c9cce95bfc9bfe135063ee0e97fbc654928 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 1 Nov 2021 16:53:51 +0800 Subject: *misc --- Editor/EditorMain.cpp | 16 ++++++++-------- Editor/Scripting/EditorScripting.cpp | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'Editor') diff --git a/Editor/EditorMain.cpp b/Editor/EditorMain.cpp index 187df1c..a74a0b2 100644 --- a/Editor/EditorMain.cpp +++ b/Editor/EditorMain.cpp @@ -20,14 +20,14 @@ void ErrorHandle(cc8* msg) void TestFont() { - TextGeneratingSettings setting; - setting.margin = 5; - setting.padding = 5; - setting.atlasSize = Internal::Vector2(512, 512); - - Font::Instance()->Setup(setting); - auto content = L"abcdf与电子计算机的区别 与电子计算机的最大区别在于: 只是简单的计算工具,有些机型具备函数计算功能,有些机型具备一定的贮存功能,但一般只能存储几组数据。计算机则具备复杂存贮功能、控制功能,更加"; - Font::Instance()->RenderCharacters((character::Codepoint*)content, wcslen(content), 14); + //TextGeneratingSettings setting; + //setting.margin = 5; + //setting.padding = 5; + //setting.atlasSize = Internal::Vector2(512, 512); + + //Font::Instance()->Setup(setting); + //auto content = L"abcdf与电子计算机的区别 与电子计算机的最大区别在于: 只是简单的计算工具,有些机型具备函数计算功能,有些机型具备一定的贮存功能,但一般只能存储几组数据。计算机则具备复杂存贮功能、控制功能,更加"; + // Font::Instance()->RenderCharacters((character::Codepoint*)content, wcslen(content), 14); } int BeforeMainLoop(lua_State* L) diff --git a/Editor/Scripting/EditorScripting.cpp b/Editor/Scripting/EditorScripting.cpp index 43ed666..c8cfbbb 100644 --- a/Editor/Scripting/EditorScripting.cpp +++ b/Editor/Scripting/EditorScripting.cpp @@ -14,6 +14,7 @@ extern int luaopen_GameLab_Engine_Networking(lua_State* L); // GameLab.Engine.Ne extern int luaopen_GameLab_Engine_Animation(lua_State* L); // GameLab.Engine.Animation extern int luaopen_GameLab_Engine_GL(lua_State* L);// GameLab.Engine.GL extern int luaopen_GameLab_Engine_Resource(lua_State* L); // GameLab.Engine.Resource +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 @@ -44,7 +45,8 @@ bool SetupGameLabEditorScripting(lua_State* L) openlib(luaopen_GameLab_Engine_Rendering); openlib(luaopen_GameLab_Engine_GL); - openlib(luaopen_GameLab_Engine_Resource); + openlib(luaopen_GameLab_Engine_Resource); + openlib(luaopen_GameLab_Engine_GUI); openlib(luaopen_GameLab_Editor); openlib(luaopen_GameLab_Editor_GUI); -- cgit v1.1-26-g67d0