rubyboy 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c4b114437f8fdfe135e5dbb47c8ce18de914bf3bff25376a28d54a4550d3bfc
-  data.tar.gz: f6f8714c97f42513c68d2a371742490a3a7ed295e056965e2bf47a50495fad0f
+  metadata.gz: a90f9cbc5a0ac4a9f9b971f0c4454421dc83ae9686222c275679f173e7503232
+  data.tar.gz: 52833516da6531982602c373acb11a74d292db6221b8ad34d4420a94be7fe017
 SHA512:
-  metadata.gz: 810c319bb3b7766b277ba715c82d959bf97e5f16ad35994f3a84b7bd2726f24adac056427e067313b73c2f093c957d1a8f060b41b979083a34ceca5a9b20d956
-  data.tar.gz: 70b411a71e7604f00b3f16257d8ccceec77795d0156e79f04c85b95093853a755fa75d949045f752c325f095e3427049fd71127436e50f77aa3f90be401009a2
+  metadata.gz: ef45830027a11b9827e8660bef2fbb45a5a0fc867486aef58ece8a930acae959eb66ac5709d425e8562d1a546608cbb4cce040efc9e17940b627dfc9095c4a7b
+  data.tar.gz: d8564cc7f5c66dbce015fead7ff770527736943e9c1de3858ed813c1cc012c1e9c5b9248010d16ee39a5fa668e720eb9cda93443b2097260b3b24688b9acdd42

data/.rubocop.yml

@@ -14,6 +14,9 @@ Layout/LineLength:
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockNesting:
+  Enabled: false
+
 Metrics/CyclomaticComplexity:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## [Unreleased]
 
+## [0.4.0] - 2023-11-20
+
+- Fix interrupt
+- Fix sprite priority
+- Implement joypad
+- Pass bgbtest
+
+## [0.3.0] - 2023-11-19
+
+- Fix bg rendering
+- Add render_window
+- Add render_sprites
+- Add interrupt in ppu
+- Add oam_dma_transfer
+- Use raylib for rendering
+- Pass dmg-acid2 test
+
 ## [0.2.0] - 2023-11-14
 
 - Add MBC1

data/lib/rubyboy/bus.rb

@@ -8,11 +8,12 @@ module Rubyboy
   class Bus
     attr_accessor :ppu, :rom, :interrupt
 
-    def initialize(ppu, rom, timer, interrupt)
+    def initialize(ppu, rom, timer, interrupt, joypad)
       @ppu = ppu
       @rom = rom
       @ram = Ram.new
       @mbc = Cartridge::Factory.create(rom, @ram)
+      @joypad = joypad
 
       @interrupt = interrupt
       @timer = timer
@@ -27,62 +28,37 @@ module Rubyboy
       when 0x0000..0x7fff
         @mbc.read_byte(addr)
       when 0x8000..0x9fff
-        @ppu.vram[addr - 0x8000]
-      when 0xa000..0xdfff
+        @ppu.read_byte(addr)
+      when 0xa000..0xbfff
         @mbc.read_byte(addr)
+      when 0xc000..0xcfff
+        @ram.wram1[addr - 0xc000]
+      when 0xd000..0xdfff
+        @ram.wram2[addr - 0xd000]
       when 0xe000..0xfdff
         # echo ram
       when 0xfe00..0xfe9f
-        @oam[addr - 0xfe00]
+        @ppu.read_byte(addr)
       when 0xfea0..0xfeff
         # unused
         0xff
       when 0xff00
-        # joypad
-        @tmp[addr] ||= 0
+        @joypad.read_byte(addr)
       when 0xff01..0xff02
         # serial
         @tmp[addr] ||= 0
       when 0xff04..0xff07
         @timer.read_byte(addr)
       when 0xff0f
-        @interrupt.if
+        @interrupt.read_byte(addr)
       when 0xff10..0xff26
         # sound
         @tmp[addr] ||= 0
       when 0xff30..0xff3f
         # wave pattern ram
         @tmp[addr] ||= 0
