From 9ca793417149cbaa7b5f4b7797bc929e6e191f28 Mon Sep 17 00:00:00 2001 From: Hannes Schulze Date: Sat, 1 Feb 2025 01:14:03 +0100 Subject: use custom integer types --- app/mac/scene.mm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/mac/scene.mm b/app/mac/scene.mm index aced63b..247a097 100644 --- a/app/mac/scene.mm +++ b/app/mac/scene.mm @@ -13,14 +13,14 @@ namespace SKSpriteNode* node_; NSMutableData* buffer_front_; NSMutableData* buffer_back_; - std::uint8_t* bytes_back_; + nes::u8* bytes_back_; public: explicit display_impl(SKSpriteNode* node) : node_{ node } , buffer_front_{ make_buffer() } , buffer_back_{ make_buffer() } - , bytes_back_{ static_cast([buffer_back_ mutableBytes]) } + , bytes_back_{ static_cast([buffer_back_ mutableBytes]) } { } @@ -31,14 +31,14 @@ namespace auto tmp = buffer_back_; buffer_back_ = buffer_front_; buffer_front_ = tmp; - bytes_back_ = static_cast([buffer_back_ mutableBytes]); + bytes_back_ = static_cast([buffer_back_ mutableBytes]); auto texture = [SKTexture textureWithData:buffer_front_ size:CGSizeMake(width, height) flipped:YES]; [texture setFilteringMode:SKTextureFilteringNearest]; [node_ setTexture:texture]; } - virtual auto set(unsigned x, unsigned y, nes::rgb value) -> void override + virtual auto set(nes::u32 x, nes::u32 y, nes::rgb value) -> void override { auto const offset = (y * width + x) * 4; bytes_back_[offset + 0] = value.r; @@ -47,7 +47,7 @@ namespace bytes_back_[offset + 3] = 255; } - virtual auto get(unsigned x, unsigned y) const -> nes::rgb override + virtual auto get(nes::u32 x, nes::u32 y) const -> nes::rgb override { auto const offset = (y * width + x) * 4; auto res = nes::rgb{}; @@ -216,8 +216,8 @@ namespace { auto const lastTimestamp = _lastTimestamp.value_or(currentTime); _lastTimestamp = currentTime; - auto deltaMicroseconds = static_cast((currentTime - lastTimestamp) * 1000. * 1000.); - deltaMicroseconds = std::min(deltaMicroseconds, std::uint64_t{ 50000 }); + auto deltaMicroseconds = static_cast((currentTime - lastTimestamp) * 1000. * 1000.); + deltaMicroseconds = std::min(deltaMicroseconds, nes::u64{ 50000 }); _app->frame(std::chrono::microseconds{ deltaMicroseconds }); } -- cgit v1.3.1