rgss3 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 823503b6d2d5eda418635f118dff31c22a704ec0
-  data.tar.gz: cbb6b1f25914822ee084ca80ae2e808fa93ec97e
+  metadata.gz: 270c6dc805cba951ea8ba997927604c1f3750677
+  data.tar.gz: 94c70bf2f2f7cc6006fe1190d73ea5410826065f
 SHA512:
-  metadata.gz: 5562562ffd51b8634689611588b551b76aea4c6a374f1a047facc666a5996a6368c2591571d7202408f98b10b533e7ecbb9bcb0c8775725eb522b9c110379af9
-  data.tar.gz: e2d0b5925f05edac8c30c542cd019ff8d1ccb0151c93957b5549495c2e8b5cb1c86e2e6551ad41ba93af4bb2984f5f644d212b1219456021e37379903a14b6df
+  metadata.gz: a15e21a2a1916cfa00d67b72a6b21c69103d2d927519e5bbd9dc5389891860a26cb614cd177dd875ebe74dcd73aaf52d2fbe95213b3df838b90c593b7d45e461
+  data.tar.gz: 34b9e551db4ff2a53f01b19afeed541648fc3b2e8f7f56363adf449a911bfda20fb7419b561b2bdf2822452b4c02412403dc099fed84d8915d3d3f9f774c811f

data/README.md

