Move some files around (#107)

mm/2s2h/BenGui/SohInputEditorWindow.cpp

@@ -1,7 +1,7 @@
 #include "SohInputEditorWindow.h"
 #include <Utils/StringHelper.h>
 #include "2s2h/BenPort.h"
-#include "../../UIWidgets.hpp"
+#include "UIWidgets.hpp"
 #include "z64.h"
 #ifndef __WIIU__
 #include "controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h"

mm/2s2h/BenPort.cpp

@@ -43,7 +43,7 @@
 #include "Extractor/Extract.h"
 // OTRTODO
 //#include <functions.h>
-#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 <libultraship/libultraship.h>
-#include <BenGui.hpp>
+#include <BenGui/BenGui.hpp>
 #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();

mm/2s2h/DeveloperTools/SaveEditor.cpp

@@ -1,5 +1,5 @@
 #include "SaveEditor.h"
-#include "2s2h/UIWidgets.hpp"
+#include "2s2h/BenGui/UIWidgets.hpp"
 
 extern "C" {
 #include <z64.h>

mm/2s2h/Enhancements/Enhancements.cpp

@@ -1,4 +1,4 @@
-#include "mods.h"
+#include "Enhancements.h"
 #include <libultraship/bridge.h>
 #include "GameInteractor/GameInteractor.h"
 
@@ -24,6 +24,6 @@ void RegisterMoonJumpOnL() {
     });
 }
 
-void InitMods() {
+void InitEnhancements() {
     RegisterMoonJumpOnL();
 }

mm/2s2h/Enhancements/Enhancements.h

@@ -2,7 +2,7 @@
 extern "C" {
 #endif
 
-void InitMods();
+void InitEnhancements();
 
 #ifdef __cplusplus
 }

mm/2s2h/Enhancements/FrameInterpolation/FrameInterpolation.cpp

@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <math.h>
 
-#include "frame_interpolation.h"
+#include "FrameInterpolation.h"
 #include "2s2h/BenPort.h"
 
 /*

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__}

mm/src/code/stubs.c

@@ -3,7 +3,7 @@
 #include "z64.h"
 #include <assert.h>
 #include "BenPort.h"
-#include "2s2h/Enhancements/interpolation/frame_interpolation.h"
+#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
 //#include <math.h>
 
 #define SCREEN_WIDTH 320

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))

mm/src/code/z_actor.c

@@ -21,7 +21,7 @@
 #include "objects/object_bdoor/object_bdoor.h"
 
 #include <string.h>
-#include "2s2h/Enhancements/interpolation/frame_interpolation.h"
+#include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h"
 
 // bss
 // FaultClient sActorFaultClient; // 2 funcs

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

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;