From 5734a139d3f218972b5ebaff0e51167770352bcf Mon Sep 17 00:00:00 2001 From: Hannes Schulze Date: Mon, 13 Jan 2025 23:42:17 +0100 Subject: finish ui --- src/nes/nes.hh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/nes/nes.hh') diff --git a/src/nes/nes.hh b/src/nes/nes.hh index 924ddd4..d3baf2a 100644 --- a/src/nes/nes.hh +++ b/src/nes/nes.hh @@ -1,6 +1,9 @@ #pragma once #include "nes/cartridge.hh" +#include "nes/controller.hh" +#include "nes/cpu.hh" +#include "nes/ppu.hh" namespace nes { @@ -11,6 +14,10 @@ namespace nes { cartridge cartridge_; display& display_; + controller controller_1_; + controller controller_2_; + cpu cpu_; + ppu ppu_; public: explicit nes(cartridge, display&); @@ -19,5 +26,12 @@ namespace nes nes(nes&&) = delete; auto operator=(nes const&) -> nes& = delete; auto operator=(nes&&) -> nes& = delete; + + auto get_controller_1() const -> controller const& { return controller_1_; } + auto get_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 step(std::uint64_t delta_ms) -> void; }; } // namespace nes \ No newline at end of file -- cgit v1.3.1