rgss3 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 139cb21454b86af111586ecdef898ccf17598221
-  data.tar.gz: 8abad362c2b9f1e5ed257f6111aff593dd54c2c0
+  metadata.gz: 823503b6d2d5eda418635f118dff31c22a704ec0
+  data.tar.gz: cbb6b1f25914822ee084ca80ae2e808fa93ec97e
 SHA512:
-  metadata.gz: 48467765ea9118bd6acb7a6cb8ebdc71d349d523963d572a606cbe4535dc364240988f584cb1188a0e5a8afb696a5acdf49b8a50c57f7cf72c79529560d631ff
-  data.tar.gz: 290e1826984ae211019d9f268007b372cbc822a0efb7f7918abc86c33392ec4af7013e786eb6316a326ece35988133f2be0989dab888652151f95e7119fd8714
+  metadata.gz: 5562562ffd51b8634689611588b551b76aea4c6a374f1a047facc666a5996a6368c2591571d7202408f98b10b533e7ecbb9bcb0c8775725eb522b9c110379af9
+  data.tar.gz: e2d0b5925f05edac8c30c542cd019ff8d1ccb0151c93957b5549495c2e8b5cb1c86e2e6551ad41ba93af4bb2984f5f644d212b1219456021e37379903a14b6df

data/lib/rgss3/bitmap.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 class Bitmap
 
-  attr_reader :rect, :gosu_image
+  attr_reader :rect
   attr_accessor :font
 
   def initialize(*args)
@@ -29,11 +29,13 @@ class Bitmap
   end
 
   def init_other_attr
-    @rect = Rect.new(0, 0, @gosu_image.width, @gosu_image.height)
+    @rect = Rect.new(0, 0, gosu_image.width, gosu_image.height)
     @font = Font.new
   end
 
   def dispose
+    @gosu_image = nil
+    @rmagick_image = nil
     @disposed = true
   end
 
@@ -42,27 +44,25 @@ class Bitmap
   end
 
   def width
-    @gosu_image.width
+    gosu_image.width
   end
 
   def height
-    @gosu_image.height
+    gosu_image.height
   end
 
-  # untested
   def blt(x, y, src_bitmap, src_rect, opacity = 255)
     # opacity is not supported
     im2 = src_bitmap.gosu_image.subimage(*src_rect)
-    @gosu_image.insert(im2, x, y)
+    gosu_image.insert(im2, x, y)
     set_dirty
   end
 
-  # untested
   def stretch_blt(dest_rect, src_bitmap, src_rect, opacity = 255)
     im2 = src_bitmap.gosu_image.subimage(*src_rect)
     im2 = Bitmap.gosu_to_rmagick(gosu_to_rmagick)
     im2.resize!(dest_rect.width, dest_rect.height)
-    @gosu_image.insert(im2, dest_rect.x, dest_rect.y)
+    gosu_image.insert(im2, dest_rect.x, dest_rect.y)
     set_dirty
   end
 
@@ -79,7 +79,7 @@ class Bitmap
       raise ArgumentError
     end
     img = Magick::Image.new(width, height) { self.background_color = color.to_rmagick_color }
-    @gosu_image.insert(img, x, y)
+    gosu_image.insert(img, x, y)
     set_dirty
   end
 
@@ -107,7 +107,7 @@ class Bitmap
     fill = Magick::GradientFill.new(0, 0, x2, y2, start_color, end_color)
 
     img = Magick::Image.new(width, height, fill)
-    @gosu_image.insert(img, x, y)
+    gosu_image.insert(img, x, y)
     set_dirty
   end
 
@@ -116,19 +116,7 @@ class Bitmap
   end
 
   def clear_rect(*args)
-    case args.size
-    when 1, 4
-      if args[0].is_a?(Rect)
-        x, y, width, height = *args[0].to_a
-      else
-        x, y, width, height = *args
-      end
-    else
-      raise ArgumentError
-    end
-    f = Magick::Image.new(width, height) { self.background_color = 'none' }
-    @gosu_image.insert(f, x, y)
-    set_dirty
+    fill_rect(*args, Color.new)
   end
 
   def get_pixel(x, y)
@@ -139,7 +127,6 @@ class Bitmap
     fill_rect(x, y, 1, 1, color)
   end
 
-  # Untested
   def hue_change(hue)
     image = rmagick_image
     Bitmap.pixel_map!(rmagick_image) do |pixel|
@@ -151,7 +138,6 @@ class Bitmap
   end
 
   def blur
-    # self.rmagick_image = rmagick_image.blur_image
   end
 
   def radial_blur(angle, division)
@@ -180,7 +166,7 @@ class Bitmap
     end
     text_image = Gosu::Image.from_text(string, @font.size, font: @font.first_existant_name)
     x += (width - text_image.width) * (align || 0) / 2
-    y += (height - text_image.height)  / 2
+    y += (height - text_image.height) / 2
     text_image = Bitmap.gosu_to_rmagick(text_image)
     image = text_image.dup
     font_pixel = @font.color.to_pixel
@@ -214,12 +200,10 @@ class Bitmap
   end
 
   def text_size(string)
-    f = Gosu::Font.new(@font.size, font: @font.first_existant_name)
-    Rect.new(0, 0, f.text_width(string.to_s, f.height))
+    f = Gosu::Font.new(@font.size, name: @font.first_existant_name)
+    Rect.new(0, 0, f.text_width(string.to_s), f.height)
   end
 
-  # NEW
-
   def self.from_gosu(img)
     bitmap = allocate
     bitmap.initialize_with_gosu_image(img)
@@ -228,7 +212,7 @@ class Bitmap
 
   def self.from_rmagick(img)
     bitmap = allocate
-    bitmap.rmagick_image = img
+    bitmap.initialize_with_rmagick_image(img)
     bitmap
   end
 
@@ -253,6 +237,7 @@ class Bitmap
   # If you want to change it, call set_dirty or bitmap.rmagick_image = image
   # after the change.
   def rmagick_image
+    check_disposed
     if @dirty
       @dirty = false
       @rmagick_image = Bitmap.gosu_to_rmagick(@gosu_image)
@@ -261,26 +246,24 @@ class Bitmap
     end
   end
 
-  def change_image
-    @dirty = true
-  end
-
-  def check_disposed
-    raise RGSSError, "Disposed Bitmap" if @disposed
-  end
-
-  def dispose!
-    @gosu_image = nil
-    @rmagick_image = nil
-    @disposed = true
-  end
-
   def rmagick_image=(image)
+    check_disposed
     @rmagick_image = image
     @gosu_image = Gosu::Image.new(@rmagick_image)
   end
 
+  def gosu_image
+    check_disposed
+    @gosu_image
+  end
+
   def set_dirty
     @dirty = true
   end
+
+  private
+
+  def check_disposed
+    raise RGSSError, "Disposed Bitmap" if @disposed
+  end
 end

data/lib/rgss3/game_window.rb

@@ -2,7 +2,7 @@
 require 'fiber'
 module RGSS3
   class GameWindow < Gosu::Window
-    attr_reader :frame_rate
+    attr_reader :frame_rate, :title
     def initialize(width: 544, height: 416, full_screen: false, frame_rate: 60, title: "Game", rtp: nil)
       @frame_rate = frame_rate
       RTP.path = rtp if rtp
@@ -20,5 +20,9 @@ module RGSS3
     def draw
       Graphics.draw
     end
+
+    def needs_redraw?
+      Graphics.needs_redraw
+    end
   end
 end

data/lib/rgss3/graphics.rb

@@ -7,6 +7,7 @@ module Graphics
     attr_accessor :frame_count
     attr_reader :gosu_window
     attr_reader :brightness, :frame_rate
