rubyboy 0.3.0 → 1.0.0

data/lib/rubyboy.rb

@@ -1,23 +1,29 @@
 # frozen_string_literal: true
 
-require 'benchmark'
-require_relative 'rubyboy/version'
+require 'raylib'
 require_relative 'rubyboy/bus'
 require_relative 'rubyboy/cpu'
 require_relative 'rubyboy/ppu'
 require_relative 'rubyboy/rom'
 require_relative 'rubyboy/timer'
 require_relative 'rubyboy/lcd'
+require_relative 'rubyboy/joypad'
+require_relative 'rubyboy/interrupt'
 
 module Rubyboy
   class Console
-    def initialize(rom_data)
+    include Raylib
+
+    def initialize(rom_path)
+      load_raylib
+      rom_data = File.open(rom_path, 'r') { _1.read.bytes }
       rom = Rom.new(rom_data)
       interrupt = Interrupt.new
       @ppu = Ppu.new(interrupt)
       @timer = Timer.new(interrupt)
-      @bus = Bus.new(@ppu, rom, @timer, interrupt)
-      @cpu = Cpu.new(@bus)
+      @joypad = Joypad.new(interrupt)
+      @bus = Bus.new(@ppu, rom, @timer, interrupt, @joypad)
+      @cpu = Cpu.new(@bus, interrupt)
       @lcd = Lcd.new
     end
 
@@ -25,7 +31,10 @@ module Rubyboy
       until @lcd.window_should_close?
         cycles = @cpu.exec
         @timer.step(cycles)
-        draw if @ppu.step(cycles)
+        if @ppu.step(cycles)
+          draw
+          key_input_check
+        end
       end
       @lcd.close_window
     rescue StandardError => e
@@ -33,6 +42,8 @@ module Rubyboy
       raise e
     end
 
+    private
+
     def draw
       pixel_data = buffer_to_pixel_data(@ppu.buffer)
       @lcd.draw(pixel_data)
@@ -43,8 +54,29 @@ 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 }
-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: 1.0.0
 platform: ruby
 authors:
 - sacckey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raylib-bindings
@@ -26,7 +26,8 @@ dependencies:
         version: 0.5.7
 description:
 email:
-executables: []
+executables:
+- rubyboy
 extensions: []
 extra_rdoc_files: []
 files:
@@ -37,6 +38,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- exe/rubyboy
 - lib/opcodes.json
 - lib/roms/bgbtest.gb
 - lib/roms/cpu_instrs/cpu_instrs.gb
@@ -64,10 +66,22 @@ files:
 - lib/rubyboy/cartridge/nombc.rb
 - lib/rubyboy/cpu.rb
 - lib/rubyboy/interrupt.rb
+- lib/rubyboy/joypad.rb
 - lib/rubyboy/lcd.rb
+- lib/rubyboy/operand.rb
+- lib/rubyboy/operand/direct16.rb
+- lib/rubyboy/operand/direct8.rb
+- lib/rubyboy/operand/hl_dec.rb
+- lib/rubyboy/operand/hl_inc.rb
+- lib/rubyboy/operand/immediate16.rb
+- lib/rubyboy/operand/immediate8.rb
+- lib/rubyboy/operand/indirect.rb
+- lib/rubyboy/operand/register16.rb
+- lib/rubyboy/operand/register8.rb
 - lib/rubyboy/ppu.rb
 - lib/rubyboy/ram.rb
 - lib/rubyboy/register.rb
+- lib/rubyboy/registers.rb
 - lib/rubyboy/rom.rb
 - lib/rubyboy/timer.rb
 - lib/rubyboy/version.rb