rubyboy 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f71c49ce8d91b143c346ea5ac3534d531faa1d7ed7fc886243ed77e9e76e31b7
-  data.tar.gz: c9211303e89f8d775fb8c083a0eb3ab97e2299e41722b6c461bfac0cc9ea94ac
+  metadata.gz: 909f97d8e2a7de6573d735d5d949bd7a8533c6096c24f4f74cede36e2c3651bc
+  data.tar.gz: 2a0e0b87e8053143389a6970c910859229ec9001da32f91eb805ea0ebcea6bae
 SHA512:
-  metadata.gz: 76374e3846dc6a917a0dda34b71f6c667155cd5458bbb70ab0fba1ae16a8e5482153808e4de64aa8670d958a69ec52625e5f41673a04780d2b063b35c1564606
-  data.tar.gz: a3354719d960846738a7cb9252afa1a86fa0c3a2a0d3529013808386ab8a5aaa4a08ebc132cefed02353e20c4193f96804620031a79b6ca324c1e01ed5b8f12f
+  metadata.gz: 01fa425096d955d638c55e2489642d2532af9772c3a78aa1f11797bd952396472e78b0851605e7e81abdf49adc746725fb6c96eee904811b65a4edee74204221
+  data.tar.gz: dc45f065ed0c3e93d14ad190bdb9b0a6947b3634e2907759fe909af61a1d6cdc9acae338955ecaeefa94411aa98847369691f77c1cf242ed8c2ea77e8d0d216e

data/.rubocop.yml

@@ -20,6 +20,9 @@ Metrics/BlockNesting:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
+Metrics/ParameterLists:
+  Enabled: false
+
 Metrics/PerceivedComplexity:
   Enabled: false
 

data/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

data/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
 

data/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

data/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

data/lib/rubyboy/cartridge/mbc1.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../ram'
-
 module Rubyboy
   module Cartridge
     class Mbc1

data/lib/rubyboy/cpu.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'registers'
-require_relative 'operand'
 
 module Rubyboy
   class Cpu

data/lib/rubyboy/lcd.rb

@@ -15,6 +15,7 @@ module Rubyboy
       image = GenImageColor(WIDTH, HEIGHT, BLACK)
       image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8
       @texture = LoadTextureFromImage(image)
+      @vector = Vector2.create(0, 0)
     end
 
     def draw(pixel_data)
@@ -22,7 +23,7 @@ module Rubyboy
 
       BeginDrawing()
       ClearBackground(BLACK)
-      DrawTextureEx(@texture, Vector2.create(0, 0), 0.0, SCALE, WHITE)
+      DrawTextureEx(@texture, @vector, 0.0, SCALE, WHITE)
       EndDrawing()
     end
 

data/lib/rubyboy/version.rb

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

data/lib/rubyboy.rb

@@ -5,10 +5,12 @@ require_relative 'rubyboy/bus'
 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 @@ module Rubyboy
       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 @@ module Rubyboy
     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 @@ module Rubyboy
       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")

data/resource/logo/logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="467" height="75" viewBox="0 0 467 75"><path fill="#cc342d" d="M25.40 46.45L21.75 46.45L18.40 73.65L2.20 73.65L11.10 0.80L33.20 0.80Q39.90 0.80 44.63 2.23Q49.35 3.65 52.35 6.15Q55.35 8.65 56.73 12.08Q58.10 15.50 58.10 19.50L58.10 19.50Q58.10 23.55 57.03 27.15Q55.95 30.75 53.90 33.78Q51.85 36.80 48.88 39.13Q45.90 41.45 42.10 42.95L42.10 42.95Q43.60 43.80 44.93 45Q46.25 46.20 47 48L47 48L57.60 73.65L42.90 73.65Q40.85 73.65 39.45 72.85Q38.05 72.05 37.50 70.55L37.50 70.55L29.60 49Q29.05 47.60 28.13 47.03Q27.20 46.45 25.40 46.45L25.40 46.45ZM31.70 12.95L25.90 12.95L23.15 35.20L29.10 35.20Q32.60 35.20 35.05 34.13Q37.50 33.05 39.03 31.25Q40.55 29.45 41.23 27.05Q41.90 24.65 41.90 22L41.90 22Q41.90 19.95 41.30 18.28Q40.70 16.60 39.43 15.43Q38.15 14.25 36.23 13.60Q34.30 12.95 31.70 12.95L31.70 12.95ZM90.40 60.85L90.40 60.85Q93.45 60.85 95.95 59.68Q98.45 58.50 100.35 56.33Q102.25 54.15 103.50 51.05Q104.75 47.95 105.20 44.10L105.20 44.10L110.50 0.80L126.80 0.80L121.50 44.10Q120.65 50.75 117.98 56.33Q115.30 61.90 111.03 65.93Q106.75 69.95 101.10 72.20Q95.45 74.45 88.70 74.45L88.70 74.45Q82.60 74.45 77.83 72.60Q73.05 70.75 69.78 67.38Q66.50 64 64.80 59.30Q63.10 54.60 63.10 48.95L63.10 48.95Q63.10 46.60 63.40 44.10L63.40 44.10L68.60 0.80L84.90 0.80L79.60 44.10Q79.50 45 79.45 45.88Q79.40 46.75 79.40 47.60L79.40 47.60Q79.40 53.80 82.23 57.33Q85.05 60.85 90.40 60.85ZM154.50 73.65L127.30 73.65L136.30 0.80L161.30 0.80Q167.65 0.80 172.18 2Q176.70 3.20 179.58 5.42Q182.45 7.65 183.78 10.78Q185.10 13.90 185.10 17.70L185.10 17.70Q185.10 20.70 184.33 23.48Q183.55 26.25 181.88 28.60Q180.20 30.95 177.55 32.88Q174.90 34.80 171.15 36.10L171.15 36.10Q177.05 37.70 179.88 41.08Q182.70 44.45 182.70 49.60L182.70 49.60Q182.70 54.65 180.78 59.03Q178.85 63.40 175.20 66.65Q171.55 69.90 166.33 71.78Q161.10 73.65 154.50 73.65L154.50 73.65ZM157.90 42.55L147.40 42.55L145.10 61.40L155.80 61.40Q158.80 61.40 160.85 60.53Q162.90 59.65 164.18 58.08Q165.45 56.50 166.03 54.40Q166.60 52.30 166.60 49.80L166.60 49.80Q166.60 48.15 166.18 46.80Q165.75 45.45 164.73 44.53Q163.70 43.60 162.03 43.08Q160.35 42.55 157.90 42.55L157.90 42.55ZM151 12.95L148.70 31.75L156.50 31.75Q159.25 31.75 161.45 31.20Q163.65 30.65 165.23 29.33Q166.80 28 167.65 25.80Q168.50 23.60 168.50 20.35L168.50 20.35Q168.50 16.30 166.38 14.63Q164.25 12.95 159.80 12.95L159.80 12.95L151 12.95ZM255.30 0.80L225.45 45.75L222 73.65L205.70 73.65L209.15 45.90L190.40 0.80L204.90 0.80Q207 0.80 208.18 1.78Q209.35 2.75 209.90 4.35L209.90 4.35L216.90 26.40Q217.60 28.60 218.18 30.65Q218.75 32.70 219.15 34.60L219.15 34.60Q220.10 32.70 221.25 30.68Q222.40 28.65 223.70 26.40L223.70 26.40L236.10 4.35Q236.85 3 238.30 1.90Q239.75 0.80 241.80 0.80L241.80 0.80L255.30 0.80ZM297 73.65L269.80 73.65L278.80 0.80L303.80 0.80Q310.15 0.80 314.68 2Q319.20 3.20 322.08 5.42Q324.95 7.65 326.28 10.78Q327.60 13.90 327.60 17.70L327.60 17.70Q327.60 20.70 326.83 23.48Q326.05 26.25 324.38 28.60Q322.70 30.95 320.05 32.88Q317.40 34.80 313.65 36.10L313.65 36.10Q319.55 37.70 322.38 41.08Q325.20 44.45 325.20 49.60L325.20 49.60Q325.20 54.65 323.28 59.03Q321.35 63.40 317.70 66.65Q314.05 69.90 308.83 71.78Q303.60 73.65 297 73.65L297 73.65ZM300.40 42.55L289.90 42.55L287.60 61.40L298.30 61.40Q301.30 61.40 303.35 60.53Q305.40 59.65 306.68 58.08Q307.95 56.50 308.53 54.40Q309.10 52.30 309.10 49.80L309.10 49.80Q309.10 48.15 308.68 46.80Q308.25 45.45 307.23 44.53Q306.20 43.60 304.53 43.08Q302.85 42.55 300.40 42.55L300.40 42.55ZM293.50 12.95L291.20 31.75L299 31.75Q301.75 31.75 303.95 31.20Q306.15 30.65 307.73 29.33Q309.30 28 310.15 25.80Q311 23.60 311 20.35L311 20.35Q311 16.30 308.88 14.63Q306.75 12.95 302.30 12.95L302.30 12.95L293.50 12.95ZM401.40 32.55L401.40 32.55Q401.40 38.45 400.02 43.85Q398.65 49.25 396.13 53.90Q393.60 58.55 390.02 62.35Q386.45 66.15 382 68.83Q377.55 71.50 372.35 72.98Q367.15 74.45 361.40 74.45L361.40 74.45Q354.20 74.45 348.48 71.93Q342.75 69.40 338.75 65.03Q334.75 60.65 332.63 54.73Q330.50 48.80 330.50 41.95L330.50 41.95Q330.50 36.05 331.88 30.63Q333.25 25.20 335.77 20.55Q338.30 15.90 341.90 12.10Q345.50 8.30 349.95 5.63Q354.40 2.95 359.60 1.48Q364.80 0 370.60 0L370.60 0Q377.75 0 383.48 2.53Q389.20 5.05 393.18 9.45Q397.15 13.85 399.27 19.80Q401.40 25.75 401.40 32.55ZM384.70 32.95L384.70 32.95Q384.70 28.45 383.63 24.78Q382.55 21.10 380.48 18.48Q378.40 15.85 375.40 14.43Q372.40 13 368.60 13L368.60 13Q363.60 13 359.65 15.08Q355.70 17.15 352.93 20.90Q350.15 24.65 348.68 29.93Q347.20 35.20 347.20 41.60L347.20 41.60Q347.20 46.10 348.25 49.75Q349.30 53.40 351.32 56Q353.35 58.60 356.35 60.03Q359.35 61.45 363.20 61.45L363.20 61.45Q368.20 61.45 372.18 59.40Q376.15 57.35 378.93 53.60Q381.70 49.85 383.20 44.60Q384.70 39.35 384.70 32.95ZM467 0.80L437.15 45.75L433.70 73.65L417.40 73.65L420.85 45.90L402.10 0.80L416.60 0.80Q418.70 0.80 419.88 1.78Q421.05 2.75 421.60 4.35L421.60 4.35L428.60 26.40Q429.30 28.60 429.88 30.65Q430.45 32.70 430.85 34.60L430.85 34.60Q431.80 32.70 432.95 30.68Q434.10 28.65 435.40 26.40L435.40 26.40L447.80 4.35Q448.55 3 450 1.90Q451.45 0.80 453.50 0.80L453.50 0.80L467 0.80Z"></path></svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyboy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - sacckey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2024-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raylib-bindings
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.6.0
 description:
 email:
 executables:
@@ -69,23 +69,14 @@ files:
 - 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
+- resource/logo/logo.png
+- resource/logo/logo.svg
 - sig/rubyboy.rbs
 homepage: https://github.com/sacckey/rubyboy
 licenses:

data/lib/rubyboy/operand/direct16.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  module Operand
-    class Direct16
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-    end
-  end
-end

data/lib/rubyboy/operand/direct8.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  module Operand
-    class Direct8
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-    end
-  end
-end

data/lib/rubyboy/operand/hl_dec.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  module Operand
-    class HlDec
-      def initialize(value = 0)
-        @value = value
-      end
-    end
-  end
-end

data/lib/rubyboy/operand/hl_inc.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  module Operand
-    class HlInc
-      def initialize(value = 0)
-        @value = value
-      end
-    end
-  end
-end

data/lib/rubyboy/operand/immediate16.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  module Operand
-    class Immediate16
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-    end
-  end
-end

data/lib/rubyboy/operand/immediate8.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  module Operand
-    class Immediate8
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-    end
-  end
-end

data/lib/rubyboy/operand/indirect.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  module Operand
-    class Indirect
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-    end
-  end
-end

data/lib/rubyboy/operand/register16.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  module Operand
-    class Register16
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-    end
-  end
-end

data/lib/rubyboy/operand/register8.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  module Operand
-    class Register8
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-    end
-  end
-end

data/lib/rubyboy/operand.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  class Operand
-    attr_reader :type, :value
-
-    def initialize(type:, value: 0)
-      @type = type
-      @value = value
-    end
-  end
-end

data/lib/rubyboy/register.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Rubyboy
-  class Register
-    attr_reader :value
-
-    def initialize(name:, value:)
-      @name = name
-      @value = value
-    end
-
-    def value=(v)
-      @value = v & 0xff
-    end
-
-    def increment
-      @value = (@value + 1) & 0xff
-    end
-
-    def decrement
-      @value = (@value - 1) & 0xff
-    end
-  end
-end