+    attr_reader :needs_redraw
 
     def gosu_window
       RGSS3.window
@@ -31,17 +32,20 @@ module Graphics
   @frame_count = 0
   @frozen = false
   @draw_color = Gosu::Color.rgba(255, 255, 255, 0)
-  # @draw_color.saturation = 0
-  # @draw_color.alpha = 0
   @containers = Set.new
 
   def self.update
-    window = RGSS3.window
-    @current = window.record(window.width, window.height) do
-      @containers.each(&:draw)
-    end
+    # window = RGSS3.window
+    # @current = window.record(window.width, window.height) do
+    #   @containers.each(&:draw)
+    # end
     @frame_count += 1
-    @latest = @current unless @frozen
+
+    unless @frozen
+      @needs_redraw = true
+      # @latest = @current
+    end
+
     Fiber.yield
   end
 
@@ -50,6 +54,7 @@ module Graphics
   end
 
   def self.fadeout(duration)
+    @brightness = 0
     # Thread.new {
     #   rate = @brightness / duration.to_f
     #   until @brightness <= 0
@@ -61,6 +66,7 @@ module Graphics
   end
 
   def self.fadein(duration)
+    @brightness = 255
     # Thread.new {
     #   rate = 255 / duration.to_f
     #   until @brightness >= 255
@@ -77,15 +83,15 @@ module Graphics
 
   def self.transition(duration = 10, filename = "", vague = 40)
     @frozen = false
-    # VAGUE ELUDES ME AS TO HOW TO INTEGRATE
+    @brightness = 255
   end
 
   def self.snap_to_bitmap
-    Bitmap.from_gosu(@current)
+    Bitmap.new(width, height)
   end
 
   def self.frame_reset
-    # AT A LOSS ON HOW TO INTEGRATE
+    Fiber.yield
   end
 
   def self.width
@@ -97,11 +103,10 @@ module Graphics
   end
 
   def self.resize_screen(w, h)
-    reform_window(w, h, fullscreen?, RGSS3.update_interval)
+    reform_window(w, h, RGSS3.window.fullscreen?, RGSS3.update_interval)
   end
 
   def self.play_movie(filename)
-    # LIKELY TO REMAIN UNINTEGRATED
   end
 
   def self.add_container(container)
@@ -112,13 +117,10 @@ module Graphics
     @containers.delete(container)
   end
 
-  def self.fullscreen?
-    RGSS3.window.fullscreen?
-  end
-
   def self.draw
-    if @latest
-      @latest.draw(0, 0, 0)
+    @needs_redraw = false
+    @containers.each(&:draw)
+    if @brightness < 255
       c = @draw_color
       RGSS3.window.draw_quad(0, 0, c, 0, height, c, width, 0, c, width, height, c, 1)
     end
@@ -130,8 +132,8 @@ module Graphics
   # end
 
   def self.reform_window(w, h, f, update_interval)
-    # Graphics.gosu_window.close
-    # Graphics.gosu_window = GosuGame.new(w, h, f, update_interval)
-    # Graphics.gosu_window.show
+    Graphics.gosu_window.close
+    Graphics.gosu_window = GosuGame.new(w, h, f, update_interval)
+    Graphics.gosu_window.show
   end
 end

data/lib/rgss3/input.rb

@@ -153,7 +153,8 @@ module Input
         dir
       end
     end
-    return dir8, dir8 if [2, 4, 5, 6, 8].include?(dir8)
+    return 0, 0 if dir8 == 5
+    return dir8, dir8 if [2, 4, 6, 8].include?(dir8)
     return dir4, dir8
   end
 end

data/lib/rgss3/plane.rb

@@ -3,7 +3,7 @@ require_relative 'sprite_container'
 class Plane
   include RGSS3::SpriteContainer
   def draw
-    return if !@visible || @opacity == 0 || @bitmap == nil
+    return if !@visible || @opacity == 0 || @bitmap.nil? && @bitmap.disposed?
     @bitmap.gosu_image.draw(-@ox, -@oy, @z, 1, 1, 0xff_ffffff, BLEND[@blend_type])
   end
 end

