Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster.

Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2025-07-29 09:09:52 -06:00 · 2010-06-03 18:05:08 +00:00
parent 3236aa9e73
commit a3c96ac42c
118 changed files with 8868 additions and 2530 deletions
--- a/Source/Plugins/Plugin_GCPadNew/Src/GCPadEmu.cpp
+++ b/Source/Plugins/Plugin_GCPadNew/Src/GCPadEmu.cpp
@ -0,0 +1,108 @@
+
+#include "GCPadEmu.h"
+
+const u16 button_bitmasks[] =
+{
+	PAD_BUTTON_A,
+	PAD_BUTTON_B,
+	PAD_BUTTON_X,
+	PAD_BUTTON_Y,
+	PAD_TRIGGER_Z,
+	PAD_BUTTON_START
+};
+
+const u16 trigger_bitmasks[] =
+{
+	PAD_TRIGGER_L,
+	PAD_TRIGGER_R,
+};
+
+const u16 dpad_bitmasks[] =
+{
+	PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT 
+};
+
+const char* const named_buttons[] =
+{
+	"A",
+	"B",
+	"X",
+	"Y",
+	"Z",
+	"Start",
+};
+
+const char* const named_triggers[] =
+{
+	"L", "R", "L-Analog", "R-Analog"
+};
+
+GCPad::GCPad( const unsigned int index ) : m_index(index)
+{
+
+	// buttons
+	groups.push_back( m_buttons = new Buttons( "Buttons" ) );
+	for ( unsigned int i=0; i < sizeof(named_buttons)/sizeof(*named_buttons); ++i )
+		m_buttons->controls.push_back( new ControlGroup::Input( named_buttons[i] ) );
+
+	// sticks
+	groups.push_back( m_main_stick = new AnalogStick( "Main Stick" ) );
+	groups.push_back( m_c_stick = new AnalogStick( "C-Stick" ) );
+
+	// triggers
+	groups.push_back( m_triggers = new MixedTriggers( "Triggers" ) );
+	for ( unsigned int i=0; i < sizeof(named_triggers)/sizeof(*named_triggers); ++i )
+		m_triggers->controls.push_back( new ControlGroup::Input( named_triggers[i] ) );
+
+	// rumble
+	groups.push_back( m_rumble = new ControlGroup( "Rumble" ) );
+	m_rumble->controls.push_back( new ControlGroup::Output( "Motor" ) );
+
+	// dpad
+	groups.push_back( m_dpad = new Buttons( "D-Pad" ) );
+	for ( unsigned int i=0; i < 4; ++i )
+		m_dpad->controls.push_back( new ControlGroup::Input( named_directions[i] ) );
+
+	// options
+	groups.push_back( m_options = new ControlGroup( "Options" ) );
+	m_options->settings.push_back( new ControlGroup::Setting( "Background Input", false ) );
+
+}
+
+std::string GCPad::GetName() const
+{
+	return std::string("GCPad") + char('1'+m_index);
+}
+
+void GCPad::GetInput( SPADStatus* const pad )
+{
+	// if window has focus or background input enabled
+	if (g_PADInitialize->pRendererHasFocus() || m_options[0].settings[0]->value )
+	{
+		// buttons
+		m_buttons->GetState( &pad->button, button_bitmasks );
+
+		// TODO: set analog A/B analog to full or w/e, prolly not needed
+
+		// dpad
+		m_dpad->GetState( &pad->button, dpad_bitmasks );
+
+		// sticks
+		m_main_stick->GetState( &pad->stickX, &pad->stickY, 0x80, 127 );
+		m_c_stick->GetState( &pad->substickX, &pad->substickY, 0x80, 127 );
+
+		// triggers
+		m_triggers->GetState( &pad->button, trigger_bitmasks, &pad->triggerLeft, 0xFF );
+	}
+	else
+	{
+		// center sticks
+		memset( &pad->stickX, 0x80, 4 );
+	}
+}
+
+void GCPad::SetOutput( const bool on )
+{
+	// only rumble if window has focus or background input is enabled
+	m_rumble->controls[0]->control_ref->State( on && (g_PADInitialize->pRendererHasFocus() || m_options[0].settings[0]->value) );
+}