-      when 0xff40
-        @ppu.lcdc
-      when 0xff41
-        # stat
-        @tmp[addr] ||= 0
-      when 0xff42
-        @ppu.scy
-      when 0xff43
-        @ppu.scx
-      when 0xff44
-        @ppu.ly
-      when 0xff45
-        @ppu.lyc
-      when 0xff46
-        # dma
-        @tmp[addr] ||= 0
-      when 0xff47
-        @ppu.bgp
-      when 0xff48
-        # obp0
-        @tmp[addr] ||= 0
-      when 0xff49
-        # obp1
-        @tmp[addr] ||= 0
-      when 0xff4a
-        # wy
-        @tmp[addr] ||= 0
-      when 0xff4b
-        # wx
-        @tmp[addr] ||= 0
+      when 0xff40..0xff4b
+        @ppu.read_byte(addr)
       when 0xff4f
         # vbk
         @tmp[addr] ||= 0
@@ -101,7 +77,7 @@ module Rubyboy
       when 0xff80..0xfffe
         @ram.hram[addr - 0xff80]
       when 0xffff
-        @interrupt.ie
+        @interrupt.read_byte(addr)
       else
         0xff
       end
@@ -112,61 +88,40 @@ module Rubyboy
       when 0x0000..0x7fff
         @mbc.write_byte(addr, value)
       when 0x8000..0x9fff
-        @ppu.vram[addr - 0x8000] = value
-      when 0xa000..0xdfff
+        @ppu.write_byte(addr, value)
+      when 0xa000..0xbfff
         @mbc.write_byte(addr, value)
+      when 0xc000..0xcfff
+        @ram.wram1[addr - 0xc000] = value
+      when 0xd000..0xdfff
+        @ram.wram2[addr - 0xd000] = value
       when 0xe000..0xfdff
         # echo ram
       when 0xfe00..0xfe9f
-        @oam[addr - 0xfe00] = value
+        @ppu.write_byte(addr, value)
       when 0xfea0..0xfeff
         # unused
       when 0xff00
-        # joypad
-        @tmp[addr] = value
+        @joypad.write_byte(addr, value)
       when 0xff01..0xff02
         # serial
         @tmp[addr] = value
       when 0xff04..0xff07
         @timer.write_byte(addr, value)
       when 0xff0f
-        @interrupt.if = value
+        @interrupt.write_byte(addr, value)
       when 0xff10..0xff26
         # sound
         @tmp[addr] = value
       when 0xff30..0xff3f
         # wave pattern ram
         @tmp[addr] = value
-      when 0xff40
-        @ppu.lcdc = value
-      when 0xff41
-        # stat
-        @tmp[addr] = value
-      when 0xff42
-        @ppu.scy = value
-      when 0xff43
-        @ppu.scx = value
-      when 0xff44
-        @ppu.ly = value
-      when 0xff45
-        @ppu.lyc = value
       when 0xff46
-        # dma
-        @tmp[addr] = value
-      when 0xff47
-        @ppu.bgp = value
-      when 0xff48
-        # obp0
-        @tmp[addr] = value
-      when 0xff49
-        # obp1
-        @tmp[addr] = value
-      when 0xff4a
-        # wy
-        @tmp[addr] = value
-      when 0xff4b
-        # wx
-        @tmp[addr] = value
+        0xa0.times do |i|
+          write_byte(0xfe00 + i, read_byte((value << 8) + i))
+        end
+      when 0xff40..0xff4b
+        @ppu.write_byte(addr, value)
       when 0xff4f
         # vbk
         @tmp[addr] = value
@@ -185,7 +140,7 @@ module Rubyboy
       when 0xff80..0xfffe
         @ram.hram[addr - 0xff80] = value
       when 0xffff
-        @interrupt.ie = value
+        @interrupt.write_byte(addr, value)
       end
     end
 

data/lib/rubyboy/cartridge/factory.rb

@@ -12,6 +12,8 @@ module Rubyboy
           Nombc.new(rom)
         when 0x01..0x03
           Mbc1.new(rom, ram)
+        when 0x08..0x09
+          Nombc.new(rom)
         else
           raise "Unsupported cartridge type: #{cartridge_type}"
         end

data/lib/rubyboy/cartridge/mbc1.rb

@@ -30,10 +30,6 @@ module Rubyboy
           else
             0xff
           end
