piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

WiimoteNew: Added button mappings for tables and crossfade slider on emulated turntable extension.(completely untested in game)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6260 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-10-05 21:43:51 +00:00
parent 0830e74d55
commit bfd04e380e
7 changed files with 87 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/Attachment/Guitar.cpp
View File

@ -39,23 +39,23 @@ Guitar::Guitar() : Attachment( "Guitar" )
for ( unsigned int i = 0; i < sizeof(guitar_fret_names)/sizeof(*guitar_fret_names); ++i )
m_frets->controls.push_back( new ControlGroup::Input( guitar_fret_names[i] ) );
// stick
groups.push_back( m_stick = new AnalogStick( "Stick" ) );
// strum
groups.push_back( m_strum = new Buttons( "Strum" ) );
m_strum->controls.push_back( new ControlGroup::Input("Up") );
m_strum->controls.push_back( new ControlGroup::Input("Down") );
// whammy
groups.push_back( m_whammy = new Triggers( "Whammy" ) );
m_whammy->controls.push_back( new ControlGroup::Input("Bar") );
// buttons
groups.push_back( m_buttons = new Buttons( "Buttons" ) );
m_buttons->controls.push_back( new ControlGroup::Input("-") );
m_buttons->controls.push_back( new ControlGroup::Input("+") );
// stick
groups.push_back( m_stick = new AnalogStick( "Stick" ) );
// whammy
groups.push_back( m_whammy = new Triggers( "Whammy" ) );
m_whammy->controls.push_back( new ControlGroup::Input("Bar") );
// set up register
// id
memcpy( &reg[0xfa], guitar_id, sizeof(guitar_id) );

21
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/Attachment/Turntable.cpp
View File

@ -29,21 +29,23 @@ static const char* const turntable_button_names[] =
Turntable::Turntable() : Attachment("Turntable")
{
// buttons
// TODO: separate buttons into Left and Right
groups.push_back(m_buttons = new Buttons("Buttons"));
for (unsigned int i = 0; i < sizeof(turntable_button_names)/sizeof(*turntable_button_names); ++i)
m_buttons->controls.push_back(new ControlGroup::Input( turntable_button_names[i]));
// turntables
groups.push_back(m_left_table = new Slider("Table Left"));
groups.push_back(m_right_table = new Slider("Table Right"));
// stick
groups.push_back(m_stick = new AnalogStick("Stick"));
// TODO:
// effect dial
groups.push_back(m_effect_dial = new Triggers("Effect"));
m_effect_dial->controls.push_back(new ControlGroup::Input("Dial"));
//m_left_turntable
//m_right_turntable
//m_crossfade_slider
// crossfade
groups.push_back(m_crossfade = new Slider("Crossfade"));
// set up register
// id
@ -65,20 +67,18 @@ void Turntable::GetState(u8* const data, const bool focus)
}
// left table
// TODO:
{
s8 tt = 0;
//m_left_turntable->GetState(&tt .....);
m_left_table->GetState(&tt, focus ? 0x1F : 0);
ttdata->ltable1 = tt;
ttdata->ltable2 = tt << 5;
}
// right table
// TODO:
{
s8 tt = 0;
//m_right_turntable->GetState(&tt .....);
m_right_table->GetState(&tt, focus ? 0x1F : 0);
ttdata->rtable1 = tt;
ttdata->rtable2 = tt << 1;
@ -96,10 +96,9 @@ void Turntable::GetState(u8* const data, const bool focus)
}
// crossfade slider
// TODO:
{
u8 cfs = 0;
//m_crossfade_slider->GetState(&cfs .....);
m_crossfade->GetState(&cfs, 8, 7);
ttdata->slider = cfs;
}

7
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteEmu/Attachment/Turntable.h
View File

@ -29,13 +29,8 @@ private:
Buttons* m_buttons;
MixedTriggers* m_triggers;
AnalogStick* m_stick;
Triggers *m_effect_dial;
// TODO:
//m_left_turntable
//m_right_turntable
//m_crossfade_slider
Slider *m_left_table, *m_right_table, *m_crossfade;
};