From dc071210cabf494c8ae22583a0cc298ae79e07e4 Mon Sep 17 00:00:00 2001 From: fallenoak Date: Mon, 26 Jan 2026 15:54:06 -0600 Subject: [PATCH] chore(ui): clean up RegisterSimpleFrameScriptMethods --- src/glue/CGlueMgr.cpp | 2 +- src/ui/ScriptFunctions.cpp | 56 ------------------- src/ui/ScriptFunctions.hpp | 17 ------ src/ui/ScriptFunctionsShared.cpp | 2 +- .../ScriptMethods.cpp} | 56 ++++++++++++++++++- src/ui/simple/ScriptMethods.hpp | 6 ++ 6 files changed, 61 insertions(+), 78 deletions(-) delete mode 100644 src/ui/ScriptFunctions.cpp delete mode 100644 src/ui/ScriptFunctions.hpp rename src/ui/{ScriptFunctionsSimpleFrame.cpp => simple/ScriptMethods.cpp} (68%) create mode 100644 src/ui/simple/ScriptMethods.hpp diff --git a/src/glue/CGlueMgr.cpp b/src/glue/CGlueMgr.cpp index fa46eed..e19ad25 100644 --- a/src/glue/CGlueMgr.cpp +++ b/src/glue/CGlueMgr.cpp @@ -26,11 +26,11 @@ #include "ui/FrameXML.hpp" #include "ui/Interface.hpp" #include "ui/Key.hpp" -#include "ui/ScriptFunctions.hpp" #include "ui/ScriptFunctionsSystem.hpp" #include "ui/game/CGVideoOptions.hpp" #include "ui/simple/CSimpleModelFFX.hpp" #include "ui/simple/CSimpleTop.hpp" +#include "ui/simple/ScriptMethods.hpp" #include "util/Filesystem.hpp" #include "util/Locale.hpp" #include "util/Log.hpp" diff --git a/src/ui/ScriptFunctions.cpp b/src/ui/ScriptFunctions.cpp deleted file mode 100644 index e1a7943..0000000 --- a/src/ui/ScriptFunctions.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include "ui/ScriptFunctions.hpp" -#include "ui/FrameScript.hpp" -#include "ui/simple/CSimpleButton.hpp" -#include "ui/simple/CSimpleCheckbox.hpp" -#include "ui/simple/CSimpleEditBox.hpp" -#include "ui/simple/CSimpleFont.hpp" -#include "ui/simple/CSimpleFontString.hpp" -#include "ui/simple/CSimpleFrame.hpp" -#include "ui/simple/CSimpleHTML.hpp" -#include "ui/simple/CSimpleModel.hpp" -#include "ui/simple/CSimpleModelFFX.hpp" -#include "ui/simple/CSimpleScrollFrame.hpp" -#include "ui/simple/CSimpleSlider.hpp" -#include "ui/simple/CSimpleTexture.hpp" - -void RegisterSimpleFrameScriptMethods() { - for (int32_t i = 0; i < NUM_SCRIPT_FUNCTIONS_SIMPLE_FRAME; ++i) { - FrameScript_RegisterFunction( - FrameScript::s_ScriptFunctions_SimpleFrame[i].name, - FrameScript::s_ScriptFunctions_SimpleFrame[i].method - ); - } - - // TODO - // CSimpleAnim::CreateScriptMetaTable(); - // CSimpleTranslationAnim::CreateScriptMetaTable(); - // CSimpleRotationAnim::CreateScriptMetaTable(); - // CSimpleScaleAnim::CreateScriptMetaTable(); - // CSimpleControlPoint::CreateScriptMetaTable(); - // CSimplePathAnim::CreateScriptMetaTable(); - // CSimpleAlphaAnim::CreateScriptMetaTable(); - // CSimpleAnimGroup::CreateScriptMetaTable(); - - CSimpleFont::CreateScriptMetaTable(); - CSimpleTexture::CreateScriptMetaTable(); - CSimpleFontString::CreateScriptMetaTable(); - CSimpleFrame::CreateScriptMetaTable(); - CSimpleButton::CreateScriptMetaTable(); - CSimpleCheckbox::CreateScriptMetaTable(); - CSimpleEditBox::CreateScriptMetaTable(); - CSimpleHTML::CreateScriptMetaTable(); - - // TODO - // CSimpleMessageFrame::CreateScriptMetaTable(); - // CSimpleMessageScrollFrame::CreateScriptMetaTable(); - - CSimpleModel::CreateScriptMetaTable(); - CSimpleModelFFX::CreateScriptMetaTable(); - CSimpleScrollFrame::CreateScriptMetaTable(); - CSimpleSlider::CreateScriptMetaTable(); - - // TODO - // CSimpleStatusBar::CreateScriptMetaTable(); - // CSimpleColorSelect::CreateScriptMetaTable(); - // CSimpleMovieFrame::CreateScriptMetaTable(); -} diff --git a/src/ui/ScriptFunctions.hpp b/src/ui/ScriptFunctions.hpp deleted file mode 100644 index fc0853e..0000000 --- a/src/ui/ScriptFunctions.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef UI_SCRIPT_FUNCTIONS_HPP -#define UI_SCRIPT_FUNCTIONS_HPP - -#include "ui/Types.hpp" -#include - -struct lua_State; - -#define NUM_SCRIPT_FUNCTIONS_SIMPLE_FRAME 7 - -namespace FrameScript { - extern FrameScript_Method s_ScriptFunctions_SimpleFrame[NUM_SCRIPT_FUNCTIONS_SIMPLE_FRAME]; -} - -void RegisterSimpleFrameScriptMethods(); - -#endif diff --git a/src/ui/ScriptFunctionsShared.cpp b/src/ui/ScriptFunctionsShared.cpp index 96a9700..5ffb059 100644 --- a/src/ui/ScriptFunctionsShared.cpp +++ b/src/ui/ScriptFunctionsShared.cpp @@ -1,4 +1,4 @@ -#include "ui/ScriptFunctions.hpp" +#include "ui/ScriptFunctionsShared.hpp" #include "util/Lua.hpp" #include "util/Unimplemented.hpp" #include diff --git a/src/ui/ScriptFunctionsSimpleFrame.cpp b/src/ui/simple/ScriptMethods.cpp similarity index 68% rename from src/ui/ScriptFunctionsSimpleFrame.cpp rename to src/ui/simple/ScriptMethods.cpp index cf2e6c4..c27b5d7 100644 --- a/src/ui/ScriptFunctionsSimpleFrame.cpp +++ b/src/ui/simple/ScriptMethods.cpp @@ -1,13 +1,24 @@ +#include "ui/simple/ScriptMethods.hpp" #include "ui/FrameXML.hpp" -#include "ui/ScriptFunctions.hpp" #include "ui/Types.hpp" +#include "ui/simple/CSimpleButton.hpp" +#include "ui/simple/CSimpleCheckbox.hpp" +#include "ui/simple/CSimpleEditBox.hpp" +#include "ui/simple/CSimpleFont.hpp" +#include "ui/simple/CSimpleFontString.hpp" #include "ui/simple/CSimpleFrame.hpp" +#include "ui/simple/CSimpleHTML.hpp" +#include "ui/simple/CSimpleModel.hpp" +#include "ui/simple/CSimpleModelFFX.hpp" +#include "ui/simple/CSimpleScrollFrame.hpp" +#include "ui/simple/CSimpleSlider.hpp" +#include "ui/simple/CSimpleTexture.hpp" #include "util/CStatus.hpp" #include "util/Lua.hpp" #include "util/Unimplemented.hpp" #include -#include #include +#include int32_t Script_GetText(lua_State* L) { WHOA_UNIMPLEMENTED(0); @@ -137,7 +148,7 @@ int32_t Script_GetCurrentKeyBoardFocus(lua_State* L) { WHOA_UNIMPLEMENTED(0); } -FrameScript_Method FrameScript::s_ScriptFunctions_SimpleFrame[NUM_SCRIPT_FUNCTIONS_SIMPLE_FRAME] = { +static FrameScript_Method s_ScriptFunctions[] = { { "GetText", &Script_GetText }, { "GetNumFrames", &Script_GetNumFrames }, { "EnumerateFrames", &Script_EnumerateFrames }, @@ -146,3 +157,42 @@ FrameScript_Method FrameScript::s_ScriptFunctions_SimpleFrame[NUM_SCRIPT_FUNCTIO { "GetFramesRegisteredForEvent", &Script_GetFramesRegisteredForEvent }, { "GetCurrentKeyBoardFocus", &Script_GetCurrentKeyBoardFocus }, }; + +void RegisterSimpleFrameScriptMethods() { + for (auto& func : s_ScriptFunctions) { + FrameScript_RegisterFunction(func.name, func.method); + } + + // TODO + // CSimpleAnim::CreateScriptMetaTable(); + // CSimpleTranslationAnim::CreateScriptMetaTable(); + // CSimpleRotationAnim::CreateScriptMetaTable(); + // CSimpleScaleAnim::CreateScriptMetaTable(); + // CSimpleControlPoint::CreateScriptMetaTable(); + // CSimplePathAnim::CreateScriptMetaTable(); + // CSimpleAlphaAnim::CreateScriptMetaTable(); + // CSimpleAnimGroup::CreateScriptMetaTable(); + + CSimpleFont::CreateScriptMetaTable(); + CSimpleTexture::CreateScriptMetaTable(); + CSimpleFontString::CreateScriptMetaTable(); + CSimpleFrame::CreateScriptMetaTable(); + CSimpleButton::CreateScriptMetaTable(); + CSimpleCheckbox::CreateScriptMetaTable(); + CSimpleEditBox::CreateScriptMetaTable(); + CSimpleHTML::CreateScriptMetaTable(); + + // TODO + // CSimpleMessageFrame::CreateScriptMetaTable(); + // CSimpleMessageScrollFrame::CreateScriptMetaTable(); + + CSimpleModel::CreateScriptMetaTable(); + CSimpleModelFFX::CreateScriptMetaTable(); + CSimpleScrollFrame::CreateScriptMetaTable(); + CSimpleSlider::CreateScriptMetaTable(); + + // TODO + // CSimpleStatusBar::CreateScriptMetaTable(); + // CSimpleColorSelect::CreateScriptMetaTable(); + // CSimpleMovieFrame::CreateScriptMetaTable(); +} diff --git a/src/ui/simple/ScriptMethods.hpp b/src/ui/simple/ScriptMethods.hpp new file mode 100644 index 0000000..5d1e0e5 --- /dev/null +++ b/src/ui/simple/ScriptMethods.hpp @@ -0,0 +1,6 @@ +#ifndef UI_SIMPLE_SCRIPT_METHODS_HPP +#define UI_SIMPLE_SCRIPT_METHODS_HPP + +void RegisterSimpleFrameScriptMethods(); + +#endif