-        when 0xc000..0xcfff
-          @ram.wram1[addr - 0xc000]
-        when 0xd000..0xdfff
-          @ram.wram2[addr - 0xd000]
         else
           raise "not implemented: read_byte #{addr}"
         end
@@ -43,11 +39,9 @@ module Rubyboy
         case addr
         when 0x0000..0x1fff
           @ram_enable = value & 0x0f == 0x0a
-          @rom.data[addr] = value
         when 0x2000..0x3fff
           @rom_bank = value & 0x1f
           @rom_bank = 1 if @rom_bank.zero?
-          @rom.data[addr] = value
         when 0x4000..0x5fff
           @ram_bank = value & 0x03
         when 0x6000..0x7fff
@@ -60,10 +54,6 @@ module Rubyboy
               @ram.eram[addr - 0xa000] = value
             end
           end
-        when 0xc000..0xcfff
-          @ram.wram1[addr - 0xc000] = value
-        when 0xd000..0xdfff
-          @ram.wram2[addr - 0xd000] = value
         end
       end
     end

data/lib/rubyboy/cartridge/nombc.rb

@@ -8,7 +8,12 @@ module Rubyboy
       end
 
       def read_byte(addr)
-        @rom.data[addr]
+        case addr
+        when 0x0000..0x7fff
+          @rom.data[addr]
+        else
+          raise "not implemented: read_byte #{addr}"
+        end
       end
 
       def write_byte(_addr, _value)

data/lib/rubyboy/cpu.rb

@@ -85,12 +85,12 @@ module Rubyboy
 
           @bus.interrupt.if &= (~(1 << i)) & 0xff
           @ime = false
-          @bus.write_word(@sp - 2, @pc)
           @sp -= 2
+          @bus.write_word(@sp, @pc)
           @pc = pcs[i]
-          opcode = read_byte(@pc)
           break
         end
+        return 20
       end
 
       if @ime_delay

data/lib/rubyboy/interrupt.rb

@@ -11,6 +11,24 @@ module Rubyboy
       @if = 0
     end
 
+    def read_byte(addr)
+      case addr
+      when 0xff0f
+        @if
+      when 0xffff
+        @ie
+      end
+    end
+
+    def write_byte(addr, value)
+      case addr
+      when 0xff0f
+        @if = value
+      when 0xffff
+        @ie = value
+      end
+    end
+
     def interrupts
       @if & @ie & 0x1f
     end

data/lib/rubyboy/joypad.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  class Joypad
+    def initialize(interupt)
+      @mode = 0xcf
+      @action = 0xff
+      @direction = 0xff
+      @interupt = interupt
+    end
+
+    def read_byte(addr)
+      raise "not implemented: write_byte #{addr}" unless addr == 0xff00
+
+      res = @mode | 0xcf
+      res &= @direction if @mode[4].zero?
+      res &= @action if @mode[5].zero?
+
+      res
+    end
+
+    def write_byte(addr, value)
+      raise "not implemented: write_byte #{addr}" unless addr == 0xff00
+
+      @mode = value & 0x30
+      @mode |= 0xc0
+    end
+
+    def direction_button(button)
+      @direction = button | 0xf0
+
+      @interupt.request(0b0001_0000) if button < 0b1111
+    end
+
+    def action_button(button)
+      @action = button | 0xf0
+
+      @interupt.request(0b0001_0000) if button < 0b1111
+    end
+  end
+end

data/lib/rubyboy/lcd.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'raylib'
+
+module Rubyboy
+  class Lcd
+    include Raylib
+
+    WIDTH = 160
+    HEIGHT = 144
+    SCALE = 4
+
+    def initialize
+      InitWindow(WIDTH * SCALE, HEIGHT * SCALE, 'RUBY BOY')
+      image = GenImageColor(WIDTH, HEIGHT, BLACK)
+      image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8
+      @texture = LoadTextureFromImage(image)
+    end
+
+    def draw(pixel_data)
+      UpdateTexture(@texture, pixel_data)
+
+      BeginDrawing()
+      ClearBackground(BLACK)
+      DrawTextureEx(@texture, Vector2.create(0, 0), 0.0, SCALE, WHITE)
+      EndDrawing()
+    end
+
+    def window_should_close?
+      WindowShouldClose()
+    end
+
+    def close_window
+      CloseWindow()
+    end
+  end
+end

