diff --git a/mm/2s2h/BenGui.cpp b/mm/2s2h/BenGui/BenGui.cpp similarity index 100% rename from mm/2s2h/BenGui.cpp rename to mm/2s2h/BenGui/BenGui.cpp diff --git a/mm/2s2h/BenGui.hpp b/mm/2s2h/BenGui/BenGui.hpp similarity index 100% rename from mm/2s2h/BenGui.hpp rename to mm/2s2h/BenGui/BenGui.hpp diff --git a/mm/2s2h/BenMenuBar.cpp b/mm/2s2h/BenGui/BenMenuBar.cpp similarity index 100% rename from mm/2s2h/BenMenuBar.cpp rename to mm/2s2h/BenGui/BenMenuBar.cpp diff --git a/mm/2s2h/BenMenuBar.h b/mm/2s2h/BenGui/BenMenuBar.h similarity index 100% rename from mm/2s2h/BenMenuBar.h rename to mm/2s2h/BenGui/BenMenuBar.h diff --git a/mm/2s2h/Enhancements/controls/SohInputEditorWindow.cpp b/mm/2s2h/BenGui/SohInputEditorWindow.cpp similarity index 99% rename from mm/2s2h/Enhancements/controls/SohInputEditorWindow.cpp rename to mm/2s2h/BenGui/SohInputEditorWindow.cpp index 57a58eb9e..46007523f 100644 --- a/mm/2s2h/Enhancements/controls/SohInputEditorWindow.cpp +++ b/mm/2s2h/BenGui/SohInputEditorWindow.cpp @@ -1,7 +1,7 @@ #include "SohInputEditorWindow.h" #include #include "2s2h/BenPort.h" -#include "../../UIWidgets.hpp" +#include "UIWidgets.hpp" #include "z64.h" #ifndef __WIIU__ #include "controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h" diff --git a/mm/2s2h/Enhancements/controls/SohInputEditorWindow.h b/mm/2s2h/BenGui/SohInputEditorWindow.h similarity index 100% rename from mm/2s2h/Enhancements/controls/SohInputEditorWindow.h rename to mm/2s2h/BenGui/SohInputEditorWindow.h diff --git a/mm/2s2h/UIWidgets.cpp b/mm/2s2h/BenGui/UIWidgets.cpp similarity index 100% rename from mm/2s2h/UIWidgets.cpp rename to mm/2s2h/BenGui/UIWidgets.cpp diff --git a/mm/2s2h/UIWidgets.hpp b/mm/2s2h/BenGui/UIWidgets.hpp similarity index 100% rename from mm/2s2h/UIWidgets.hpp rename to mm/2s2h/BenGui/UIWidgets.hpp diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp index 5124b1a5d..2bdae0e1b 100644 --- a/mm/2s2h/BenPort.cpp +++ b/mm/2s2h/BenPort.cpp @@ -43,7 +43,7 @@ #include "Extractor/Extract.h" // OTRTODO //#include -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #ifdef ENABLE_CROWD_CONTROL #include "Enhancements/crowd-control/CrowdControl.h" @@ -51,12 +51,12 @@ CrowdControl* CrowdControl::Instance; #endif #include -#include +#include #include "BenJsonConversions.hpp" -#include "Enhancements/controls/SohInputEditorWindow.h" +#include "BenGui/SohInputEditorWindow.h" #include "Enhancements/GameInteractor/GameInteractor.h" -#include "Enhancements/mods.h" +#include "Enhancements/Enhancements.h" // Resource Types/Factories #include "2s2h/resource/type/Animation.h" @@ -306,7 +306,7 @@ extern "C" void InitOTR() { OTRGlobals::Instance = new OTRGlobals(); GameInteractor::Instance = new GameInteractor(); BenGui::SetupGuiElements(); - InitMods(); + InitEnhancements(); clearMtx = (uintptr_t)&gMtxClear; //OTRMessage_Init(); diff --git a/mm/2s2h/DeveloperTools/SaveEditor.cpp b/mm/2s2h/DeveloperTools/SaveEditor.cpp index 25cf9d895..a3c7663e9 100644 --- a/mm/2s2h/DeveloperTools/SaveEditor.cpp +++ b/mm/2s2h/DeveloperTools/SaveEditor.cpp @@ -1,5 +1,5 @@ #include "SaveEditor.h" -#include "2s2h/UIWidgets.hpp" +#include "2s2h/BenGui/UIWidgets.hpp" extern "C" { #include diff --git a/mm/2s2h/Enhancements/mods.cpp b/mm/2s2h/Enhancements/Enhancements.cpp similarity index 92% rename from mm/2s2h/Enhancements/mods.cpp rename to mm/2s2h/Enhancements/Enhancements.cpp index 834b69bc7..82aedcf1a 100644 --- a/mm/2s2h/Enhancements/mods.cpp +++ b/mm/2s2h/Enhancements/Enhancements.cpp @@ -1,4 +1,4 @@ -#include "mods.h" +#include "Enhancements.h" #include #include "GameInteractor/GameInteractor.h" @@ -24,6 +24,6 @@ void RegisterMoonJumpOnL() { }); } -void InitMods() { +void InitEnhancements() { RegisterMoonJumpOnL(); } \ No newline at end of file diff --git a/mm/2s2h/Enhancements/mods.h b/mm/2s2h/Enhancements/Enhancements.h similarity index 73% rename from mm/2s2h/Enhancements/mods.h rename to mm/2s2h/Enhancements/Enhancements.h index 1edc61624..b716a6e5a 100644 --- a/mm/2s2h/Enhancements/mods.h +++ b/mm/2s2h/Enhancements/Enhancements.h @@ -2,7 +2,7 @@ extern "C" { #endif -void InitMods(); +void InitEnhancements(); #ifdef __cplusplus } diff --git a/mm/2s2h/Enhancements/interpolation/frame_interpolation.cpp b/mm/2s2h/Enhancements/FrameInterpolation/FrameInterpolation.cpp similarity index 99% rename from mm/2s2h/Enhancements/interpolation/frame_interpolation.cpp rename to mm/2s2h/Enhancements/FrameInterpolation/FrameInterpolation.cpp index 024cbac59..a78727239 100644 --- a/mm/2s2h/Enhancements/interpolation/frame_interpolation.cpp +++ b/mm/2s2h/Enhancements/FrameInterpolation/FrameInterpolation.cpp @@ -5,7 +5,7 @@ #include #include -#include "frame_interpolation.h" +#include "FrameInterpolation.h" #include "2s2h/BenPort.h" /* diff --git a/mm/2s2h/Enhancements/interpolation/frame_interpolation.h b/mm/2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h similarity index 100% rename from mm/2s2h/Enhancements/interpolation/frame_interpolation.h rename to mm/2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h diff --git a/mm/CMakeLists.txt b/mm/CMakeLists.txt index 6a43dc0e0..87bb4c604 100644 --- a/mm/CMakeLists.txt +++ b/mm/CMakeLists.txt @@ -140,6 +140,7 @@ file(GLOB_RECURSE soh__DeveloperTools RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "2s2h/DeveloperTools/*.h" "2s2h/DeveloperTools/*.c" "2s2h/DeveloperTools/*.cpp" + "2s2h/DeveloperTools/*.hpp" ) # }}} @@ -160,6 +161,13 @@ file(GLOB_RECURSE soh__Enhancements RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "2s2h/Enhancements/*.mm" ) +file(GLOB_RECURSE soh__BenGui RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "2s2h/BenGui/*.c" + "2s2h/BenGui/*.cpp" + "2s2h/BenGui/*.h" + "2s2h/BenGui/*.hpp" +) + #list(REMOVE_ITEM soh__Enhancements "soh/Enhancements/gamecommand.h") #list(FILTER soh__Enhancements EXCLUDE REGEX "soh/Enhancements/gfx.*") @@ -181,8 +189,7 @@ file(GLOB_RECURSE soh__Enhancements RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} #source_group("soh\\Enhancements" REGULAR_EXPRESSION "soh/Enhancements/*") #source_group("soh\\Enhancements\\audio" REGULAR_EXPRESSION "soh/Enhancements/audio/*") -source_group("2s2h\\Enhancements\\controls" REGULAR_EXPRESSION "2s2h/Enhancements/controls/*") -source_group("2s2h\\Enhancements\\interpolation" REGULAR_EXPRESSION "2s2h/Enhancements/interpolation/*") +# source_group("2s2h\\Enhancements\\interpolation" REGULAR_EXPRESSION "2s2h/Enhancements/interpolation/*") #source_group("soh\\Enhancements\\cosmetics" REGULAR_EXPRESSION "soh/Enhancements/cosmetics/*") #source_group("soh\\Enhancements\\crowd-control" REGULAR_EXPRESSION "soh/Enhancements/crowd-control/*") #source_group("soh\\Enhancements\\custom-message" REGULAR_EXPRESSION "soh/Enhancements/custom-message/*") @@ -272,6 +279,7 @@ set(ALL_FILES ${soh__DeveloperTools} # ${soh__config} ${soh__Enhancements} + ${soh__BenGui} ${soh__Extractor} ${soh__Resource} ${src__} diff --git a/mm/src/code/stubs.c b/mm/src/code/stubs.c index 4ffb99c8b..e5bfd343e 100644 --- a/mm/src/code/stubs.c +++ b/mm/src/code/stubs.c @@ -3,7 +3,7 @@ #include "z64.h" #include #include "BenPort.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" //#include #define SCREEN_WIDTH 320 diff --git a/mm/src/code/sys_matrix.c b/mm/src/code/sys_matrix.c index 66e725684..1521e21d5 100644 --- a/mm/src/code/sys_matrix.c +++ b/mm/src/code/sys_matrix.c @@ -41,7 +41,7 @@ #include "prevent_bss_reordering.h" #include "global.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" /* data */ #define qs1616(e) ((s32)((e)*0x00010000)) diff --git a/mm/src/code/z_actor.c b/mm/src/code/z_actor.c index d99b1d82a..32327a172 100644 --- a/mm/src/code/z_actor.c +++ b/mm/src/code/z_actor.c @@ -21,7 +21,7 @@ #include "objects/object_bdoor/object_bdoor.h" #include -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" // bss // FaultClient sActorFaultClient; // 2 funcs diff --git a/mm/src/code/z_camera.c b/mm/src/code/z_camera.c index 5ef292e9e..5277455fe 100644 --- a/mm/src/code/z_camera.c +++ b/mm/src/code/z_camera.c @@ -62,7 +62,7 @@ SwingAnimation D_801EDC30[4]; Vec3f D_801EDDD0; Vec3f D_801EDDE0; Vec3f D_801EDDF0; -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" // Camera will reload its paramData. Usually that means setting the read-only data from what is stored in // CameraModeValue arrays. Although sometimes some read-write data is reset as well diff --git a/mm/src/code/z_eff_blure.c b/mm/src/code/z_eff_blure.c index 5a8d00f73..97d350fb0 100644 --- a/mm/src/code/z_eff_blure.c +++ b/mm/src/code/z_eff_blure.c @@ -1,6 +1,6 @@ #include "global.h" #include "objects/gameplay_keep/gameplay_keep.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) { EffectBlureElement* elem; diff --git a/mm/src/code/z_eff_footmark.c b/mm/src/code/z_eff_footmark.c index 75f378135..688e28230 100644 --- a/mm/src/code/z_eff_footmark.c +++ b/mm/src/code/z_eff_footmark.c @@ -2,7 +2,7 @@ #include "z64.h" #include "macros.h" #include "functions.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #include "assets/code/eff_footmark/eff_footmark.h" diff --git a/mm/src/code/z_eff_shield_particle.c b/mm/src/code/z_eff_shield_particle.c index 178b289ea..759faceb0 100644 --- a/mm/src/code/z_eff_shield_particle.c +++ b/mm/src/code/z_eff_shield_particle.c @@ -3,7 +3,7 @@ #include "assets/code/eff_shield_particle/eff_shield_particle.h" #include "objects/gameplay_keep/gameplay_keep.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" void EffectShieldParticle_Init(void* thisx, void* initParamsx) { EffectShieldParticle* this = (EffectShieldParticle*)thisx; diff --git a/mm/src/code/z_eff_spark.c b/mm/src/code/z_eff_spark.c index 19bb283f4..43a12d8e5 100644 --- a/mm/src/code/z_eff_spark.c +++ b/mm/src/code/z_eff_spark.c @@ -1,6 +1,6 @@ #include "global.h" #include "objects/gameplay_keep/gameplay_keep.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" void EffectSpark_Init(void* thisx, void* initParamsx) { EffectSpark* this = (EffectSpark*)thisx; diff --git a/mm/src/code/z_effect_soft_sprite.c b/mm/src/code/z_effect_soft_sprite.c index 7cf7eb0cc..3b877c9ca 100644 --- a/mm/src/code/z_effect_soft_sprite.c +++ b/mm/src/code/z_effect_soft_sprite.c @@ -1,6 +1,6 @@ #include "global.h" #include "loadfragment.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" EffectSsInfo sEffectSsInfo = { 0 }; diff --git a/mm/src/code/z_lights.c b/mm/src/code/z_lights.c index 4cbba7811..9936a0c2d 100644 --- a/mm/src/code/z_lights.c +++ b/mm/src/code/z_lights.c @@ -2,7 +2,7 @@ #include "sys_cfb.h" #include "objects/gameplay_keep/gameplay_keep.h" #include -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" LightsBuffer sLightsBuffer; diff --git a/mm/src/code/z_play.c b/mm/src/code/z_play.c index 52ba810bb..ca25ef1ef 100644 --- a/mm/src/code/z_play.c +++ b/mm/src/code/z_play.c @@ -34,7 +34,7 @@ u8 sMotionBlurStatus; #include "overlays/gamestates/ovl_file_choose/z_file_select.h" #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" #include "debug.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #include s32 gDbgCamEnabled = false; diff --git a/mm/src/code/z_skin_matrix.c b/mm/src/code/z_skin_matrix.c index 500b91c54..f24697708 100644 --- a/mm/src/code/z_skin_matrix.c +++ b/mm/src/code/z_skin_matrix.c @@ -1,5 +1,5 @@ #include "global.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" MtxF sMtxFClear = { { { 1.0f, 0.0f, 0.0f, 0.0f }, diff --git a/mm/src/code/z_view.c b/mm/src/code/z_view.c index 34eddbfc8..dcc6ce7de 100644 --- a/mm/src/code/z_view.c +++ b/mm/src/code/z_view.c @@ -1,7 +1,7 @@ #include "global.h" #include "z64shrink_window.h" #include "z64view.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" s32 View_ApplyPerspective(View* view); s32 View_ApplyOrtho(View* view); diff --git a/mm/src/code/z_vr_box_draw.c b/mm/src/code/z_vr_box_draw.c index 4ff75e667..7e46f705b 100644 --- a/mm/src/code/z_vr_box_draw.c +++ b/mm/src/code/z_vr_box_draw.c @@ -1,5 +1,5 @@ #include "global.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" Mtx* sSkyboxDrawMatrix; diff --git a/mm/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/mm/src/overlays/actors/ovl_Boss_06/z_boss_06.c index 67149bdb9..6e64373ec 100644 --- a/mm/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/mm/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -11,7 +11,7 @@ #include "objects/gameplay_keep/gameplay_keep.h" #include "objects/object_knight/object_knight.h" #include "BenPort.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/mm/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/mm/src/overlays/actors/ovl_Boss_07/z_boss_07.c index 4b48f63e4..4be78b02a 100644 --- a/mm/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/mm/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -12,7 +12,7 @@ #include "objects/object_boss07/object_boss07.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "BenPort.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/mm/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/mm/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 4546fafc7..cbd37c138 100644 --- a/mm/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/mm/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -7,7 +7,7 @@ #include "z_demo_kankyo.h" #include "objects/gameplay_keep/gameplay_keep.h" #include "objects/object_bubble/object_bubble.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/mm/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/mm/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index d0c0eab77..19ac9ad60 100644 --- a/mm/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/mm/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -8,7 +8,7 @@ #include "z_en_thiefbird.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #define FLAGS \ (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_UNFRIENDLY | ACTOR_FLAG_200 | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_80000000) diff --git a/mm/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/mm/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index f1711c1da..a9ed4714a 100644 --- a/mm/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/mm/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -10,7 +10,7 @@ #include "z_obj_grass.h" #include "overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h" #include "objects/gameplay_keep/gameplay_keep.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) diff --git a/mm/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/mm/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index eb2866e6c..9818a3f09 100644 --- a/mm/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/mm/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -6,7 +6,7 @@ #include "z_object_kankyo.h" #include "objects/gameplay_keep/gameplay_keep.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_2000000) diff --git a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c index bfb02f8c1..05217778a 100644 --- a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c +++ b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c @@ -17,7 +17,7 @@ #include "gfxdebuggerbridge.h" #include "archives/item_name_static/item_name_static.h" #include "archives/map_name_static/map_name_static.h" -#include "2s2h/Enhancements/interpolation/frame_interpolation.h" +#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" // Page Textures (Background of Page): // Broken up into multiple textures.