data/lib/rgss3/sprite.rb

@@ -24,13 +24,9 @@ class Sprite
   end
 
   def flash(color, duration)
-    @flash_color = color || Color.new(0, 0, 0, 0)
-    @duration = duration
   end
 
   def update
-    @duration = [@duration - 1, 0].max
-    @flash_color = nil if @duration == 0
   end
 
   def width
@@ -51,7 +47,8 @@ class Sprite
   end
 
   def draw
-    return if !@visible || @opacity == 0 || @bitmap == nil
-    @bitmap.gosu_image.draw_rot(@x, @y, @z, @angle, ox.fdiv(width), oy.fdiv(height), @zoom_x * (@mirror ? -1 : 1), @zoom_y, 0xffffffff, BLEND[@blend_type])
+    return if !@visible || @opacity == 0 || @bitmap.nil? || @bitmap.disposed?
+    image = @bitmap.gosu_image.subimage(*@src_rect) || @bitmap.gosu_image
+    image.draw_rot(@x, @y, @z, @angle, ox.fdiv(width), oy.fdiv(height), @zoom_x * (@mirror ? -1 : 1), @zoom_y, 0xffffffff, BLEND[@blend_type])
   end
 end

data/lib/rgss3/sprite_container.rb

@@ -18,5 +18,10 @@ module RGSS3
       @color = Color.new
       super()
     end
+
+    def dispose
+      @bitmap = nil
+      super
+    end
   end
 end

data/lib/rgss3/tilemap.rb

@@ -30,6 +30,31 @@ class Tilemap
     @layers[2].viewport = @viewport
   end
 
+  def map_data=(data)
+    return if @map_data == data
+    @map_data = data
+    refresh
+  end
+
+  def flags=(data)
+    @flags = data
+    refresh
+  end
+
+  def ox=(value)
+    @ox = value
+    for layer in @layers
+      layer.ox = @ox
+    end
+  end
+
+  def oy=(value)
+    @oy = value
+    for layer in @layers
+      layer.oy = @oy
+    end
+  end
+
   def dispose
     for layer in @layers
       layer.bitmap.dispose
@@ -50,6 +75,8 @@ class Tilemap
     @layers[0].bitmap = @animated_layer[@anim_count/30]
   end
 
+  private
+
   def refresh
     return if @map_data.nil? || @flags.nil?
     for layer in @layers
@@ -283,29 +310,4 @@ class Tilemap
       end
     end
   end
-
-  def map_data=(data)
-    return if @map_data == data
-    @map_data = data
-    refresh
-  end
-
-  def flags=(data)
-    @flags = data
-    refresh
-  end
-
-  def ox=(value)
-    @ox = value
-    for layer in @layers
-      layer.ox = @ox
-    end
-  end
-
-  def oy=(value)
-    @oy = value
-    for layer in @layers
-      layer.oy = @oy
-    end
-  end
 end

data/lib/rgss3/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module RGSS3
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/rgss3/viewport.rb

@@ -22,6 +22,8 @@ class Viewport
     @z = 0
     @ox = 0
     @oy = 0
+    @color = Color.new
+    @tone = Tone.new
   end
 
   def dispose
@@ -33,12 +35,12 @@ class Viewport
   end
 
   def flash(color, duration)
-    @flash_color = color || Color.new(0, 0, 0, 0)
-    @flash_duration = duration
+    # @flash_color = color || Color.new(0, 0, 0, 0)
+    # @flash_duration = duration
   end
 
   def update
-    @flash_duration = [@flash_duration - 1, 0].max
-    @flash_color = nil if @flash_duration == 0
+    # @flash_duration = [@flash_duration - 1, 0].max
+    # @flash_color = nil if @flash_duration == 0
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgss3
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - taroxd