data/lib/rubyboy/ppu.rb

@@ -2,74 +2,270 @@
 
 module Rubyboy
   class Ppu
-    attr_accessor :lcdc, :scy, :scx, :ly, :lyc, :bgp, :vram, :cycles
+    attr_reader :buffer
 
-    def initialize
+    MODE = {
+      hblank: 0,
+      vblank: 1,
+      oam_scan: 2,
+      drawing: 3
+    }.freeze
+
+    LCD_WIDTH = 160
+    LCD_HEIGHT = 144
+
+    OAM_SCAN_CYCLES = 80
+    DRAWING_CYCLES = 172
+    HBLANK_CYCLES = 204
+    ONE_LINE_CYCLES = OAM_SCAN_CYCLES + DRAWING_CYCLES + HBLANK_CYCLES
+
+    def initialize(interrupt)
+      @mode = MODE[:oam_scan]
       @lcdc = 0x91
+      @stat = 0x00
       @scy = 0x00
       @scx = 0x00
       @ly = 0x00
       @lyc = 0x00
-      @bgp = 0xfc
-      @vram = Array.new(8192, 0x00)
+      @obp0 = 0x00
+      @obp1 = 0x00
+      @wy = 0x00
+      @wx = 0x00
+      @bgp = 0x00
+      @vram = Array.new(0x2000, 0x00)
+      @oam = Array.new(0xa0, 0x00)
+      @wly = 0x00
       @cycles = 0
+      @interrupt = interrupt
+      @buffer = Array.new(144 * 160, 0x00)
+      @bg_pixels = Array.new(LCD_WIDTH, 0x00)
+    end
+
+    def read_byte(addr)
+      case addr
+      when 0x8000..0x9fff
+        @mode == MODE[:drawing] ? 0xff : @vram[addr - 0x8000]
+      when 0xfe00..0xfe9f
+        @mode == MODE[:oam_scan] || @mode == MODE[:drawing] ? 0xff : @oam[addr - 0xfe00]
+      when 0xff40
+        @lcdc
+      when 0xff41
+        @stat | 0x80 | @mode
+      when 0xff42
+        @scy
+      when 0xff43
+        @scx
+      when 0xff44
+        @ly
+      when 0xff45
+        @lyc
+      when 0xff47
+        @bgp
+      when 0xff48
+        @obp0
+      when 0xff49
+        @obp1
+      when 0xff4a
+        @wy
+      when 0xff4b
+        @wx
+      end
+    end
+
+    def write_byte(addr, value)
+      case addr
+      when 0x8000..0x9fff
+        @vram[addr - 0x8000] = value if @mode != MODE[:drawing]
+      when 0xfe00..0xfe9f
+        @oam[addr - 0xfe00] = value if @mode != MODE[:oam_scan] && @mode != MODE[:drawing]
+      when 0xff40
+        @lcdc = value
+      when 0xff41
+        @stat = value & 0x78
+      when 0xff42
+        @scy = value
+      when 0xff43
+        @scx = value
+      when 0xff44
+        # ly is read only
+      when 0xff45
+        @lyc = value
+      when 0xff46
+        # dma
+      when 0xff47
+        @bgp = value
+      when 0xff48
+        @obp0 = value
+      when 0xff49
+        @obp1 = value
+      when 0xff4a
+        @wy = value
+      when 0xff4b
+        @wx = value
+      end
     end
 
     def step(cycles)
+      return false if @lcdc[7].zero?
+
+      res = false
       @cycles += cycles
-      return if @cycles < 456
 