@@ -30,8 +30,7 @@ end
 Or with more options:
 ```ruby
 require 'rgss3'
-RGSS3::RTP.path = 'path/to/RTP'
-RGSS3.run(width: 544, height: 416, frame_rate: 60, title: 'Game', rtp: 'path/to/rtp') do
+RGSS3.run(width: 544, height: 416, frame_rate: 60, fullscreen: false, title: 'Game', rtp: 'path/to/rtp') do
   # TODO: Add your code here
   # loop { Graphics.update }
 end

data/lib/rgss3/bitmap.rb

@@ -52,17 +52,33 @@ class Bitmap
   end
 
   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)
+    return if opacity == 0
+    src = src_bitmap.gosu_image.subimage(*src_rect)
+    if opacity != 255
+      src = Bitmap.gosu_to_rmagick(src)
+      ratio = opacity / 255.0
+      Bitmap.pixel_map!(src) do |pixel|
+        pixel.opacity *= ratio
+        pixel
+      end
+    end
+    gosu_image.insert(src, x, y)
     set_dirty
   end
 
   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)
+    return if opacity == 0
+    src = src_bitmap.gosu_image.subimage(*src_rect)
+    src = Bitmap.gosu_to_rmagick(gosu_to_rmagick)
+    src.resize!(dest_rect.width, dest_rect.height)
+    if opacity != 255
+      ratio = opacity / 255.0
+      Bitmap.pixel_map!(src) do |pixel|
+        pixel.opacity *= ratio
+        pixel
+      end
+    end
+    gosu_image.insert(src, dest_rect.x, dest_rect.y)
     set_dirty
   end
 
@@ -112,7 +128,7 @@ class Bitmap
   end
 
   def clear
-    self.rmagick_image = Magick::Image.new(width, height)
+    self.rmagick_image = Magick::Image.new(width, height) { self.background_color = 'none' }
   end
 
   def clear_rect(*args)

data/lib/rgss3/container.rb

@@ -1,20 +1,29 @@
 # frozen_string_literal: true
 module RGSS3
-  # common methods for Plane, Sprite and Window
+  # common methods for Plane, Sprite
   module Container
 
-    attr_reader :opacity
     attr_accessor :z, :ox, :oy
     attr_accessor :viewport, :visible
     attr_accessor :tone
+    attr_accessor :zoom_x, :zoom_y
+    attr_accessor :bitmap
+    attr_accessor :color, :blend_type
+    attr_reader :opacity
 
-    def initialize
+    BLEND = {0 => :default, 1 => :additive, 2 => :subtractive}
+
+    def initialize(viewport = nil)
       @visible = true
       @z = 0
       @ox = 0
       @oy = 0
-      @opacity = 255
       @tone = Tone.new
+      @viewport = viewport
+      @zoom_x = @zoom_y = 1.0
+      @blend_type = 0
+      @color = Color.new
+      @opacity = 255
       Graphics.add_container(self)
     end
 
@@ -26,6 +35,7 @@ module RGSS3
 
     def dispose
       @disposed = true
+      @bitmap = nil
       Graphics.remove_container(self)
     end
 
@@ -33,11 +43,18 @@ module RGSS3
       @disposed
     end
 
-    def opacity=(int)
-      @opacity = [[int, 255].min, 0].max
+    def opacity=(value)
+      @opacity = [[value, 0].max, 255].min
     end
 
+    # overwrite
     def draw
     end
+
+    # this method is used internally by Graphics
+    def do_draw
+      return if !@visible || @opacity == 0 || @bitmap.nil? || @bitmap.disposed?
+      draw
+    end
   end
 end

data/lib/rgss3/game_window.rb

@@ -2,11 +2,11 @@
 require 'fiber'
 module RGSS3
   class GameWindow < Gosu::Window
-    attr_reader :frame_rate, :title
-    def initialize(width: 544, height: 416, full_screen: false, frame_rate: 60, title: "Game", rtp: nil)
+    attr_reader :frame_rate
+    def initialize(width: 544, height: 416, fullscreen: false, frame_rate: 60, title: "Game", rtp: nil)
       @frame_rate = frame_rate
       RTP.path = rtp if rtp
-      super(width, height, full_screen, 1000.0 / frame_rate)
+      super(width, height, fullscreen, 1000.0 / frame_rate)
       self.caption = title
     end
 

data/lib/rgss3/graphics.rb

@@ -1,139 +1,130 @@
-# frozen_string_literal: true
-require 'set'
-module Graphics
-
-  class << self
-
-    attr_accessor :frame_count
-    attr_reader :gosu_window
-    attr_reader :brightness, :frame_rate
-    attr_reader :needs_redraw
-
-    def gosu_window
-      RGSS3.window
-    end
-
-    def frame_rate
-      RGSS3.window.frame_rate
-    end
-
-    def brightness=(int)
-      @brightness = [[255, int].min, 0].max
-      @draw_color.alpha = 255 - @brightness
-    end
-
-    def frame_rate=(int)
-      # @frame_rate = [[120, int].min, 10].max
-      #reform_window(width, height, fullscreen?, 1.0 / @frame_rate * 1000)
-    end
-  end
-
-  @brightness = 255
-  @frame_count = 0
-  @frozen = false
-  @draw_color = Gosu::Color.rgba(255, 255, 255, 0)
-  @containers = Set.new
-
-  def self.update
-    # window = RGSS3.window
-    # @current = window.record(window.width, window.height) do
-    #   @containers.each(&:draw)
-    # end
-    @frame_count += 1
-
-    unless @frozen
-      @needs_redraw = true
-      # @latest = @current
-    end
-
-    Fiber.yield
-  end
-
-  def self.wait(duration)
-    duration.times { update }
-  end
-
-  def self.fadeout(duration)
-    @brightness = 0
-    # Thread.new {
-    #   rate = @brightness / duration.to_f
-    #   until @brightness <= 0
-    #     self.brightness -= rate
-    #     sleep 1.0 / frame_rate
-    #   end
-    #   self.brightness = 0
-    # }
-  end
-
-  def self.fadein(duration)
-    @brightness = 255
-    # Thread.new {
-    #   rate = 255 / duration.to_f
-    #   until @brightness >= 255
-    #     self.brightness += rate
-    #     sleep 1.0 / frame_rate
-    #   end
-    #   self.brightness = 255
-    # }
-  end
-
-  def self.freeze
-    @frozen = true
-  end
-
-  def self.transition(duration = 10, filename = "", vague = 40)
-    @frozen = false
-    @brightness = 255
-  end
-
-  def self.snap_to_bitmap
-    Bitmap.new(width, height)
-  end
-
-  def self.frame_reset
-    Fiber.yield
-  end
-
-  def self.width
-    RGSS3.window.width
-  end
-
-  def self.height
-    RGSS3.window.height
-  end
-
-  def self.resize_screen(w, h)
-    reform_window(w, h, RGSS3.window.fullscreen?, RGSS3.update_interval)
-  end
-
-  def self.play_movie(filename)
-  end
-
-  def self.add_container(container)
-    @containers.add(container)
-  end
-
-  def self.remove_container(container)
-    @containers.delete(container)
-  end
-
-  def self.draw
-    @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
-  end
-
-  # def self.set_fullscreen(bool)
-  #   return if bool == fullscreen?
-  #   reform_window(width, height, bool, gosu_window.update_interval)
-  # 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
-  end
-end
+# frozen_string_literal: true
+require 'set'
+module Graphics
+
+  class << self
+    attr_accessor :frame_count
+    attr_reader :brightness, :frame_rate
+    attr_reader :needs_redraw
+  end
+
+  @brightness = 255
+  @frame_count = 0
+  @frozen = false
+  @draw_color = Gosu::Color.rgba(0, 0, 0, 0)
+  @containers = Set.new
+
+  def self.update
+    @needs_redraw = true unless @frozen
+    @frame_count += 1
+    Fiber.yield
+  end
+
+  def self.wait(duration)
+    @needs_redraw = true unless @frozen
+    # no need to redraw during wait
+    duration.times do
+      @frame_count += 1
+      Fiber.yield
+    end
+  end
+
+  def self.fadeout(duration)
+    @brightness = 0
+  end
+
+  def self.fadein(duration)
+    @brightness = 255
+  end
+
+  def self.freeze
+    @frozen = true
+  end
+
+  def self.transition(duration = 10, filename = "", vague = 40)
+    @frozen = false
+    @brightness = 255
+  end
+
+  def self.snap_to_bitmap
+    Bitmap.new(width, height)
+  end
+
+  def self.frame_reset
+    Fiber.yield
+  end
+
+  def self.width
+    RGSS3.window.width
+  end
+
+  def self.height
+    RGSS3.window.height
+  end
+
+  def self.resize_screen(width, height)
+    reform_window(width: width, height: height)
+  end
+
+  def self.gosu_window
+    RGSS3.window
+  end
+
+  def self.frame_rate
+    RGSS3.window.frame_rate
+  end
+
+  def self.brightness=(value)
+    @brightness = [[255, value].min, 0].max
+    @draw_color.alpha = 255 - @brightness
+  end
+
+  def self.frame_rate=(value)
+    @frame_rate = [[120, value].min, 10].max
+    reform_window(
+      width: width,
+      height: height,
+      fullscreen: RGSS3.window.fullscreen?,
+      frame_rate: @frame_rate,
+      title: RGSS3.window.caption)
+  end
+
+  def self.play_movie(filename)
+  end
+
+  def self.add_container(container)
+    @containers.add(container)
+  end
+
+  def self.remove_container(container)
+    @containers.delete(container)
+  end
+
+  def self.draw
+    @needs_redraw = false
+    @containers.each(&:do_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
+  end
+
+  def self.reform_window(
+    width: RGSS3.window.width,
+    height: RGSS3.window.height,
+    full_screen: RGSS3.window.fullscreen?,
+    frame_rate: @frame_rate,
+    title: RGSS3.window.caption,
+    rtp: nil)
+
+    RGSS3.window.close
+    RGSS3.window = RGSS3::GameWindow.new(
+      width: width,
+      height: height,
+      fullscreen: fullscreen,
+      frame_rate: frame_rate,
+      title: title,
+      rtp: rtp)
+    RGSS3.window.show
+  end
+end

data/lib/rgss3/kernel_ext.rb

@@ -10,7 +10,8 @@ module ::Kernel
   end
 
   def rgss_stop
-    loop { Graphics.update }
+    Graphics.update
+    loop { Fiber.yield }
   end
 
   def load_data(filename)

data/lib/rgss3/plane.rb

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

data/lib/rgss3/sprite.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require_relative 'sprite_container'
+require_relative 'container'
 class Sprite
 
-  include RGSS3::SpriteContainer
+  include RGSS3::Container
 
   attr_reader :bush_opacity
   attr_accessor :x, :y
@@ -19,8 +19,8 @@ class Sprite
     @bush_depth = 0
     @bush_opacity = 128
     @wave_speed = 360
-    @src_rect = Rect.new(0, 0, 0, 0)
-    super()
+    @src_rect = Rect.new
+    super
   end
 
   def flash(color, duration)
@@ -47,8 +47,33 @@ class Sprite
   end
 
   def draw
-    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])
+    if viewport
+      x = @x + viewport.rect.x
+      y = @y + viewport.rect.y
+      w = [width - viewport.ox, viewport.rect.x + viewport.rect.width - x].min
+      h = [height - viewport.oy, viewport.rect.y + viewport.rect.height - y].min
+      return if w <= 0 || h <= 0
+      z = @z + (viewport.z << 12)
+      src_x = @src_rect.x + viewport.ox
+      src_y = @src_rect.y + viewport.oy
+    else
+      x = @x
+      y = @y
+      z = @z
+      src_x, src_y, w, h = *@src_rect
+    end
+    image = bitmap.gosu_image.subimage(src_x, src_y, w, h)
+    return unless image
+    image.draw_rot(
+      x,
+      y,
+      z,
+      @angle,
+      ox.fdiv(width),
+      oy.fdiv(height),
+      @zoom_x * (@mirror ? -1 : 1),
+      @zoom_y,
+      0xff_ffffff,
+      BLEND[@blend_type])
   end
 end

data/lib/rgss3/version.rb

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

data/lib/rgss3/viewport.rb

@@ -1,46 +1,46 @@
-# frozen_string_literal: true
-class Viewport
-
-  attr_accessor :color, :tone, :rect, :visible, :z, :ox, :oy
-
-  def initialize(*args)
-    case args.size
-    when 0
-      @rect = Rect.new(0, 0, Graphics.width, Graphics.height)
-    when 1
-      if args[0].is_a?(Rect)
-        @rect = args[0]
-      else
-        raise ArgumentError
-      end
-    when 4
-      @rect = Rect.new(*args)
-    else
-      raise ArgumentError
-    end
-    @visible = true
-    @z = 0
-    @ox = 0
-    @oy = 0
-    @color = Color.new
-    @tone = Tone.new
-  end
-
-  def dispose
-    @disposed = true
-  end
-
-  def disposed?
-    @disposed
-  end
-
-  def flash(color, 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
-  end
-end
+# frozen_string_literal: true
+class Viewport
+
+  attr_accessor :color, :tone, :rect, :visible, :z, :ox, :oy
+
+  def initialize(*args)
+    case args.size
+    when 0
+      @rect = Rect.new(0, 0, Graphics.width, Graphics.height)
+    when 1
+      if args[0].is_a?(Rect)
+        @rect = args[0]
+      else
+        raise ArgumentError
+      end
+    when 4
+      @rect = Rect.new(*args)
+    else
+      raise ArgumentError
+    end
+    @visible = true
+    @z = 0
+    @ox = 0
+    @oy = 0
+    @color = Color.new
+    @tone = Tone.new
+  end
+
+  def dispose
+    @disposed = true
+  end
+
+  def disposed?
+    @disposed
+  end
+
+  def flash(color, 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
+  end
+end

data/lib/rgss3/window.rb

@@ -1,58 +1,71 @@
 # frozen_string_literal: true
-require_relative 'container'
 class Window
 
-  include RGSS3::Container
-
+  attr_reader :z, :ox, :oy
+  attr_reader :viewport
+  attr_accessor :visible
+  attr_accessor :tone
   attr_accessor :windowskin
-  attr_accessor :contents
+  attr_reader :contents
   attr_accessor :cursor_rect
   attr_accessor :active
-  attr_accessor :visible
+  attr_reader :visible
   attr_accessor :arrows_visible
   attr_accessor :pause
-  attr_accessor :x
-  attr_accessor :y
+  attr_reader :x
+  attr_reader :y
   attr_accessor :width
   attr_accessor :height
-  attr_accessor :padding
+  attr_reader :padding
   attr_accessor :padding_bottom
-  attr_accessor :opacity
-  attr_accessor :back_opacity
-  attr_accessor :contents_opacity
+  attr_reader :back_opacity
+  attr_reader :contents_opacity
   attr_reader :openness
+  attr_reader :opacity
 
   def initialize(*args)
-    case args.size
-    when 0
-      @x = 0
-      @y = 0
-      @width = 0
-      @height = 0
-    when 4
-      @x, @y, @width, @height = args
-    end
-    @contents = Bitmap.new(1, 1)
+    @contents_sprite = Sprite.new
+    self.contents = Bitmap.new(1, 1)
+    @opacity = 255
     @cursor_rect = Rect.new
-    @padding = 12
+    @padding = 8
     @padding_bottom = 8
     @pause = false
     @arrows_visible = true
     @active = true
     @openness = 255
-    super()
+    @visible = true
+    @z = 100
+    @ox = 0
+    @oy = 0
+    @tone = Tone.new
+    @back_opacity = 192
+    @contents_opacity = 255
+    case args.size
+    when 0
+      self.x = 0
+      self.y = 0
+      @width = 0
+      @height = 0
+    when 4
+      self.x, self.y, @width, @height = args
+    end
   end
 
   def update
   end
 
   def move(x, y, width, height)
-    @x = x
-    @y = y
+    self.x = x
+    self.y = y
     @width = width
     @height = height
   end
 
+  def padding=(value)
+    @padding = @padding_bottom = value
+  end
+
   def open?
     @openness == 255
   end
@@ -63,9 +76,79 @@ class Window
 
   def openness=(value)
     @openness = [[value, 0].max, 255].min
+    update_contents_opacity
+  end
+
+  def opacity=(value)
+    @opacity = [[value, 0].max, 255].min
+    update_contents_opacity
+  end
+
+  def x=(value)
+    @contents_sprite.x = @padding + value
+    @x = value
+  end
+
+  def y=(value)
+    @contents_sprite.y = @padding + value
+    @y = value
+  end
+
+  def z=(value)
+    each_internal_sprite { |s| s.z = value }
+    @z = value
+  end
+
+  def ox=(value)
+    each_internal_sprite { |s| s.ox = value }
+    @ox = value
+  end
+
+  def oy=(value)
+    each_internal_sprite { |s| s.oy = value }
+    @oy = value
+  end
+
+  def visible=(value)
+    each_internal_sprite { |s| s.visible = value }
+    @visible = value
+  end
+
+  def back_opacity=(value)
+    @back_opacity = [[value, 0].max, 255].min
+  end
+
+  def contents_opacity=(value)
+    @contents_opacity = [[value, 0].max, 255].min
+    update_contents_opacity
+  end
+
+  def viewport=(value)
+    each_internal_sprite { |s| s.viewport = value }
+    @viewport = value
+  end
+
+  def contents=(value)
+    @contents = value
+    @contents_sprite.bitmap = value
+  end
+
+  def dispose
+    each_internal_sprite(&:dispose)
+    @disposed = true
+  end
+
+  def disposed?
+    @disposed
+  end
+
+  private
+
+  def update_contents_opacity
+    @contents_sprite.opacity = @contents_opacity * @opacity * @openness / 255 / 255
   end
 
-  def draw
-    # TODO
+  def each_internal_sprite
+    yield @contents_sprite
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgss3
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - taroxd
@@ -98,7 +98,6 @@ files:
 - lib/rgss3/rpg.rb
 - lib/rgss3/rtp.rb
 - lib/rgss3/sprite.rb
-- lib/rgss3/sprite_container.rb
 - lib/rgss3/table.rb
 - lib/rgss3/tilemap.rb
 - lib/rgss3/tone.rb

data/lib/rgss3/sprite_container.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-require_relative 'container'
-module RGSS3
-  # common methods for Plane and Sprite
-  module SpriteContainer
-    include Container
-
-    attr_accessor :zoom_x, :zoom_y
-    attr_accessor :bitmap
-    attr_accessor :color, :blend_type
-
-    BLEND = {0 => :default, 1 => :additive, 2 => :subtractive}
-
-    def initialize(viewport = nil)
-      @viewport = viewport
-      @zoom_x = @zoom_y = 1.0
-      @blend_type = 0
-      @color = Color.new
-      super()
-    end
-
-    def dispose
-      @bitmap = nil
-      super
-    end
-  end
-end