Merge pull request #13 from sacckey/v1.2.0

V1.2.0
sacckey · Jan 9, 2024 · 31aa875 · 31aa875
2 parents 449044b + 04c7717
commit 31aa875
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 169 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -20,6 +20,9 @@ Metrics/BlockNesting:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
+Metrics/ParameterLists:
+  Enabled: false
+
 Metrics/PerceivedComplexity:
   Enabled: false
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [1.2.0] - 2024-01-09
+
+- Add logo
+- Bump raylib-bindings version to 0.6.0
+- Optimizing
+- Remove unnecessary classes
+
 ## [1.1.0] - 2023-12-28
 
 - Add bench option

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rubyboy (1.1.0)
-      raylib-bindings (~> 0.5.7)
+    rubyboy (1.2.0)
+      raylib-bindings (~> 0.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -21,7 +21,10 @@ GEM
     racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    raylib-bindings (0.5.7)
+    raylib-bindings (0.6.0-x86_64-darwin)
+      ffi (~> 1.16)
+      opengl-bindings2 (~> 2)
+    raylib-bindings (0.6.0-x86_64-linux)
       ffi (~> 1.16)
       opengl-bindings2 (~> 2)
     regexp_parser (2.8.2)

diff --git a/README.md b/README.md
@@ -1,4 +1,8 @@
-# Rubyboy
+<br>
+<p align="center">
+  <img src="/resource/logo/logo.svg" width="480px">
+</p>
+<br>
 
 A Game Boy emulator written in Ruby
 

diff --git a/exe/rubyboy b/exe/rubyboy
@@ -6,7 +6,8 @@ require 'bench'
 
 arg = ARGV[0]
 
-puts "yjit: #{RubyVM::YJIT.enabled?}"
+puts "Ruby: #{RUBY_VERSION}"
+puts "YJIT: #{RubyVM::YJIT.enabled?}"
 
 if arg == 'bench'
   Rubyboy::Bench.new.bench

diff --git a/lib/rubyboy.rb b/lib/rubyboy.rb
@@ -5,10 +5,12 @@
 require_relative 'rubyboy/cpu'
 require_relative 'rubyboy/ppu'
 require_relative 'rubyboy/rom'
+require_relative 'rubyboy/ram'
 require_relative 'rubyboy/timer'
 require_relative 'rubyboy/lcd'
 require_relative 'rubyboy/joypad'
 require_relative 'rubyboy/interrupt'
+require_relative 'rubyboy/cartridge/factory'
 
 module Rubyboy
   class Console
@@ -18,11 +20,13 @@ def initialize(rom_path)
       load_raylib
       rom_data = File.open(rom_path, 'r') { _1.read.bytes }
       rom = Rom.new(rom_data)
+      ram = Ram.new
+      mbc = Cartridge::Factory.create(rom, ram)
       interrupt = Interrupt.new
       @ppu = Ppu.new(interrupt)
       @timer = Timer.new(interrupt)
       @joypad = Joypad.new(interrupt)
-      @bus = Bus.new(@ppu, rom, @timer, interrupt, @joypad)
+      @bus = Bus.new(@ppu, rom, ram, mbc, @timer, interrupt, @joypad)
       @cpu = Cpu.new(@bus, interrupt)
       @lcd = Lcd.new
     end
@@ -65,9 +69,9 @@ def draw
     end
 
     def buffer_to_pixel_data(buffer)
-      buffer.map do |row|
+      buffer.flat_map do |row|
         [row, row, row]
-      end.flatten.pack('C*')
+      end.pack('C*')
     end
 
     def key_input_check
@@ -83,7 +87,8 @@ def load_raylib
       when /mswin|msys|mingw/ # Windows
         Raylib.load_lib("#{shared_lib_path}libraylib.dll")
       when /darwin/ # macOS
-        Raylib.load_lib("#{shared_lib_path}libraylib.dylib")
+        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")

diff --git a/lib/rubyboy/bus.rb b/lib/rubyboy/bus.rb
@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'cartridge/factory'
-
 module Rubyboy
   class Bus
-    def initialize(ppu, rom, timer, interrupt, joypad)
+    def initialize(ppu, rom, ram, mbc, timer, interrupt, joypad)
       @ppu = ppu
       @rom = rom
-      @ram = Ram.new
-      @mbc = Cartridge::Factory.create(@rom, @ram)
+      @ram = ram
+      @mbc = mbc
       @joypad = joypad
       @interrupt = interrupt
       @timer = timer

diff --git a/lib/rubyboy/cartridge/mbc1.rb b/lib/rubyboy/cartridge/mbc1.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../ram'
-
 module Rubyboy
   module Cartridge
     class Mbc1

diff --git a/lib/rubyboy/cpu.rb b/lib/rubyboy/cpu.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'registers'
-require_relative 'operand'
 
 module Rubyboy
   class Cpu

diff --git a/lib/rubyboy/lcd.rb b/lib/rubyboy/lcd.rb
@@ -15,14 +15,15 @@ def initialize
       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)
 
       BeginDrawing()
       ClearBackground(BLACK)
-      DrawTextureEx(@texture, Vector2.create(0, 0), 0.0, SCALE, WHITE)
+      DrawTextureEx(@texture, @vector, 0.0, SCALE, WHITE)
       EndDrawing()
     end
 

diff --git a/lib/rubyboy/operand.rb b/lib/rubyboy/operand.rb
diff --git a/lib/rubyboy/operand/direct16.rb b/lib/rubyboy/operand/direct16.rb
diff --git a/lib/rubyboy/operand/direct8.rb b/lib/rubyboy/operand/direct8.rb
diff --git a/lib/rubyboy/operand/hl_dec.rb b/lib/rubyboy/operand/hl_dec.rb
diff --git a/lib/rubyboy/operand/hl_inc.rb b/lib/rubyboy/operand/hl_inc.rb
diff --git a/lib/rubyboy/operand/immediate16.rb b/lib/rubyboy/operand/immediate16.rb
diff --git a/lib/rubyboy/operand/immediate8.rb b/lib/rubyboy/operand/immediate8.rb
diff --git a/lib/rubyboy/operand/indirect.rb b/lib/rubyboy/operand/indirect.rb
diff --git a/lib/rubyboy/operand/register16.rb b/lib/rubyboy/operand/register16.rb
diff --git a/lib/rubyboy/operand/register8.rb b/lib/rubyboy/operand/register8.rb
diff --git a/lib/rubyboy/register.rb b/lib/rubyboy/register.rb
diff --git a/lib/rubyboy/version.rb b/lib/rubyboy/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubyboy
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end
diff --git a/resource/logo/logo.png b/resource/logo/logo.png
diff --git a/resource/logo/logo.svg b/resource/logo/logo.svg
diff --git a/rubyboy.gemspec b/rubyboy.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency 'raylib-bindings', '~> 0.5.7'
+  spec.add_dependency 'raylib-bindings', '~> 0.6.0'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html