From 8062afc25e895cb49e76f6e26e51a7d4a1ad2df2 Mon Sep 17 00:00:00 2001 From: Hannes Schulze Date: Sat, 1 Feb 2025 23:32:55 +0100 Subject: revamp input system --- app/mac/scene.mm | 151 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 130 insertions(+), 21 deletions(-) (limited to 'app/mac') diff --git a/app/mac/scene.mm b/app/mac/scene.mm index 247a097..bf1a61b 100644 --- a/app/mac/scene.mm +++ b/app/mac/scene.mm @@ -2,6 +2,7 @@ #import "nes/app/application.hh" #import "nes/app/input/input-device-keyboard.hh" #import "nes/app/input/input-device-controller.hh" +#import "nes/app/input/input-buffer.hh" #import "nes/common/display.hh" #import #import @@ -67,25 +68,128 @@ namespace class input_device_keyboard_impl final : public nes::app::input_device_keyboard { - GCKeyboardInput* profile_; + GCKeyboardInput* profile_{ nil }; + nes::app::input_buffer buffer_; public: explicit input_device_keyboard_impl(GCKeyboardInput* profile) - : profile_{ profile } { + set_profile(profile); } - auto set_profile(GCKeyboardInput* profile) -> void { profile_ = profile; } - - auto read_key_up() -> bool override { return [[profile_ buttonForKeyCode:GCKeyCodeUpArrow] isPressed]; } - auto read_key_down() -> bool override { return [[profile_ buttonForKeyCode:GCKeyCodeDownArrow] isPressed]; } - auto read_key_left() -> bool override { return [[profile_ buttonForKeyCode:GCKeyCodeLeftArrow] isPressed]; } - auto read_key_right() -> bool override { return [[profile_ buttonForKeyCode:GCKeyCodeRightArrow] isPressed]; } - auto read_key_a() -> bool override { return [[profile_ buttonForKeyCode:GCKeyCodeKeyZ] isPressed]; } - auto read_key_b() -> bool override { return [[profile_ buttonForKeyCode:GCKeyCodeKeyX] isPressed]; } - auto read_key_select() -> bool override { return [[profile_ buttonForKeyCode:GCKeyCodeSpacebar] isPressed]; } - auto read_key_start() -> bool override { return [[profile_ buttonForKeyCode:GCKeyCodeReturnOrEnter] isPressed]; } - auto read_key_escape() -> bool override { return [[profile_ buttonForKeyCode:GCKeyCodeEscape] isPressed]; } + ~input_device_keyboard_impl() + { + set_profile(nil); + } + + auto set_profile(GCKeyboardInput* profile) -> void + { + [profile_ setKeyChangedHandler:nil]; + profile_ = profile; + [profile_ setKeyChangedHandler:^(GCKeyboardInput*, GCControllerButtonInput*, GCKeyCode key_code, BOOL pressed) { + handle_key_changed(key_code, pressed); + }]; + } + + auto read_key(nes::app::key const key) -> bool override { return buffer_.read_key(key); } + auto poll_event() -> nes::app::input_event override { return buffer_.poll_event(); } + + private: + auto handle_key_changed(GCKeyCode const key_code, BOOL const pressed) -> void + { + auto const key = convert_key_code(key_code); + if (key) + { + if (pressed) + { + buffer_.key_down(*key); + } + else + { + buffer_.key_up(*key); + } + } + } + + auto convert_key_code(GCKeyCode const key_code) -> std::optional + { + if (key_code == GCKeyCodeZero) { return nes::app::key::digit_0; } + if (key_code == GCKeyCodeOne) { return nes::app::key::digit_1; } + if (key_code == GCKeyCodeTwo) { return nes::app::key::digit_2; } + if (key_code == GCKeyCodeThree) { return nes::app::key::digit_3; } + if (key_code == GCKeyCodeFour) { return nes::app::key::digit_4; } + if (key_code == GCKeyCodeFive) { return nes::app::key::digit_5; } + if (key_code == GCKeyCodeSix) { return nes::app::key::digit_6; } + if (key_code == GCKeyCodeSeven) { return nes::app::key::digit_7; } + if (key_code == GCKeyCodeEight) { return nes::app::key::digit_8; } + if (key_code == GCKeyCodeNine) { return nes::app::key::digit_9; } + if (key_code == GCKeyCodeKeyA) { return nes::app::key::letter_a; } + if (key_code == GCKeyCodeKeyB) { return nes::app::key::letter_b; } + if (key_code == GCKeyCodeKeyC) { return nes::app::key::letter_c; } + if (key_code == GCKeyCodeKeyD) { return nes::app::key::letter_d; } + if (key_code == GCKeyCodeKeyE) { return nes::app::key::letter_e; } + if (key_code == GCKeyCodeKeyF) { return nes::app::key::letter_f; } + if (key_code == GCKeyCodeKeyG) { return nes::app::key::letter_g; } + if (key_code == GCKeyCodeKeyH) { return nes::app::key::letter_h; } + if (key_code == GCKeyCodeKeyI) { return nes::app::key::letter_i; } + if (key_code == GCKeyCodeKeyJ) { return nes::app::key::letter_j; } + if (key_code == GCKeyCodeKeyK) { return nes::app::key::letter_k; } + if (key_code == GCKeyCodeKeyL) { return nes::app::key::letter_l; } + if (key_code == GCKeyCodeKeyM) { return nes::app::key::letter_m; } + if (key_code == GCKeyCodeKeyN) { return nes::app::key::letter_n; } + if (key_code == GCKeyCodeKeyO) { return nes::app::key::letter_o; } + if (key_code == GCKeyCodeKeyP) { return nes::app::key::letter_p; } + if (key_code == GCKeyCodeKeyQ) { return nes::app::key::letter_q; } + if (key_code == GCKeyCodeKeyR) { return nes::app::key::letter_r; } + if (key_code == GCKeyCodeKeyS) { return nes::app::key::letter_s; } + if (key_code == GCKeyCodeKeyT) { return nes::app::key::letter_t; } + if (key_code == GCKeyCodeKeyU) { return nes::app::key::letter_u; } + if (key_code == GCKeyCodeKeyV) { return nes::app::key::letter_v; } + if (key_code == GCKeyCodeKeyW) { return nes::app::key::letter_w; } + if (key_code == GCKeyCodeKeyX) { return nes::app::key::letter_x; } + if (key_code == GCKeyCodeKeyY) { return nes::app::key::letter_y; } + if (key_code == GCKeyCodeKeyZ) { return nes::app::key::letter_z; } + if (key_code == GCKeyCodeEscape) { return nes::app::key::escape; } + if (key_code == GCKeyCodeHyphen) { return nes::app::key::dash; } + if (key_code == GCKeyCodeEqualSign) { return nes::app::key::equal; } + if (key_code == GCKeyCodeDeleteOrBackspace) { return nes::app::key::backspace; } + if (key_code == GCKeyCodeTab) { return nes::app::key::tab; } + if (key_code == GCKeyCodeReturnOrEnter) { return nes::app::key::enter; } + if (key_code == GCKeyCodeSemicolon) { return nes::app::key::semicolon; } + if (key_code == GCKeyCodeQuote) { return nes::app::key::apostrophe; } + if (key_code == GCKeyCodeBackslash) { return nes::app::key::backslash; } + if (key_code == GCKeyCodeComma) { return nes::app::key::comma; } + if (key_code == GCKeyCodePeriod) { return nes::app::key::period; } + if (key_code == GCKeyCodeSlash) { return nes::app::key::slash; } + if (key_code == GCKeyCodeSpacebar) { return nes::app::key::space; } + if (key_code == GCKeyCodeCapsLock) { return nes::app::key::caps_lock; } + if (key_code == GCKeyCodeOpenBracket) { return nes::app::key::bracket_open; } + if (key_code == GCKeyCodeCloseBracket) { return nes::app::key::bracket_close; } + if (key_code == GCKeyCodeLeftControl) { return nes::app::key::control_left; } + if (key_code == GCKeyCodeRightControl) { return nes::app::key::control_right; } + if (key_code == GCKeyCodeLeftShift) { return nes::app::key::shift_left; } + if (key_code == GCKeyCodeRightShift) { return nes::app::key::shift_right; } + if (key_code == GCKeyCodeLeftAlt) { return nes::app::key::alt_left; } + if (key_code == GCKeyCodeRightAlt) { return nes::app::key::alt_right; } + if (key_code == GCKeyCodeLeftArrow) { return nes::app::key::arrow_left; } + if (key_code == GCKeyCodeRightArrow) { return nes::app::key::arrow_right; } + if (key_code == GCKeyCodeUpArrow) { return nes::app::key::arrow_up; } + if (key_code == GCKeyCodeDownArrow) { return nes::app::key::arrow_down; } + if (key_code == GCKeyCodeF1) { return nes::app::key::f1; } + if (key_code == GCKeyCodeF2) { return nes::app::key::f2; } + if (key_code == GCKeyCodeF3) { return nes::app::key::f3; } + if (key_code == GCKeyCodeF4) { return nes::app::key::f4; } + if (key_code == GCKeyCodeF5) { return nes::app::key::f5; } + if (key_code == GCKeyCodeF6) { return nes::app::key::f6; } + if (key_code == GCKeyCodeF7) { return nes::app::key::f7; } + if (key_code == GCKeyCodeF8) { return nes::app::key::f8; } + if (key_code == GCKeyCodeF9) { return nes::app::key::f9; } + if (key_code == GCKeyCodeF10) { return nes::app::key::f10; } + if (key_code == GCKeyCodeF11) { return nes::app::key::f11; } + if (key_code == GCKeyCodeF12) { return nes::app::key::f12; } + + return std::nullopt; + } }; class input_device_controller_impl final : public nes::app::input_device_controller @@ -134,14 +238,19 @@ namespace } } - auto read_key_up() -> bool override { return [[[profile_ dpad] up] isPressed]; } - auto read_key_down() -> bool override { return [[[profile_ dpad] down] isPressed]; } - auto read_key_left() -> bool override { return [[[profile_ dpad] left] isPressed]; } - auto read_key_right() -> bool override { return [[[profile_ dpad] right] isPressed]; } - auto read_key_a() -> bool override { return [[profile_ buttonA] isPressed]; } - auto read_key_b() -> bool override { return [[profile_ buttonB] isPressed]; } - auto read_key_select() -> bool override { return [[profile_ leftTrigger] isPressed]; } - auto read_key_start() -> bool override { return [[profile_ rightTrigger] isPressed]; } + auto read_buttons() -> nes::sys::button_mask override + { + auto res = nes::sys::button_mask{}; + if ([[[profile_ dpad] up] isPressed]) { res.add(nes::sys::buttons::up); } + if ([[[profile_ dpad] down] isPressed]) { res.add(nes::sys::buttons::down); } + if ([[[profile_ dpad] left] isPressed]) { res.add(nes::sys::buttons::left); } + if ([[[profile_ dpad] right] isPressed]) { res.add(nes::sys::buttons::right); } + if ([[profile_ buttonA] isPressed]) { res.add(nes::sys::buttons::a); } + if ([[profile_ buttonB] isPressed]) { res.add(nes::sys::buttons::b); } + if ([[profile_ leftTrigger] isPressed]) { res.add(nes::sys::buttons::select); } + if ([[profile_ rightTrigger] isPressed]) { res.add(nes::sys::buttons::start); } + return res; + } }; } // namespace -- cgit v1.3.1