mirror of
https://github.com/cemu-project/Cemu.git
synced 2025-07-09 16:31:19 +12:00
Merge 4ecbd6d6f0
into b53b223ba9
This commit is contained in:
commit
b8b02b82cf
2 changed files with 71 additions and 2 deletions
|
@ -174,6 +174,39 @@ bool ClassicController::set_default_mapping(const std::shared_ptr<ControllerBase
|
|||
{kButtonId_StickR_Right, kRotationXP},
|
||||
};
|
||||
}
|
||||
else if (sdl_controller->get_guid() == SDLController::kSwitchProController)
|
||||
{
|
||||
mapping =
|
||||
{
|
||||
{kButtonId_A, kButton0},
|
||||
{kButtonId_B, kButton1},
|
||||
{kButtonId_X, kButton2},
|
||||
{kButtonId_Y, kButton3},
|
||||
|
||||
{kButtonId_L, kButton9},
|
||||
{kButtonId_R, kButton10},
|
||||
{kButtonId_ZL, kTriggerXP},
|
||||
{kButtonId_ZR, kTriggerYP},
|
||||
|
||||
{kButtonId_Plus, kButton6},
|
||||
{kButtonId_Minus, kButton4},
|
||||
|
||||
{kButtonId_Up, kButton11},
|
||||
{kButtonId_Down, kButton12},
|
||||
{kButtonId_Left, kButton13},
|
||||
{kButtonId_Right, kButton14},
|
||||
|
||||
{kButtonId_StickL_Up, kAxisYN},
|
||||
{kButtonId_StickL_Down, kAxisYP},
|
||||
{kButtonId_StickL_Left, kAxisXN},
|
||||
{kButtonId_StickL_Right, kAxisXP},
|
||||
|
||||
{kButtonId_StickR_Up, kRotationYN},
|
||||
{kButtonId_StickR_Down, kRotationYP},
|
||||
{kButtonId_StickR_Left, kRotationXN},
|
||||
{kButtonId_StickR_Right, kRotationXP},
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
mapping =
|
||||
|
@ -256,4 +289,4 @@ bool ClassicController::set_default_mapping(const std::shared_ptr<ControllerBase
|
|||
});
|
||||
|
||||
return mapping_updated;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -183,6 +183,42 @@ bool ProController::set_default_mapping(const std::shared_ptr<ControllerBase>& c
|
|||
{kButtonId_StickR_Right, kRotationXP},
|
||||
};
|
||||
}
|
||||
else if (sdl_controller->get_guid() == SDLController::kSwitchProController)
|
||||
{
|
||||
mapping =
|
||||
{
|
||||
{kButtonId_A, kButton0},
|
||||
{kButtonId_B, kButton1},
|
||||
{kButtonId_X, kButton2},
|
||||
{kButtonId_Y, kButton3},
|
||||
|
||||
{kButtonId_L, kButton9},
|
||||
{kButtonId_R, kButton10},
|
||||
{kButtonId_ZL, kTriggerXP},
|
||||
{kButtonId_ZR, kTriggerYP},
|
||||
|
||||
{kButtonId_Plus, kButton6},
|
||||
{kButtonId_Minus, kButton4},
|
||||
|
||||
{kButtonId_Up, kButton11},
|
||||
{kButtonId_Down, kButton12},
|
||||
{kButtonId_Left, kButton13},
|
||||
{kButtonId_Right, kButton14},
|
||||
|
||||
{kButtonId_StickL, kButton7},
|
||||
{kButtonId_StickR, kButton8},
|
||||
|
||||
{kButtonId_StickL_Up, kAxisYN},
|
||||
{kButtonId_StickL_Down, kAxisYP},
|
||||
{kButtonId_StickL_Left, kAxisXN},
|
||||
{kButtonId_StickL_Right, kAxisXP},
|
||||
|
||||
{kButtonId_StickR_Up, kRotationYN},
|
||||
{kButtonId_StickR_Down, kRotationYP},
|
||||
{kButtonId_StickR_Left, kRotationXN},
|
||||
{kButtonId_StickR_Right, kRotationXP},
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
mapping =
|
||||
|
@ -271,4 +307,4 @@ bool ProController::set_default_mapping(const std::shared_ptr<ControllerBase>& c
|
|||
});
|
||||
|
||||
return mapping_updated;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue