rnes 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d3d1d154a09065286af7ca812325aa2b1685cbf
-  data.tar.gz: cfa99900503dd5d59f6553f7ee3c81f4fd292dc3
+  metadata.gz: cf2afd8224c221333be85c60dddbdf47a355ca99
+  data.tar.gz: e8ff4cd2fe43280b24f9132a132eea289813f9bd
 SHA512:
-  metadata.gz: 859089e4d81fb3888ea5e52b95de2695f48acf3346b219a5e579ebcdd6516ff92ce709a798334afc60e2adf76c078898d6d79fb866c8cb6659fff149360f983e
-  data.tar.gz: 3e69abecdf78153e5ceca5090fbf8b6202fb936f710eb49a659a6b3d25756d4e52d245c93bbad73b4ca7ed8a55419b329276a6d97cf490ec4e1387be0b5ab187
+  metadata.gz: 4e19a94ab96f907994766631a5c9143998eb12e3b697c6ba9e728c2369dbd9d87838cc33f7b83d783b36215d52b5efacee20f6f473e9d5c25d5d0410279fb95c
+  data.tar.gz: 3bc697a23906996906f7a3ba7f697547a1280544105597aac986969687d29ea2c5166c962080dd62ab92aeee49669b31d96368ac34e5b2857eba16cf80c09a04

data/.rubocop.yml

@@ -49,6 +49,9 @@ Style/GuardClause:
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/Next:
+  Enabled: false
+
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma
 

data/CHANGELOG.md

@@ -1,5 +1,24 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
 ## Unreleased
 
