rubyboy 1.2.0 → 1.3.0

data/lib/rubyboy/lcd.rb

@@ -1,38 +1,48 @@
 # frozen_string_literal: true
 
-require 'raylib'
+require 'rubyboy/sdl'
 
 module Rubyboy
   class Lcd
-    include Raylib
-
-    WIDTH = 160
-    HEIGHT = 144
-    SCALE = 4
+    SCREEN_WIDTH = 160
+    SCREEN_HEIGHT = 144
+    SCALE = 3
 
     def initialize
-      InitWindow(WIDTH * SCALE, HEIGHT * SCALE, 'RUBY BOY')
-      image = GenImageColor(WIDTH, HEIGHT, BLACK)
-      image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8
-      @texture = LoadTextureFromImage(image)
-      @vector = Vector2.create(0, 0)
-    end
+      raise SDL.GetError() if SDL.InitSubSystem(SDL::INIT_VIDEO) != 0
+
+      @buffer = FFI::MemoryPointer.new(:uint8, SCREEN_WIDTH * SCREEN_HEIGHT * 3)
+      @window = SDL.CreateWindow('RUBY BOY', 0, 0, SCREEN_WIDTH * SCALE, SCREEN_HEIGHT * SCALE, SDL::SDL_WINDOW_RESIZABLE)
 
-    def draw(pixel_data)
-      UpdateTexture(@texture, pixel_data)
+      raise SDL.GetError() if @window.null?
 
-      BeginDrawing()
-      ClearBackground(BLACK)
-      DrawTextureEx(@texture, @vector, 0.0, SCALE, WHITE)
-      EndDrawing()
+      @renderer = SDL.CreateRenderer(@window, -1, 0)
+      SDL.SetHint('SDL_HINT_RENDER_SCALE_QUALITY', '2')
+      SDL.RenderSetLogicalSize(@renderer, SCREEN_WIDTH * SCALE, SCREEN_HEIGHT * SCALE)
+      @texture = SDL.CreateTexture(@renderer, SDL::PIXELFORMAT_RGB24, 1, SCREEN_WIDTH, SCREEN_HEIGHT)
+      @event = FFI::MemoryPointer.new(:pointer)
+    end
+
+    def draw(framebuffer)
+      @buffer.write_array_of_uint8(framebuffer)
+      SDL.UpdateTexture(@texture, nil, @buffer, SCREEN_WIDTH * 3)
+      SDL.RenderClear(@renderer)
+      SDL.RenderCopy(@renderer, @texture, nil, nil)
+      SDL.RenderPresent(@renderer)
     end
 
     def window_should_close?
-      WindowShouldClose()
+      while SDL.PollEvent(@event) != 0
+        event_type = @event.read_int
+        return true if event_type == SDL::QUIT
+      end
+
+      false
     end
 
     def close_window
-      CloseWindow()
+      SDL.DestroyWindow(@window)
+      SDL.Quit
     end
   end
 end

data/lib/rubyboy/ppu.rb

@@ -64,7 +64,7 @@ module Rubyboy
       @wly = 0x00
       @cycles = 0
       @interrupt = interrupt
-      @buffer = Array.new(144 * 160, 0x00)
+      @buffer = Array.new(144 * 160 * 3, 0x00)
       @bg_pixels = Array.new(LCD_WIDTH, 0x00)
     end
 
@@ -196,7 +196,11 @@ module Rubyboy
         x = (i + @scx) % 256
         tile_index = get_tile_index(tile_map_addr + (x / 8))
         pixel = get_pixel(tile_index << 4, 7 - (x % 8), (y % 8) * 2)
-        @buffer[@ly * LCD_WIDTH + i] = get_color(@bgp, pixel)
+        color = get_color(@bgp, pixel)
+        base = @ly * LCD_WIDTH * 3 + i * 3
+        @buffer[base] = color
+        @buffer[base + 1] = color
+        @buffer[base + 2] = color
         @bg_pixels[i] = pixel
       end
     end
@@ -215,7 +219,11 @@ module Rubyboy
         x = i - (@wx - 7)
         tile_index = get_tile_index(tile_map_addr + (x / 8))
         pixel = get_pixel(tile_index << 4, 7 - (x % 8), (y % 8) * 2)
-        @buffer[@ly * LCD_WIDTH + i] = get_color(@bgp, pixel)
+        color = get_color(@bgp, pixel)
+        base = @ly * LCD_WIDTH * 3 + i * 3
+        @buffer[base] = color
+        @buffer[base + 1] = color
+        @buffer[base + 2] = color
         @bg_pixels[i] = pixel
       end
       @wly += 1 if rendered
@@ -258,7 +266,11 @@ module Rubyboy
           next if pixel == 0 || i >= LCD_WIDTH
           next if flags[SPRITE_FLAGS[:priority]] == 1 && @bg_pixels[i] != 0
 
-          @buffer[@ly * LCD_WIDTH + i] = get_color(pallet, pixel)
+          color = get_color(pallet, pixel)
+          base = @ly * LCD_WIDTH * 3 + i * 3
+          @buffer[base] = color
+          @buffer[base + 1] = color
+          @buffer[base + 2] = color
         end
       end
     end

data/lib/rubyboy/raylib/audio.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'raylib'
+
+module Rubyboy
+  module Raylib
+    class Audio
+      include Raylib
+
+      MAX_SAMPLES = 512
+
+      def initialize
+        InitAudioDevice()
+        SetAudioStreamBufferSizeDefault(MAX_SAMPLES * 2)
+        @stream = LoadAudioStream(48000, 32, 2)
+        PlayAudioStream(@stream)
+      end
+
+      def play(samples)
+        samples_pointer = FFI::MemoryPointer.new(:float, samples.size)
+        samples_pointer.put_array_of_float(0, samples)
+
+        UpdateAudioStream(@stream, samples_pointer, samples.size)
+      end
+
+      def close
+        UnloadAudioStream(@stream)
+        CloseAudioDevice()
+      end
+    end
+  end
+end

data/lib/rubyboy/raylib/lcd.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'raylib'
+
+module Rubyboy
+  module Raylib
+    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)
+        @vector = Vector2.create(0, 0)
+      end
+
+      def draw(pixel_data)
+        UpdateTexture(@texture, pixel_data.pack('C*'))
+
+        BeginDrawing()
+        ClearBackground(BLACK)
+        DrawTextureEx(@texture, @vector, 0.0, SCALE, WHITE)
+        EndDrawing()
+      end
+
+      def window_should_close?
+        WindowShouldClose()
+      end
+
+      def close_window
+        CloseWindow()
+      end
+    end
+  end
+end

data/lib/rubyboy/raylib/raylib_loader.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'raylib'
+
+module Rubyboy
+  module Raylib
+    class RaylibLoader
+      include Raylib
+
+      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
+          arch = RUBY_PLATFORM.split('-')[0]
+          Raylib.load_lib(shared_lib_path + "libraylib.#{arch}.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
+
+      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
+    end
+  end
+end

data/lib/rubyboy/registers.rb

@@ -2,7 +2,7 @@
 
 module Rubyboy
   class Registers
-    attr_reader :value
+    attr_reader :a, :b, :c, :d, :e, :h, :l, :f
 
     def initialize
       @a = 0x01
@@ -15,66 +15,72 @@ module Rubyboy
       @f = 0xb0
     end
 
-    def read8(register)
-      case register
-      when :a then @a
-      when :b then @b
-      when :c then @c
-      when :d then @d
-      when :e then @e
-      when :h then @h
-      when :l then @l
-      when :f then @f
-      end
-    end
-
-    def write8(register, value)
-      value &= 0xff
-      case register
-      when :a then @a = value
-      when :b then @b = value
-      when :c then @c = value
-      when :d then @d = value
-      when :e then @e = value
-      when :h then @h = value
-      when :l then @l = value
-      when :f then @f = value & 0xf0
-      end
-    end
-
-    def read16(register)
-      case register
-      when :af then (@a << 8) | @f
-      when :bc then (@b << 8) | @c
-      when :de then (@d << 8) | @e
-      when :hl then (@h << 8) | @l
-      end
-    end
-
-    def write16(register, value)
-      value &= 0xffff
-      case register
-      when :af
-        @a = (value >> 8) & 0xff
-        @f = value & 0xf0
-      when :bc
-        @b = (value >> 8) & 0xff
-        @c = value & 0xff
-      when :de
-        @d = (value >> 8) & 0xff
-        @e = value & 0xff
-      when :hl
-        @h = (value >> 8) & 0xff
-        @l = value & 0xff
-      end
-    end
-
-    def increment16(register)
-      write16(register, read16(register) + 1)
-    end
-
-    def decrement16(register)
-      write16(register, read16(register) - 1)
+    def a=(value)
+      @a = value & 0xff
+    end
+
+    def b=(value)
+      @b = value & 0xff
+    end
+
+    def c=(value)
+      @c = value & 0xff
+    end
+
+    def d=(value)
+      @d = value & 0xff
+    end
+
+    def e=(value)
+      @e = value & 0xff
+    end
+
+    def h=(value)
+      @h = value & 0xff
+    end
+
+    def l=(value)
+      @l = value & 0xff
+    end
+
+    def f=(value)
+      @f = value & 0xf0
+    end
+
+    def af
+      (@a << 8) | @f
+    end
+
+    def bc
+      (@b << 8) | @c
+    end
+
+    def de
+      (@d << 8) | @e
+    end
+
+    def hl
+      (@h << 8) | @l
+    end
+
+    def af=(value)
+      @a = (value >> 8) & 0xff
+      @f = value & 0xf0
+    end
+
+    def bc=(value)
+      @b = (value >> 8) & 0xff
+      @c = value & 0xff
+    end
+
+    def de=(value)
+      @d = (value >> 8) & 0xff
+      @e = value & 0xff
+    end
+
+    def hl=(value)
+      @h = (value >> 8) & 0xff
+      @l = value & 0xff
     end
   end
 end

data/lib/rubyboy/sdl.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'ffi'
+
+module Rubyboy
+  module SDL
+    extend FFI::Library
+    ffi_lib 'SDL2'
+
+    INIT_TIMER = 0x01
+    INIT_AUDIO = 0x10
+    INIT_VIDEO = 0x20
+    INIT_KEYBOARD = 0x200
+    WINDOW_RESIZABLE = 0x20
+    PIXELFORMAT_RGB24 = 386930691
+    SDL_WINDOW_RESIZABLE = 0x20
+    QUIT = 0x100
+
+    SDL_SCANCODE_W = 26
+    SDL_SCANCODE_A = 4
+    SDL_SCANCODE_S = 22
+    SDL_SCANCODE_D = 7
+    SDL_SCANCODE_J = 13
+    SDL_SCANCODE_K = 14
+    SDL_SCANCODE_U = 24
+    SDL_SCANCODE_I = 12
+
+    attach_function :Init, 'SDL_Init', [:uint32], :int
+    attach_function :InitSubSystem, 'SDL_InitSubSystem', [:uint32], :int
+    attach_function :CreateWindow, 'SDL_CreateWindow', %i[string int int int int uint32], :pointer
+    attach_function :DestroyWindow, 'SDL_DestroyWindow', [:pointer], :void
+    attach_function :CreateRenderer, 'SDL_CreateRenderer', %i[pointer int uint32], :pointer
+    attach_function :CreateTexture, 'SDL_CreateTexture', %i[pointer uint32 int int int], :pointer
+    attach_function :UpdateTexture, 'SDL_UpdateTexture', %i[pointer pointer pointer int], :int
+    attach_function :LockTexture, 'SDL_LockTexture', %i[pointer pointer pointer int], :int
+    attach_function :UnlockTexture, 'SDL_UnlockTexture', [:pointer], :void
+    attach_function :RenderClear, 'SDL_RenderClear', [:pointer], :int
+    attach_function :RenderCopy, 'SDL_RenderCopy', %i[pointer pointer pointer pointer], :int
+    attach_function :RenderPresent, 'SDL_RenderPresent', [:pointer], :int
+    attach_function :PumpEvents, 'SDL_PumpEvents', [], :void
+    attach_function :GetKeyboardState, 'SDL_GetKeyboardState', [:pointer], :pointer
+    attach_function :SetHint, 'SDL_SetHint', %i[string string], :int
+    attach_function :RenderSetLogicalSize, 'SDL_RenderSetLogicalSize', %i[pointer int int], :int
+    attach_function :SetWindowTitle, 'SDL_SetWindowTitle', %i[pointer string], :void
+    attach_function :RaiseWindow, 'SDL_RaiseWindow', [:pointer], :void
+    attach_function :GetError, 'SDL_GetError', [], :string
+    attach_function :SetRenderDrawColor, 'SDL_SetRenderDrawColor', %i[pointer uint8 uint8 uint8 uint8], :int
+    attach_function :PollEvent, 'SDL_PollEvent', [:pointer], :int
+    attach_function :Quit, 'SDL_Quit', [], :void
+
+    AUDIO_F32SYS = 0x8120
+    attach_function :OpenAudioDevice, 'SDL_OpenAudioDevice', %i[string int pointer pointer int], :uint32
+    attach_function :PauseAudioDevice, 'SDL_PauseAudioDevice', %i[uint32 int], :void
+    attach_function :GetQueuedAudioSize, 'SDL_GetQueuedAudioSize', [:uint32], :uint32
+    attach_function :QueueAudio, 'SDL_QueueAudio', %i[uint32 pointer uint32], :int
+
+    class AudioSpec < FFI::Struct
+      layout(
+        :freq, :int,
+        :format, :ushort,
+        :channels, :uchar,
+        :silence, :uchar,
+        :samples, :ushort,
+        :padding, :ushort,
+        :size, :uint,
+        :callback, :pointer,
+        :userdata, :pointer
+      )
+    end
+  end
+end

data/lib/rubyboy/version.rb

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

data/lib/rubyboy.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'raylib'
+require 'rubyboy/sdl'
+require_relative 'rubyboy/apu'
 require_relative 'rubyboy/bus'
 require_relative 'rubyboy/cpu'
 require_relative 'rubyboy/ppu'
@@ -14,10 +15,7 @@ require_relative 'rubyboy/cartridge/factory'
 
 module Rubyboy
   class Console
-    include Raylib
-
     def initialize(rom_path)
-      load_raylib
       rom_data = File.open(rom_path, 'r') { _1.read.bytes }
       rom = Rom.new(rom_data)
       ram = Ram.new
@@ -26,19 +24,23 @@ module Rubyboy
       @ppu = Ppu.new(interrupt)
       @timer = Timer.new(interrupt)
       @joypad = Joypad.new(interrupt)
-      @bus = Bus.new(@ppu, rom, ram, mbc, @timer, interrupt, @joypad)
+      @apu = Apu.new
+      @bus = Bus.new(@ppu, rom, ram, mbc, @timer, interrupt, @joypad, @apu)
       @cpu = Cpu.new(@bus, interrupt)
       @lcd = Lcd.new
     end
 
     def start
-      until @lcd.window_should_close?
+      SDL.InitSubSystem(SDL::INIT_KEYBOARD)
+      loop do
         cycles = @cpu.exec
         @timer.step(cycles)
-        if @ppu.step(cycles)
-          draw
-          key_input_check
-        end
+        @apu.step(cycles)
+        next unless @ppu.step(cycles)
+
+        @lcd.draw(@ppu.buffer)
+        key_input_check
+        break if @lcd.window_should_close?
       end
       @lcd.close_window
     rescue StandardError => e
@@ -63,40 +65,15 @@ module Rubyboy
 
     private
 
-    def draw
-      pixel_data = buffer_to_pixel_data(@ppu.buffer)
-      @lcd.draw(pixel_data)
-    end
-
-    def buffer_to_pixel_data(buffer)
-      buffer.flat_map do |row|
-        [row, row, row]
-      end.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
-        arch = RUBY_PLATFORM.split('-')[0]
-        Raylib.load_lib(shared_lib_path + "libraylib.#{arch}.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
+      SDL.PumpEvents
+      keyboard = SDL.GetKeyboardState(nil)
+      keyboard_state = keyboard.read_array_of_uint8(229)
 
-      SetTraceLogLevel(LOG_ERROR)
+      direction = (keyboard_state[SDL::SDL_SCANCODE_D]) | (keyboard_state[SDL::SDL_SCANCODE_A] << 1) | (keyboard_state[SDL::SDL_SCANCODE_W] << 2) | (keyboard_state[SDL::SDL_SCANCODE_S] << 3)
+      action = (keyboard_state[SDL::SDL_SCANCODE_K]) | (keyboard_state[SDL::SDL_SCANCODE_J] << 1) | (keyboard_state[SDL::SDL_SCANCODE_U] << 2) | (keyboard_state[SDL::SDL_SCANCODE_I] << 3)
+      @joypad.direction_button(15 - direction)
+      @joypad.action_button(15 - action)
     end
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rubyboy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - sacckey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: raylib-bindings
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.3
 description:
 email:
 executables:
@@ -61,6 +67,12 @@ files:
 - lib/roms/instr_timing/readme.txt
 - lib/roms/tobu.gb
 - lib/rubyboy.rb
+- lib/rubyboy/apu.rb
+- lib/rubyboy/apu_channels/channel1.rb
+- lib/rubyboy/apu_channels/channel2.rb
+- lib/rubyboy/apu_channels/channel3.rb
+- lib/rubyboy/apu_channels/channel4.rb
+- lib/rubyboy/audio.rb
 - lib/rubyboy/bus.rb
 - lib/rubyboy/cartridge/factory.rb
 - lib/rubyboy/cartridge/mbc1.rb
@@ -71,8 +83,12 @@ files:
 - lib/rubyboy/lcd.rb
 - lib/rubyboy/ppu.rb
 - lib/rubyboy/ram.rb
+- lib/rubyboy/raylib/audio.rb
+- lib/rubyboy/raylib/lcd.rb
+- lib/rubyboy/raylib/raylib_loader.rb
 - lib/rubyboy/registers.rb
 - lib/rubyboy/rom.rb
+- lib/rubyboy/sdl.rb
 - lib/rubyboy/timer.rb
 - lib/rubyboy/version.rb
 - resource/logo/logo.png