diff options
Diffstat (limited to 'lib/nes/app/graphics')
| -rw-r--r-- | lib/nes/app/graphics/image-tile.hh | 15 | ||||
| -rw-r--r-- | lib/nes/app/graphics/renderer.cc | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/lib/nes/app/graphics/image-tile.hh b/lib/nes/app/graphics/image-tile.hh index 5633a0e..0663e3f 100644 --- a/lib/nes/app/graphics/image-tile.hh +++ b/lib/nes/app/graphics/image-tile.hh @@ -11,19 +11,4 @@ namespace nes::app { color data[8 * 8]{}; }; - - namespace tiles - { - inline constexpr auto test = image_tile - { - color{ 0 }, color{ 0 }, color{ 9 }, color{ 9 }, color{ 9 }, color{ 9 }, color{ 0 }, color{ 0 }, - color{ 0 }, color{ 9 }, color{ 9 }, color{ 8 }, color{ 8 }, color{ 9 }, color{ 9 }, color{ 0 }, - color{ 9 }, color{ 9 }, color{ 8 }, color{ 8 }, color{ 8 }, color{ 8 }, color{ 9 }, color{ 9 }, - color{ 9 }, color{ 8 }, color{ 8 }, color{ 9 }, color{ 9 }, color{ 8 }, color{ 8 }, color{ 9 }, - color{ 9 }, color{ 8 }, color{ 8 }, color{ 9 }, color{ 9 }, color{ 8 }, color{ 8 }, color{ 9 }, - color{ 9 }, color{ 9 }, color{ 8 }, color{ 8 }, color{ 8 }, color{ 8 }, color{ 9 }, color{ 9 }, - color{ 0 }, color{ 9 }, color{ 9 }, color{ 8 }, color{ 8 }, color{ 9 }, color{ 9 }, color{ 0 }, - color{ 0 }, color{ 0 }, color{ 9 }, color{ 9 }, color{ 9 }, color{ 9 }, color{ 0 }, color{ 0 }, - }; - } // namespace tiles } // namespace nes::app
\ No newline at end of file diff --git a/lib/nes/app/graphics/renderer.cc b/lib/nes/app/graphics/renderer.cc index c53ea12..8d1a168 100644 --- a/lib/nes/app/graphics/renderer.cc +++ b/lib/nes/app/graphics/renderer.cc @@ -68,7 +68,7 @@ namespace nes::app auto const resolved = resolve_color(c); auto const x_stop = std::min(x + width, renderer::width); - auto const y_stop = std::min(y + width, renderer::height); + auto const y_stop = std::min(y + height, renderer::height); for (auto y_px = unsigned{ y * 8 }; y_px < y_stop * 8; ++y_px) { for (auto x_px = unsigned{ x * 8 }; x_px < x_stop * 8; ++x_px) |