Update render, spritebatch and input stuffs.
This commit is contained in:
@@ -38,7 +38,6 @@ inputbuttondata_t INPUT_BUTTON_DATA[] = {
|
||||
{ .name = "lstick_right", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_LEFT_Y, .positive = false } } },
|
||||
{ .name = "ltrigger", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_TRIGGER_LEFT, .positive = true } } },
|
||||
{ .name = "rtrigger", { .type = INPUT_BUTTON_TYPE_GAMEPAD_AXIS, .gpAxis = { .axis = INPUT_GAMEPAD_AXIS_TRIGGER_RIGHT, .positive = true } } },
|
||||
|
||||
#endif
|
||||
|
||||
{ .name = NULL }
|
||||
@@ -47,6 +46,47 @@ inputbuttondata_t INPUT_BUTTON_DATA[] = {
|
||||
errorret_t inputInitDolphin(void) {
|
||||
PAD_Init();
|
||||
|
||||
#define X(buttonName, buttonAction) \
|
||||
inputBind(inputButtonGetByName(buttonName), buttonAction);
|
||||
|
||||
#if defined(DUSK_GAMECUBE)
|
||||
X("up", INPUT_ACTION_UP);
|
||||
X("down", INPUT_ACTION_DOWN);
|
||||
X("left", INPUT_ACTION_LEFT);
|
||||
X("right", INPUT_ACTION_RIGHT);
|
||||
X("lstick_up", INPUT_ACTION_UP);
|
||||
X("lstick_down", INPUT_ACTION_DOWN);
|
||||
X("lstick_left", INPUT_ACTION_LEFT);
|
||||
X("lstick_right", INPUT_ACTION_RIGHT);
|
||||
|
||||
X("a", INPUT_ACTION_ACCEPT);
|
||||
X("b", INPUT_ACTION_CANCEL);
|
||||
X("z", INPUT_ACTION_CONSOLE);
|
||||
X("start", INPUT_ACTION_RAGEQUIT);
|
||||
|
||||
#elif defined(DUSK_WII)
|
||||
X("up", INPUT_ACTION_UP);
|
||||
X("down", INPUT_ACTION_DOWN);
|
||||
X("left", INPUT_ACTION_LEFT);
|
||||
X("right", INPUT_ACTION_RIGHT);
|
||||
X("lstick_up", INPUT_ACTION_UP);
|
||||
X("lstick_down", INPUT_ACTION_DOWN);
|
||||
X("lstick_left", INPUT_ACTION_LEFT);
|
||||
X("lstick_right", INPUT_ACTION_RIGHT);
|
||||
|
||||
X("a", INPUT_ACTION_ACCEPT);
|
||||
X("b", INPUT_ACTION_CANCEL);
|
||||
X("z", INPUT_ACTION_CONSOLE);
|
||||
X("start", INPUT_ACTION_RAGEQUIT);
|
||||
|
||||
// TODO: Wiimote, USB Keyboard, probably more.
|
||||
|
||||
#else
|
||||
#error "Unknown Dolphin platform?"
|
||||
#endif
|
||||
|
||||
#undef X
|
||||
|
||||
errorOk();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user