rubyboy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75741c0c0044a7a9985e38c81e7756ed155481f39a8ced6620842ad09590a631
-  data.tar.gz: 6ca44b4cf8b11111eaaae44876b1d303f7d9baf20ee6e2132b61c61bf5d93486
+  metadata.gz: a90f9cbc5a0ac4a9f9b971f0c4454421dc83ae9686222c275679f173e7503232
+  data.tar.gz: 52833516da6531982602c373acb11a74d292db6221b8ad34d4420a94be7fe017
 SHA512:
-  metadata.gz: 0ef6237619ea02791de321e13645a694cdf715bdcd3f958d4116e739e4d6734309d7da66c03d829ffacec3e231310ea5d70ede2daf8c53b2bd93d7d1d483df19
-  data.tar.gz: ff8fd7354154f5f62b16ce5139a3c689d3e01f4e2dabe95e48350fe8573ddb490dc576a533c06d826974b20f3fcd7e245b5ada766cad2212a513d50ef632b59b
+  metadata.gz: ef45830027a11b9827e8660bef2fbb45a5a0fc867486aef58ece8a930acae959eb66ac5709d425e8562d1a546608cbb4cce040efc9e17940b627dfc9095c4a7b
+  data.tar.gz: d8564cc7f5c66dbce015fead7ff770527736943e9c1de3858ed813c1cc012c1e9c5b9248010d16ee39a5fa668e720eb9cda93443b2097260b3b24688b9acdd42

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [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

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
@@ -42,8 +43,7 @@ module Rubyboy
         # unused
         0xff
       when 0xff00
-        # joypad
-        @tmp[addr] ||= 0
+        @joypad.read_byte(addr)
       when 0xff01..0xff02
         # serial
         @tmp[addr] ||= 0
@@ -102,8 +102,7 @@ module Rubyboy
       when 0xfea0..0xfeff
         # unused
       when 0xff00
-        # joypad
-        @tmp[addr] = value
+        @joypad.write_byte(addr, value)
       when 0xff01..0xff02
         # serial
         @tmp[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/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

@@ -11,7 +11,6 @@ module Rubyboy
     SCALE = 4
 
     def initialize
-      load_raylib
       InitWindow(WIDTH * SCALE, HEIGHT * SCALE, 'RUBY BOY')
       image = GenImageColor(WIDTH, HEIGHT, BLACK)
       image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8
@@ -34,24 +33,5 @@ module Rubyboy
     def close_window
       CloseWindow()
     end
-
-    private
-
-    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

data/lib/rubyboy/ppu.rb

@@ -38,6 +38,7 @@ module Rubyboy
       @cycles = 0
       @interrupt = interrupt
       @buffer = Array.new(144 * 160, 0x00)
+      @bg_pixels = Array.new(LCD_WIDTH, 0x00)
     end
 
     def read_byte(addr)
@@ -169,6 +170,7 @@ module Rubyboy
         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
 
@@ -185,6 +187,7 @@ module Rubyboy
         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
@@ -223,7 +226,7 @@ module Rubyboy
           i = (sprite[:x] + x) % 256
 
           next if pixel.zero? || i >= LCD_WIDTH
-          next if sprite[:flags][7] == 1 && @buffer[@ly * LCD_WIDTH + i] != 0xff
+          next if sprite[:flags][7] == 1 && @bg_pixels[i] != 0
 
           @buffer[@ly * LCD_WIDTH + i] = get_color(pallet, pixel)
         end

data/lib/rubyboy/version.rb

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

data/lib/rubyboy.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'raylib'
 require 'benchmark'
 require_relative 'rubyboy/version'
 require_relative 'rubyboy/bus'
@@ -8,21 +9,27 @@ require_relative 'rubyboy/ppu'
 require_relative 'rubyboy/rom'
 require_relative 'rubyboy/timer'
 require_relative 'rubyboy/lcd'
+require_relative 'rubyboy/joypad'
 
 module Rubyboy
   class Console
+    include Raylib
+
     def initialize(rom_data)
+      load_raylib
       rom = Rom.new(rom_data)
       interrupt = Interrupt.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 start
       until @lcd.window_should_close?
+        key_input_check
         cycles = @cpu.exec
         @timer.step(cycles)
         draw if @ppu.step(cycles)
@@ -33,6 +40,8 @@ module Rubyboy
       raise e
     end
 
+    private
+
     def draw
       pixel_data = buffer_to_pixel_data(@ppu.buffer)
       @lcd.draw(pixel_data)
@@ -43,8 +52,32 @@ module Rubyboy
         [row, row, row]
       end.flatten.pack('C*')
     end
+
+    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 }
+rom_data = File.open(File.expand_path('roms/bgbtest.gb', __dir__), 'r') { _1.read.bytes }
 Rubyboy::Console.new(rom_data).start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyboy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - sacckey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raylib-bindings
@@ -64,6 +64,7 @@ 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