+## 0.2.1 - 2018-11-24
+
+### Added
+
+- Decrease terminal renderer brightness threshold for better visibility.
+
+### Fixed
+
+- Fix PPU unnecessary vertical offset on rendering sprites.
+- Fix PPU background unused palette address redirection.
+- Fix PPU sprite rendering about transparent color.
+
 ## 0.2.0 - 2018-11-17
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rnes (0.1.1)
+    rnes (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/rnes/cpu.rb

@@ -5,6 +5,12 @@ require 'rnes/operation'
 
 module Rnes
   class Cpu
+    INTERRUPTION_VECTOR_FOR_IRQ_OR_BRK = 0xFFFE
+
+    INTERRUPTION_VECTOR_FOR_NMI = 0xFFFA
+
+    INTERRUPTION_VECTOR_FOR_RESET = 0xFFFC
+
     # @return [Rnes::CpuBus] bus
     attr_reader :bus
 
@@ -31,7 +37,7 @@ module Rnes
 
     def reset
       @registers.reset
-      @registers.program_counter = read_word(0xFFFC)
+      @registers.program_counter = read_word(INTERRUPTION_VECTOR_FOR_RESET)
     end
 
     # @return [Integer]
@@ -369,7 +375,7 @@ module Rnes
       push(@registers.status)
       unless @registers.interrupt?
         @registers.interrupt = true
-        @registers.program_counter = read_word(0xFFFE)
+        @registers.program_counter = read_word(INTERRUPTION_VECTOR_FOR_IRQ_OR_BRK)
       end
       @registers.program_counter -= 1
     end
@@ -1011,7 +1017,7 @@ module Rnes
       push_word(@registers.program_counter)
       push(@registers.status)
       @registers.interrupt = true
-      @registers.program_counter = read_word(0xFFFE)
+      @registers.program_counter = read_word(INTERRUPTION_VECTOR_FOR_IRQ_OR_BRK)
     end
 
     def handle_nmi
@@ -1020,7 +1026,7 @@ module Rnes
       push_word(@registers.program_counter)
       push(@registers.status)
       @registers.interrupt = true
-      @registers.program_counter = read_word(0xFFFA)
+      @registers.program_counter = read_word(INTERRUPTION_VECTOR_FOR_NMI)
     end
 
     # @return [Integer]

data/lib/rnes/ppu.rb

@@ -202,13 +202,6 @@ module Rnes
       (x_of_block.even? ? 0 : 1) + (y_of_block.even? ? 0 : 2)
     end
 
-    # @return [Integer] Integer from 0 to 63.
-    def object_attribute_index
-      (y_of_encoded_attributes % ENCODED_ATTRIBUTES_COUNT_IN_VERTICAL_LINE) * ENCODED_ATTRIBUTES_COUNT_IN_HORIZONTAL_LINE +
-        x_of_encoded_attributes % ENCODED_ATTRIBUTES_COUNT_IN_HORIZONTAL_LINE +
-        background_pattern_index_paging_offset
-    end
-
     def check_sprite_hit
       if read_from_sprite_ram(0) == y && @registers.background_enabled? && @registers.sprite_enabled?
         registers.sprite_hit = true
@@ -233,12 +226,12 @@ module Rnes
       pattern_line_low_byte = read_background_pattern_line(pattern_line_low_byte_address)
       pattern_line_high_byte = read_background_pattern_line(pattern_line_low_byte_address + TILE_HEIGHT)
 
-      mini_palette_ids_byte = read_object_attribute(object_attribute_index)
-      mini_palette_id = (mini_palette_ids_byte >> (block_id_in_encoded_attributes * 2)) & 0b11
+      palette_ids_byte = read_object_attribute(object_attribute_index)
+      palette_id = (palette_ids_byte >> (block_id_in_encoded_attributes * 2)) & 0b11
 
       TILE_WIDTH.times do |x_in_pattern|
         index_in_pattern_line_byte = TILE_WIDTH - 1 - x_in_pattern
-        background_palette_index = pattern_line_low_byte[index_in_pattern_line_byte] | (pattern_line_high_byte[index_in_pattern_line_byte] << 1) | (mini_palette_id << 2)
+        background_palette_index = pattern_line_low_byte[index_in_pattern_line_byte] | (pattern_line_high_byte[index_in_pattern_line_byte] << 1) | (palette_id << 2)
         color_id = read_color_id(background_palette_index)
         @image.write(
           value: ::Rnes::Ppu::COLORS[color_id],
@@ -263,13 +256,12 @@ module Rnes
     #      `-------- vertical flip
     def draw_sprites
       0.step(SPRITES_COUNT - 1, 4) do |base_sprite_ram_address|
-        y_for_sprite = (read_from_sprite_ram(base_sprite_ram_address) - TILE_HEIGHT)
-        next if y_for_sprite.negative?
+        y_for_sprite = read_from_sprite_ram(base_sprite_ram_address)
         pattern_index = read_from_sprite_ram(base_sprite_ram_address + 1)
         sprite_attribute_byte = read_from_sprite_ram(base_sprite_ram_address + 2)
         x_for_sprite = read_from_sprite_ram(base_sprite_ram_address + 3)
 
-        mini_palette_id = sprite_attribute_byte & 0b11
+        palette_id = sprite_attribute_byte & 0b11
         reversed_horizontally = sprite_attribute_byte[6] == 1
         reversed_vertically = sprite_attribute_byte[7] == 1
 
@@ -279,20 +271,29 @@ module Rnes
           pattern_line_high_byte = read_sprite_pattern_line(pattern_line_low_byte_address + TILE_HEIGHT)
           TILE_WIDTH.times do |x_in_pattern|
             index_in_pattern_line_byte = TILE_WIDTH - 1 - x_in_pattern
-            background_palette_index = pattern_line_low_byte[index_in_pattern_line_byte] | pattern_line_high_byte[index_in_pattern_line_byte] << 1 | mini_palette_id << 2
-            color_id = read_color_id(background_palette_index)
-            y_in_pattern = TILE_HEIGHT - 1 - y_in_pattern if reversed_vertically
-            x_in_pattern = TILE_WIDTH - 1 - x_in_pattern if reversed_horizontally
-            @image.write(
-              value: ::Rnes::Ppu::COLORS[color_id],
-              x: x_for_sprite + x_in_pattern,
-              y: y_for_sprite + y_in_pattern,
-            )
+            sprite_palette_index = pattern_line_low_byte[index_in_pattern_line_byte] | (pattern_line_high_byte[index_in_pattern_line_byte] << 1) | (palette_id << 2)
+            if sprite_palette_index % 4 != 0
+              color_id = read_color_id(sprite_palette_index)
+              y_in_pattern = TILE_HEIGHT - 1 - y_in_pattern if reversed_vertically
+              x_in_pattern = TILE_WIDTH - 1 - x_in_pattern if reversed_horizontally
+              @image.write(
+                value: ::Rnes::Ppu::COLORS[color_id],
+                x: x_for_sprite + x_in_pattern,
+                y: y_for_sprite + y_in_pattern,
+              )
+            end
           end
         end
       end
     end
 
+    # @return [Integer] Integer from 0 to 63.
+    def object_attribute_index
+      (y_of_encoded_attributes % ENCODED_ATTRIBUTES_COUNT_IN_VERTICAL_LINE) * ENCODED_ATTRIBUTES_COUNT_IN_HORIZONTAL_LINE +
+        x_of_encoded_attributes % ENCODED_ATTRIBUTES_COUNT_IN_HORIZONTAL_LINE +
+        background_pattern_index_paging_offset
+    end
+
     # @return [Boolean]
     def on_bottom_end_line?
       line == WINDOW_HEIGHT + V_BLANK_HEIGHT

data/lib/rnes/ppu_bus.rb

@@ -24,6 +24,8 @@ module Rnes
         read(address - 0x0800)
       when 0x3000..0x3EFF
         read(address - 0x1000)
+      when 0x3F04, 0x3F08, 0x3F0C
+        read(0x3F00)
       when 0x3F10, 0x3F14, 0x3F18, 0x3F1C
         read(address - 0x0010)
       when 0x3F00..0x3F1F

data/lib/rnes/terminal_renderer.rb

@@ -6,7 +6,7 @@ module Rnes
 
     BRAILLE_WIDTH = 2
 
-    BRIGHTNESS_SUM_THRESHOLD = 128 * 3
+    BRIGHTNESS_SUM_THRESHOLD = 256
 
     TEXT_HEIGHT = 61
 

data/lib/rnes/version.rb

@@ -1,3 +1,3 @@
 module Rnes
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rnes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2018-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler