ControllerEmu: Separate ControlGroup from ControllerEmu #4873

lioncash · 2017-02-09T14:42:30Z

ControllerEmu, the class, is essentially acting like a namespace for ControlGroup. This makes it impossible to forward declare any of the internals. It also globs a bunch of classes together which is kind of a pain to manage.

This splits ControlGroup and the classes it contains into their own source files and situates them all within a namespace, which gets them out of global scope.

Since this allows forward declarations for the once-internal classes, it now requires significantly less files to be rebuilt if anything is changed in the ControllerEmu portion of code.

It does not split out the settings classes from ControlGroup yet, however, as splitting those out will need to have more functional changes made, rather than just essentially moving code from point A to point B.

Source/Core/Core/HW/GCKeyboard.cpp

 #include "Core/HW/GCKeyboardEmu.h"
-#include "InputCommon/ControllerInterface/ControllerInterface.h"


Source/Core/Core/HW/GCPadEmu.h

@@ -8,7 +8,15 @@

 #include "InputCommon/ControllerEmu/ControllerEmu.h"

+struct GCPadStatus;


Source/Core/Core/HW/Wiimote.cpp

 #include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+


Source/Core/Core/HW/WiimoteEmu/Speaker.cpp

 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"


Source/Core/DolphinWX/Debugger/CodeWindow.cpp

 #include "Core/Core.h"
 #include "Core/Debugger/Debugger_SymbolMap.h"
 #include "Core/Debugger/PPCDebugInterface.h"
 #include "Core/HW/CPU.h"
-#include "Core/HW/Memmap.h"
-#include "Core/HW/SystemTimers.h"


Source/Core/DolphinWX/Input/InputConfigDiag.h

@@ -23,10 +23,10 @@
 #include <wx/spinctrl.h>
 #include <wx/timer.h>

-#include "InputCommon/ControlReference/ControlReference.h"
-#include "InputCommon/ControllerEmu/ControllerEmu.h"
+#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"


Source/Core/InputCommon/ControllerEmu/ControlGroup/Extension.cpp

+#include <string>
+
+#include "Common/CommonTypes.h"
+#include "Core/HW/WiimoteEmu/Attachment/Attachment.h"


ligfx

Looks pretty straightforward.

ControllerEmu, the class, is essentially acting like a namespace for ControlGroup. This makes it impossible to forward declare any of the internals. It also globs a bunch of classes together which is kind of a pain to manage. This splits ControlGroup and the classes it contains into their own source files and situates them all within a namespace, which gets them out of global scope. Since this allows forward declarations for the once-internal classes, it now requires significantly less files to be rebuilt if anything is changed in the ControllerEmu portion of code. It does not split out the settings classes yet, however, as it would be preferable to make a settings base class that all settings derive from, but this would be a functional change -- this commit only intends to move around existing code. Extracting the settings class will be done in another commit.

lioncash force-pushed the controller-emu branch 2 times, most recently from e6df5f2 to 511ec6f Compare February 9, 2017 14:56