Version 1.5.0

Big Refactor
This commit is contained in:
Andre Schweiger 2018-02-04 18:05:43 +01:00
parent 3b2a0f4de8
commit d2f7796b79
49 changed files with 5306 additions and 3590 deletions

View file

@ -5,19 +5,51 @@ void toggleKey(Key* key, bool held, bool down){
key->clicked = down;
}
void tickKeys(u32 held, u32 down){
hidTouchRead(&k_touch); // Update touch position
toggleKey(&k_up, held & k_up.input, down & k_up.input);
toggleKey(&k_down, held & k_down.input, down & k_down.input);
toggleKey(&k_left, held & k_left.input, down & k_left.input);
toggleKey(&k_right, held & k_right.input, down & k_right.input);
toggleKey(&k_pause, held & k_pause.input, down & k_pause.input);
toggleKey(&k_attack, held & k_attack.input, down & k_attack.input);
toggleKey(&k_menu, held & k_menu.input, down & k_menu.input);
toggleKey(&k_accept, held & k_accept.input, down & k_accept.input);
toggleKey(&k_decline, held & k_decline.input, down & k_decline.input);
toggleKey(&k_delete, held & k_delete.input, down & k_delete.input);
toggleKey(&k_menuNext, held & k_menuNext.input, down & k_menuNext.input);
toggleKey(&k_menuPrev, held & k_menuPrev.input, down & k_menuPrev.input);
void tickKeys(Inputs *inputs, u32 held, u32 down){
hidTouchRead(&(inputs->k_touch)); // Update touch position
toggleKey(&(inputs->k_up), held & localInputs.k_up.input, down & localInputs.k_up.input);
toggleKey(&(inputs->k_down), held & localInputs.k_down.input, down & localInputs.k_down.input);
toggleKey(&(inputs->k_left), held & localInputs.k_left.input, down & localInputs.k_left.input);
toggleKey(&(inputs->k_right), held & localInputs.k_right.input, down & localInputs.k_right.input);
toggleKey(&(inputs->k_pause), held & localInputs.k_pause.input, down & localInputs.k_pause.input);
toggleKey(&(inputs->k_attack), held & localInputs.k_attack.input, down & localInputs.k_attack.input);
toggleKey(&(inputs->k_menu), held & localInputs.k_menu.input, down & localInputs.k_menu.input);
toggleKey(&(inputs->k_accept), held & localInputs.k_accept.input, down & localInputs.k_accept.input);
toggleKey(&(inputs->k_decline), held & localInputs.k_decline.input, down & localInputs.k_decline.input);
toggleKey(&(inputs->k_delete), held & localInputs.k_delete.input, down & localInputs.k_delete.input);
toggleKey(&(inputs->k_menuNext), held & localInputs.k_menuNext.input, down & localInputs.k_menuNext.input);
toggleKey(&(inputs->k_menuPrev), held & localInputs.k_menuPrev.input, down & localInputs.k_menuPrev.input);
}
void resetKeys(Inputs *inputs) {
(inputs->k_touch).px = -1;
(inputs->k_touch).py = -1;
toggleKey(&(inputs->k_up), false, false);
toggleKey(&(inputs->k_down), false, false);
toggleKey(&(inputs->k_left), false, false);
toggleKey(&(inputs->k_right), false, false);
toggleKey(&(inputs->k_pause), false, false);
toggleKey(&(inputs->k_attack), false, false);
toggleKey(&(inputs->k_menu), false, false);
toggleKey(&(inputs->k_accept), false, false);
toggleKey(&(inputs->k_decline), false, false);
toggleKey(&(inputs->k_delete), false, false);
toggleKey(&(inputs->k_menuNext), false, false);
toggleKey(&(inputs->k_menuPrev), false, false);
}
void resetClicked(Inputs *inputs) {
inputs->k_up.clicked = false;
inputs->k_down.clicked = false;
inputs->k_left.clicked = false;
inputs->k_right.clicked = false;
inputs->k_pause.clicked = false;
inputs->k_attack.clicked = false;
inputs->k_menu.clicked = false;
inputs->k_accept.clicked = false;
inputs->k_decline.clicked = false;
inputs->k_delete.clicked = false;
inputs->k_menuNext.clicked = false;
inputs->k_menuPrev.clicked = false;
}