-      @cycles -= 456
-      @ly = (@ly + 1) % 154
+      case @mode
+      when MODE[:oam_scan]
+        if @cycles >= OAM_SCAN_CYCLES
+          @cycles -= OAM_SCAN_CYCLES
+          @mode = MODE[:drawing]
+        end
+      when MODE[:drawing]
+        if @cycles >= DRAWING_CYCLES
+          render_bg
+          render_window
+          render_sprites
+          @cycles -= DRAWING_CYCLES
+          @mode = MODE[:hblank]
+          @interrupt.request(0b0000_0010) if @stat[3] == 1
+        end
+      when MODE[:hblank]
+        if @cycles >= HBLANK_CYCLES
+          @cycles -= HBLANK_CYCLES
+          @ly += 1
+          handle_ly_eq_lyc
+
+          if @ly == LCD_HEIGHT
+            @mode = MODE[:vblank]
+            @interrupt.request(0b0000_0001)
+            @interrupt.request(0b0000_0010) if @stat[4] == 1
+          else
+            @mode = MODE[:oam_scan]
+            @interrupt.request(0b0000_0010) if @stat[5] == 1
+          end
+        end
+      when MODE[:vblank]
+        if @cycles >= ONE_LINE_CYCLES
+          @cycles -= ONE_LINE_CYCLES
+          @ly += 1
+          handle_ly_eq_lyc
+
+          if @ly == 154
+            @ly = 0
+            @wly = 0
+            handle_ly_eq_lyc
+            @mode = MODE[:oam_scan]
+            @interrupt.request(0b0000_0010) if @stat[5] == 1
+            res = true
+          end
+        end
+      end
+
+      res
+    end
+
+    def render_bg
+      return if @lcdc[0].zero?
+
+      y = (@ly + @scy) % 256
+      LCD_WIDTH.times do |i|
+        x = (i + @scx) % 256
+        tile_index = get_tile_index(@lcdc[3], x, y)
+        pixel = get_pixel(tile_index, x, y)
+        @buffer[@ly * LCD_WIDTH + i] = get_color(@bgp, pixel)
+        @bg_pixels[i] = pixel
+      end
     end
 
-    def draw_bg
-      tile_map_addr = @lcdc[3].zero? ? 0x9800 : 0x9c00
-      tile_data_addr = @lcdc[4].zero? ? 0x9000 : 0x8000
+    def render_window
+      return if @lcdc[0].zero? || @lcdc[5].zero? || @ly < @wy
 
-      bg = Array.new(256) { Array.new(256, 0x00) }
+      rendered = false
+      y = @wly
+      LCD_WIDTH.times do |i|
+        next if i < @wx - 7
 
-      32.times do |y|
-        32.times do |x|
-          tile_map_index = (y * 32 + x)
-          tile_index = @vram[tile_map_addr - 0x8000 + tile_map_index]
-          # TODO: if @lcdc[4] == 0 then the addr becomes signed
+        rendered = true
+        x = i - (@wx - 7)
+        tile_index = get_tile_index(@lcdc[6], x, y)
+        pixel = get_pixel(tile_index, x, y)
+        @buffer[@ly * LCD_WIDTH + i] = get_color(@bgp, pixel)
+        @bg_pixels[i] = pixel
+      end
+      @wly += 1 if rendered
+    end
 
-          tile = @vram[tile_data_addr - 0x8000 + tile_index * 16, 16]
+    def render_sprites
+      return if @lcdc[1].zero?
 
-          8.times do |i|
-            pixelsa = tile[i * 2]
-            pixelsb = tile[i * 2 + 1]
+      sprite_height = @lcdc[2].zero? ? 8 : 16
 
-            8.times do |j|
-              c = (pixelsb[7 - j] << 1) + pixelsa[7 - j]
-              bg[y * 8 + i][x * 8 + j] = get_color(c)
-            end
-          end
-        end
+      sprites = @oam.each_slice(4).filter_map do |sprite_attr|
+        sprite = {
+          y: (sprite_attr[0] - 16) % 256,
+          x: (sprite_attr[1] - 8) % 256,
+          tile_index: sprite_attr[2],
+          flags: sprite_attr[3]
+        }
+        next if sprite[:y] > @ly || sprite[:y] + sprite_height <= @ly
+
+        sprite
       end
-      view_port = Array.new(144) { Array.new(160, 0x00) }
+      sprites = sprites.take(10).sort_by.with_index { |sprite, i| [-sprite[:x], -i] }
+
+      sprites.each do |sprite|
+        pallet = sprite[:flags][4].zero? ? @obp0 : @obp1
+        tile_index = sprite[:tile_index]
+        tile_index &= 0xfe if sprite_height == 16
+        y = (@ly - sprite[:y]) % 256
+        y = sprite_height - y - 1 if sprite[:flags][6] == 1
+        tile_index = (tile_index + 1) % 256 if y >= 8
+        y %= 8
+
+        8.times do |x|
+          x_flipped = sprite[:flags][5] == 1 ? 7 - x : x
+
+          pixel = get_pixel(tile_index, x_flipped, y)
+          i = (sprite[:x] + x) % 256
 
-      144.times do |y|
-        160.times do |x|
-          view_port[y][x] = bg[(y + @scy) % 144][(x + @scx) % 160]
+          next if pixel.zero? || i >= LCD_WIDTH
+          next if sprite[:flags][7] == 1 && @bg_pixels[i] != 0
+
+          @buffer[@ly * LCD_WIDTH + i] = get_color(pallet, pixel)
         end
       end
-      view_port
     end
 
     private
 
-    def get_color(color_num)
-      case color_num
-      when 0
-        [0xff, 0xff, 0xff, 0xff]
-      when 1
-        [0xcc, 0xcc, 0xcc, 0xff]
-      when 2
-        [0x77, 0x77, 0x77, 0xff]
-      when 3
-        [0x00, 0x00, 0x00, 0xff]
+    def get_tile_index(tile_map_area, x, y)
+      tile_map_addr = tile_map_area.zero? ? 0x1800 : 0x1c00
+      tile_map_index = (y / 8) * 32 + (x / 8)
+      tile_index = @vram[tile_map_addr + tile_map_index]
+      @lcdc[4].zero? ? to_signed_byte(tile_index) + 256 : tile_index
+    end
+
+    def get_pixel(tile_index, x, y)
+      @vram[tile_index * 16 + (y % 8) * 2][7 - (x % 8)] + (@vram[tile_index * 16 + (y % 8) * 2 + 1][7 - (x % 8)] << 1)
+    end
+
+    def get_color(pallet, pixel)
+      case (pallet >> (pixel * 2)) & 0b11
+      when 0 then 0xff
+      when 1 then 0xaa
+      when 2 then 0x55
+      when 3 then 0x00
+      end
+    end
+
+    def to_signed_byte(byte)
+      byte &= 0xff
+      byte > 127 ? byte - 256 : byte
+    end
+
+    def handle_ly_eq_lyc
+      if @ly == @lyc
+        @stat |= 0x04
+        @interrupt.request(0b0000_0010) if @stat[6] == 1
+      else
+        @stat &= 0xfb
       end
     end
   end

data/lib/rubyboy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubyboy
-  VERSION = '0.2.0'
+  VERSION = '0.4.0'
 end

data/lib/rubyboy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gosu'
+require 'raylib'
 require 'benchmark'
 require_relative 'rubyboy/version'
 require_relative 'rubyboy/bus'
@@ -8,52 +8,76 @@ require_relative 'rubyboy/cpu'
 require_relative 'rubyboy/ppu'
 require_relative 'rubyboy/rom'
 require_relative 'rubyboy/timer'
+require_relative 'rubyboy/lcd'
+require_relative 'rubyboy/joypad'
 
 module Rubyboy
-  class Console < Gosu::Window
-    SCALE = 4
+  class Console
+    include Raylib
 
     def initialize(rom_data)
-      super(160 * SCALE, 144 * SCALE, false)
-      # TODO: Display title
-      self.caption = 'RUBY BOY'
-      @total_cycles = 0
-
+      load_raylib
       rom = Rom.new(rom_data)
       interrupt = Interrupt.new
-      @ppu = Ppu.new
+      @ppu = Ppu.new(interrupt)
       @timer = Timer.new(interrupt)
-      @bus = Bus.new(@ppu, rom, @timer, interrupt)
+      @joypad = Joypad.new(interrupt)
+      @bus = Bus.new(@ppu, rom, @timer, interrupt, @joypad)
       @cpu = Cpu.new(@bus)
+      @lcd = Lcd.new
     end
 
-    def update
-      while @total_cycles < 70224
+    def start
+      until @lcd.window_should_close?
+        key_input_check
         cycles = @cpu.exec
-        @total_cycles += cycles
         @timer.step(cycles)
-        @ppu.step(cycles)
+        draw if @ppu.step(cycles)
       end
-      @total_cycles -= 70224
+      @lcd.close_window
     rescue StandardError => e
       p e.to_s[0, 100]
       raise e
     end
 
+    private
+
     def draw
-      pixel_data = @ppu.draw_bg.flatten.pack('C*')
-      @image = Gosu::Image.from_blob(160, 144, pixel_data)
-      @image.draw(0, 0, 0, SCALE, SCALE)
+      pixel_data = buffer_to_pixel_data(@ppu.buffer)
+      @lcd.draw(pixel_data)
+    end
+
+    def buffer_to_pixel_data(buffer)
+      buffer.map do |row|
+        [row, row, row]
+      end.flatten.pack('C*')
     end
 
-    def draw_pixel(x, y, color)
-      x *= SCALE
-      y *= SCALE
-      c = Gosu::Color.new(255, color[0], color[1], color[2])
-      draw_quad(x, y, c, x + SCALE, y, c, x, y + SCALE, c, x + SCALE, y + SCALE, c)
+    def key_input_check
+      direction = (IsKeyUp(KEY_D) && 1 || 0) | ((IsKeyUp(KEY_A) && 1 || 0) << 1) | ((IsKeyUp(KEY_W) && 1 || 0) << 2) | ((IsKeyUp(KEY_S) && 1 || 0) << 3)
+      action = (IsKeyUp(KEY_K) && 1 || 0) | ((IsKeyUp(KEY_J) && 1 || 0) << 1) | ((IsKeyUp(KEY_U) && 1 || 0) << 2) | ((IsKeyUp(KEY_I) && 1 || 0) << 3)
+      @joypad.direction_button(direction)
+      @joypad.action_button(action)
+    end
+
+    def load_raylib
+      shared_lib_path = "#{Gem::Specification.find_by_name('raylib-bindings').full_gem_path}/lib/"
+      case RUBY_PLATFORM
+      when /mswin|msys|mingw/ # Windows
+        Raylib.load_lib("#{shared_lib_path}libraylib.dll")
+      when /darwin/ # macOS
+        Raylib.load_lib("#{shared_lib_path}libraylib.dylib")
+      when /linux/ # Ubuntu Linux (x86_64 or aarch64)
+        arch = RUBY_PLATFORM.split('-')[0]
+        Raylib.load_lib(shared_lib_path + "libraylib.#{arch}.so")
+      else
+        raise "Unknown system: #{RUBY_PLATFORM}"
+      end
+
+      SetTraceLogLevel(LOG_ERROR)
     end
   end
 end
 
-rom_data = File.open(File.expand_path('roms/cpu_instrs/cpu_instrs.gb', __dir__), 'r') { _1.read.bytes }
-Rubyboy::Console.new(rom_data).show
+rom_data = File.open(File.expand_path('roms/bgbtest.gb', __dir__), 'r') { _1.read.bytes }
+Rubyboy::Console.new(rom_data).start

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rubyboy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - sacckey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-14 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gosu
+  name: raylib-bindings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 0.5.7
 description:
 email:
 executables: []
@@ -38,6 +38,7 @@ files:
 - README.md
 - Rakefile
 - lib/opcodes.json
+- lib/roms/bgbtest.gb
 - lib/roms/cpu_instrs/cpu_instrs.gb
 - lib/roms/cpu_instrs/individual/01-special.gb
 - lib/roms/cpu_instrs/individual/02-interrupts.gb
@@ -51,6 +52,7 @@ files:
 - lib/roms/cpu_instrs/individual/10-bit ops.gb
 - lib/roms/cpu_instrs/individual/11-op a,(hl).gb
 - lib/roms/cpu_instrs/readme.txt
+- lib/roms/dmg-acid2.gb
 - lib/roms/hello-world.gb
 - lib/roms/instr_timing/instr_timing.gb
 - lib/roms/instr_timing/readme.txt
@@ -62,6 +64,8 @@ files:
 - lib/rubyboy/cartridge/nombc.rb
 - lib/rubyboy/cpu.rb
 - lib/rubyboy/interrupt.rb
+- lib/rubyboy/joypad.rb
+- lib/rubyboy/lcd.rb
 - lib/rubyboy/ppu.rb
 - lib/rubyboy/ram.rb
 - lib/rubyboy/register.rb