diff options
| -rw-r--r-- | app/mac/scene.mm | 36 | ||||
| -rw-r--r-- | lib/nes/controller.hh | 2 | ||||
| -rw-r--r-- | lib/nes/nes.hh | 4 |
3 files changed, 21 insertions, 21 deletions
diff --git a/app/mac/scene.mm b/app/mac/scene.mm index 11950d1..9675809 100644 --- a/app/mac/scene.mm +++ b/app/mac/scene.mm @@ -97,33 +97,33 @@ namespace - (void)keyDown:(NSEvent*)event { - auto& controller_1 = self->nes_->get_controller_1(); + auto& controller_1 = self->nes_->ref_controller_1(); switch ([event keyCode]) { case 0x7e: // up arrow - controller_1.get_pressed().add(nes::buttons::up); + controller_1.ref_pressed().add(nes::buttons::up); break; case 0x7d: // down arrow - controller_1.get_pressed().add(nes::buttons::down); + controller_1.ref_pressed().add(nes::buttons::down); break; case 0x7b: // left arrow - controller_1.get_pressed().add(nes::buttons::left); + controller_1.ref_pressed().add(nes::buttons::left); break; case 0x7c: // right arrow - controller_1.get_pressed().add(nes::buttons::right); + controller_1.ref_pressed().add(nes::buttons::right); break; case 0x6: // "Z" - controller_1.get_pressed().add(nes::buttons::a); + controller_1.ref_pressed().add(nes::buttons::a); break; case 0x7: // "X" - controller_1.get_pressed().add(nes::buttons::b); + controller_1.ref_pressed().add(nes::buttons::b); break; case 0x24: // return - controller_1.get_pressed().add(nes::buttons::start); + controller_1.ref_pressed().add(nes::buttons::start); break; case 0x31: // space - controller_1.get_pressed().add(nes::buttons::select); + controller_1.ref_pressed().add(nes::buttons::select); break; default: [super keyDown:event]; @@ -133,33 +133,33 @@ namespace - (void)keyUp:(NSEvent*)event { - auto& controller_1 = self->nes_->get_controller_1(); + auto& controller_1 = self->nes_->ref_controller_1(); switch ([event keyCode]) { case 0x7e: // up arrow - controller_1.get_pressed().remove(nes::buttons::up); + controller_1.ref_pressed().remove(nes::buttons::up); break; case 0x7d: // down arrow - controller_1.get_pressed().remove(nes::buttons::down); + controller_1.ref_pressed().remove(nes::buttons::down); break; case 0x7b: // left arrow - controller_1.get_pressed().remove(nes::buttons::left); + controller_1.ref_pressed().remove(nes::buttons::left); break; case 0x7c: // right arrow - controller_1.get_pressed().remove(nes::buttons::right); + controller_1.ref_pressed().remove(nes::buttons::right); break; case 0x6: // "Z" - controller_1.get_pressed().remove(nes::buttons::a); + controller_1.ref_pressed().remove(nes::buttons::a); break; case 0x7: // "X" - controller_1.get_pressed().remove(nes::buttons::b); + controller_1.ref_pressed().remove(nes::buttons::b); break; case 0x24: // return - controller_1.get_pressed().remove(nes::buttons::start); + controller_1.ref_pressed().remove(nes::buttons::start); break; case 0x31: // space - controller_1.get_pressed().remove(nes::buttons::select); + controller_1.ref_pressed().remove(nes::buttons::select); break; default: [super keyUp:event]; diff --git a/lib/nes/controller.hh b/lib/nes/controller.hh index fa16859..eb87545 100644 --- a/lib/nes/controller.hh +++ b/lib/nes/controller.hh @@ -19,7 +19,7 @@ namespace nes auto operator=(controller&&) -> controller& = delete; auto get_pressed() const -> button_mask { return pressed_;} - auto get_pressed() -> button_mask& { return pressed_; } + auto ref_pressed() -> button_mask& { return pressed_; } auto set_pressed(button_mask const value) -> void { pressed_ = value; } // IO register diff --git a/lib/nes/nes.hh b/lib/nes/nes.hh index 79d4a8e..437075f 100644 --- a/lib/nes/nes.hh +++ b/lib/nes/nes.hh @@ -33,9 +33,9 @@ namespace nes auto operator=(nes&&) -> nes& = delete; auto get_controller_1() const -> controller const& { return controller_1_; } - auto get_controller_1() -> controller& { return controller_1_; } + auto ref_controller_1() -> controller& { return controller_1_; } auto get_controller_2() const -> controller const& { return controller_2_; } - auto get_controller_2() -> controller& { return controller_2_; } + auto ref_controller_2() -> controller& { return controller_2_; } auto step() -> void; auto step(std::chrono::microseconds delta) -> void; |