rubysketch 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82768eceed1efd9384a83322023dbd5dd3a148db4a46c6eb5aa627c776b9cf38
-  data.tar.gz: 2543637edcea6cbe651f87ed1dd8a740b5aee4847598de20548ad63678223045
+  metadata.gz: 924752d99e2aeba786ac6269ebec2ae9759d029c13a04c1b30567ce79a99f140
+  data.tar.gz: a426c0727fdd728f430e78d1d8862f7fd7bd787c40a17071aaa1dfbe45860930
 SHA512:
-  metadata.gz: c63d1771c0187955073df25e80ea3d6dca4bcc57f9e11d0a3cd311a457336682439683b89594d8a22a0f258eaa01e022783f0d7504e4644f2be2b739828442a0
-  data.tar.gz: 8e188f9d1ed8ca7194c17966072d77899ad8beca28d18f74ff21409c396877362fc0bcf7b47b16eec51f70f18fdd46e6d77e84bcd08f61ac5d0ae8b594382724
+  metadata.gz: e5031af2da7f7087e6061041d8df30edc8b90b0329d2d05c9c79cf17dfa0bb0245a5f265fa2426870dfd438cadbef3d95427f6609d0bb4cc7bba43bdcdeaf549
+  data.tar.gz: 6776237d4b24ca6b4fb90110af2e6d90f30d4232a98e57186b23b90edf27f1ccd459b9a4b015845139d599eea2e38758f4a966e2030ef40c816f158fc41bcd68

data/ChangeLog.md

@@ -1,6 +1,21 @@
 # rubysketch ChangeLog
 
 
+## [v0.7.7] - 2025-03-07
+
+- [BREAKING] Change addSprite() and removeSprite() to take only 1 sprite, and can take 'array' parameter for managing user array for sprites
+
+- Add keyPressed, keyReleased, keyTyped, key, keyCode, keyIsPressed, keyIsDown, and keyIsRepeated to Sprite class.
+- Add docs for keyPressed, keyReleased, and keyTyped of Sprite class
+- Add capture=() and capturing?() methods to Sprite class
+- Add SpriteWorld#offset and SpriteWorld#zoom
+
+- Move 'sprite' method from RubySketch::Context to RubySketch::GraphicsContext
+- createSprite can take 'klass' parameter
+
+- Fix the issue where Sprite#contactEnd is not working
+
+
 ## [v0.7.6] - 2025-01-30
 
 - Update dependencies: processing

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     power_assert (2.0.3)
     rake (13.1.0)
-    rexml (3.4.0)
+    rexml (3.4.1)
     test-unit (3.6.1)
       power_assert
     yard (0.9.34)

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.7.7

data/lib/rubysketch/all.rb

@@ -17,4 +17,5 @@ require 'rubysketch/sprite'
 require 'rubysketch/shape'
 require 'rubysketch/sound'
 require 'rubysketch/easings'
+require 'rubysketch/graphics_context'
 require 'rubysketch/context'

data/lib/rubysketch/context.rb

@@ -3,6 +3,8 @@ module RubySketch
 
   class Context < Processing::Context
 
+    include GraphicsContext
+
     Sprite      = RubySketch::Sprite
     SpriteWorld = RubySketch::SpriteWorld
     Circle      = RubySketch::Circle
@@ -196,57 +198,26 @@ module RubySketch
       @world__.createSprite(*args, context: self, **kwargs)
     end
 
-    # Adds sprites to the physics engine.
+    # Adds sprite to the physics engine.
     #
-    # @param [Sprite] sprites sprite objects
+    # @param [Array]  array user array to store the sprite
+    # @param [Sprite] sprite sprite object
     #
-    # @return [Sprite] first added sprite
+    # @return [Sprite] the added sprite
     #
-    def addSprite(*sprites)
-      @world__.addSprite(*sprites)
+    def addSprite(array = nil, sprite)
+      @world__.addSprite array, sprite
     end
 
-    # Removes sprites from the physics engine.
-    #
-    # @param [Sprite] sprites sprite objects
-    #
-    # @return [Sprite] first removed sprite
+    # Removes sprite from the physics engine.
     #
-    def removeSprite(*sprites)
-      @world__.removeSprite(*sprites)
-    end
-
-    # Draws one or more sprites.
+    # @param [Array]  array user array to remove the sprite
+    # @param [Sprite] sprite sprite object
     #
-    # @param [Array<Sprite>] sprites
+    # @return [Sprite] the removed sprite
     #
-    # @return [nil] nil
-    #
-    def sprite(*sprites)
-      sprites.flatten! if sprites.first&.is_a? Array
-      sprites.each do |sp|
-        next if sp.hidden?
-        view, draw = sp.getInternal__, sp.instance_variable_get(:@drawBlock__)
-        f, degrees, pivot = view.frame, view.angle, view.pivot
-        if draw
-          push do
-            translate f.x + pivot.x  * f.w, f.y + pivot.y  * f.h
-            rotate fromDegrees__ degrees
-            translate     (-pivot.x) * f.w,     (-pivot.y) * f.h
-            draw.call {sp.draw__ self, 0, 0, f.w, f.h}
-          end
-        elsif degrees == 0
-          sp.draw__ self, f.x, f.y, f.w, f.h
-        else
-          pushMatrix do
-            translate f.x + pivot.x  * f.w, f.y + pivot.y  * f.h
-            rotate fromDegrees__ degrees
-            translate     (-pivot.x) * f.w,     (-pivot.y) * f.h
-            sp.draw__ self, 0, 0, f.w, f.h
-          end
-        end
-      end
-      nil
+    def removeSprite(array = nil, sprite)
+      @world__.removeSprite array, sprite
     end
 
     alias drawSprite sprite
@@ -255,8 +226,8 @@ module RubySketch
     #
     # @return [SpriteWorld] the new world object
     #
-    def createWorld(pixels_per_meter: 0)
-      addWorld SpriteWorld.new pixels_per_meter: pixels_per_meter
+    def createWorld(pixelsPerMeter: 0)
+      addWorld SpriteWorld.new pixelsPerMeter: pixelsPerMeter
     end
 
     # Adds worlds

data/lib/rubysketch/graphics_context.rb

@@ -0,0 +1,21 @@
+module RubySketch
+
+
+  module GraphicsContext
+
+    # Draws one or more sprites.
+    #
+    # @param [Array<Sprite>] sprites
+    #
+    # @return [nil] nil
+    #
+    def sprite(*sprites)
+      sprites.flatten! if sprites.first&.is_a? Array
+      sprites.each {_1.drawSprite__ self}
+      nil
+    end
+
+  end# GraphicsContext
+
+
+end# RubySketch

data/lib/rubysketch/shape.rb

@@ -41,7 +41,7 @@ module RubySketch
       @shape.sensor = state
     end
 
-    # Returns weather the shape is a sensor or not.
+    # Returns whether the shape is a sensor or not.
     #
     # @return [Boolean] sensor or not
     #

data/lib/rubysketch/sound.rb

@@ -33,6 +33,15 @@ module RubySketch
       nil
     end
 
+    # Returns whether or not playback is in progress.
+    #
+    # @return [Boolean] playing or not
+    #
+    def playing?()
+      clean_stopped_players
+      not @players.empty?
+    end
+
     # Load a sound file.
     #
     # @param [String] path file path

data/lib/rubysketch/sprite.rb

@@ -104,6 +104,25 @@ module RubySketch
       @view__.hidden?
     end
 
+    # Captures key and mouse events
+    #
+    # @param [Boolean] bool whether to capture
+    #
+    # @return [Boolean] the current state
+    #
+    def capture=(bool)
+      @view__.capture = bool ? :all : []
+      bool
+    end
+
+    # Returns whether to capture or not
+    #
+    # @return [Boolean] whether to capture
+    #
+    def capturing?()
+      @view__.capturing?
+    end
+
     # Returns the position of the sprite.
     #
     # @return [Vector] position
@@ -256,8 +275,8 @@ module RubySketch
     #
     # @return [Numeric] sprite bottom position
     #
-    def bottom=(bottom)
-      @view__.bottom = bottom
+    def bottom=(n)
+      @view__.bottom = n
     end
 
     # Returns the center position of the sprite.
@@ -347,8 +366,7 @@ module RubySketch
     # @return [Numeric] radians or degrees depending on angleMode()
     #
     def angle()
-      a, c = @view__.angle, @context__
-      c ? c.fromDegrees__(a) : a * Processing::GraphicsContext::DEG2RAD__
+      @context__.fromDegrees__ @view__.angle
     end
 
     # Sets the rotation angle of the sprite.
@@ -358,9 +376,7 @@ module RubySketch
     # @return [Numeric] angle
     #
     def angle=(angle)
-      c = @context__
-      @view__.angle =
-        c ? c.toDegrees__(angle) : angle * Processing::GraphicsContext::RAD2DEG__
+      @view__.angle = @context__.toDegrees__ angle
       angle
     end
 
@@ -394,7 +410,7 @@ module RubySketch
     # Sets the rotation center of the sprite.
     # [0.0, 0.0] is the left-top, [1.0, 1.0] is the right-bottom, and [0.5, 0.5] is the center.
     #
-    # @param [Array<Numeric>] ary an array of pivotX and pivotY
+    # @param [Array<Numeric>] array an array of pivotX and pivotY
     #
     # @return [Array<Numeric>] [pivotX, pivotY]
     #
@@ -498,7 +514,7 @@ module RubySketch
     # @overload offset=(vec)
     #  @param [Vector] vec offset
     #
-    # @overload velocity=(ary)
+    # @overload offset=(ary)
     #  @param [Array<Numeric>] ary an array of offsetX and offsetY
     #
     # @return [Vector] offset of the sprite image
@@ -511,7 +527,7 @@ module RubySketch
         when nil    then nil
         else raise ArgumentError
         end
-      @offset__
+      offset
     end
 
     # Returns the x-axis offset of the sprite image.
@@ -524,13 +540,13 @@ module RubySketch
 
     # Sets the x-axis offset of the sprite image.
     #
-    # @param [Numeric] n x-axis offset
+    # @param [Numeric] x x-axis offset
     #
     # @return [Numeric] offset.x
     #
-    def ox=(n)
-      self.offset = [n, oy]
-      n
+    def ox=(x)
+      self.offset = [x, oy]
+      x
     end
 
     # Returns the y-axis offset of the sprite image.
@@ -543,12 +559,13 @@ module RubySketch
 
     # Sets the y-axis offset of the sprite image.
     #
-    # @param [Numeric] n y-axis offset
+    # @param [Numeric] y y-axis offset
     #
     # @return [Numeric] offset.y
     #
-    def oy=(n)
-      self.offset = [ox, n]
+    def oy=(y)
+      self.offset = [ox, y]
+      y
     end
 
     # Returns whether the sprite is movable by the physics engine.
@@ -643,7 +660,7 @@ module RubySketch
       @view__.sensor = state
     end
 
-    # Returns weather the shape is a sensor or not.
+    # Returns whether the shape is a sensor or not.
     #
     # @return [Boolean] sensor or not
     #
@@ -671,6 +688,48 @@ module RubySketch
       @view__.to_parent(vec.getInternal__).toVector
     end
 
+    # Returns the last key that was pressed or released.
+    #
+    # @return [String] last key
+    #
+    def key()
+      @view__.key
+    end
+
+    # Returns the last key code that was pressed or released.
+    #
+    # @return [Symbol] last key code
+    #
+    def keyCode()
+      @view__.keyCode
+    end
+
+    # Returns whether or not any key is pressed.
+    #
+    # @return [Boolean] is any key pressed or not
+    #
+    def keyIsPressed()
+      not @view__.keysPressed.empty?
+    end
+
+    # Returns whether or not the key is currently pressed.
+    #
+    # @param keyCode [Numeric] code for the key
+    #
+    # @return [Boolean] is the key pressed or not
+    #
+    def keyIsDown(keyCode)
+      @view__.keysPressed.include? keyCode
+    end
+
+    # Returns whether the current key is repeated or not.
+    #
+    # @return [Boolean] is the key repeated or not
+    #
+    def keyIsRepeated()
+      @view__.keyRepeat
+    end
+
     # Returns the x-position of the mouse in the sprite coordinates.
     #
     # @return [Numeric] x position
@@ -757,6 +816,33 @@ module RubySketch
       nil
     end
 
+    # Defines keyPressed block.
+    #
+    # @return [Boolean] is any key pressed or not
+    #
+    def keyPressed(&block)
+      @view__.keyPressed = block if block
+      keyIsPressed
+    end
+
+    # Defines keyReleased block.
+    #
+    # @return [nil] nil
+    #
+    def keyReleased(&block)
+      @view__.keyReleased = block if block
+      nil
+    end
+
+    # Defines keyTyped block.
+    #
+    # @return [nil] nil
+    #
+    def keyTyped(&block)
+      @view__.keyTyped = block if block
+      nil
+    end
+
     # Defines mousePressed block.
     #
     # @example Print mouse states on mouse press
@@ -883,17 +969,17 @@ module RubySketch
       nil
     end
 
-    # Defines contact_end block.
+    # Defines contactEnd block.
     #
     # @example Call jumping() when the player sprite leaves the ground sprite
-    #  playerSprite.contact_end do |o|
+    #  playerSprite.contactEnd do |o|
     #    jumping if o == groundSprite
     #  end
     #
     # @return [nil] nil
     #
-    def contact_end(&block)
-      @view__.contact_end = block if block
+    def contactEnd(&block)
+      @view__.contactEnd = block if block
       nil
     end
 
@@ -907,7 +993,7 @@ module RubySketch
     # @return [nil] nil
     #
     def contact?(&block)
-      @view__.will_contact = block if block
+      @view__.willContact = block if block
       nil
     end
 
@@ -916,6 +1002,30 @@ module RubySketch
       @view__
     end
 
+    # @private
+    def drawSprite__(c)
+      return if hidden?
+      view              = getInternal__
+      f, degrees, pivot = view.frame, view.angle, view.pivot
+      if @drawBlock__
+        c.push do
+          c.translate f.x + pivot.x  * f.w, f.y + pivot.y  * f.h
+          c.rotate c.fromDegrees__ degrees
+          c.translate     (-pivot.x) * f.w,     (-pivot.y) * f.h
+          @drawBlock__.call {draw__ c, 0, 0, f.w, f.h}
+        end
+      elsif degrees != 0
+        c.pushMatrix do
+          c.translate f.x + pivot.x  * f.w, f.y + pivot.y  * f.h
+          c.rotate c.fromDegrees__ degrees
+          c.translate     (-pivot.x) * f.w,     (-pivot.y) * f.h
+          draw__ c, 0, 0, f.w, f.h
+        end
+      else
+        draw__ c, f.x, f.y, f.w, f.h
+      end
+    end
+
     # @private
     def draw__(c, x, y, w, h)
       img, off = @image__, @offset__
@@ -937,10 +1047,10 @@ module RubySketch
   #
   class SpriteWorld
 
-    # Create a new physics world
+    # Create a new physics world.
     #
-    def initialize(pixels_per_meter: 0)
-      @view, @debug = View.new(pixels_per_meter: pixels_per_meter), false
+    def initialize(pixelsPerMeter: 0)
+      @view, @debug = View.new(pixelsPerMeter: pixelsPerMeter), false
     end
 
     # Creates a new sprite and add it to physics engine.
@@ -991,31 +1101,36 @@ module RubySketch
     #
     # @return [Sprite] the new sprite object
     #
-    def createSprite(*args, context: nil, **kwargs)
+    def createSprite(*args, klass: nil, context: nil, **kwargs)
+      klass   ||= RubySketch::Sprite
       context ||= Context.context__
-      addSprite Sprite.new(*args, context: context, **kwargs)
+      addSprite klass.new(*args, context: context, **kwargs)
     end
 
-    # Adds sprites to the physics engine.
+    # Adds sprite to the physics engine.
     #
-    # @param [Sprite] sprites sprite objects
+    # @param [Array]  array user array to store the sprite
+    # @param [Sprite] sprite sprite object
     #
-    # @return [Sprite] first added sprite
+    # @return [Sprite] the added sprite
     #
-    def addSprite(*sprites)
-      sprites.each {@view.add _1.getInternal__}
-      sprites.first
+    def addSprite(array = nil, sprite)
+      @view.add sprite.getInternal__
+      array&.push sprite
+      sprite
     end
 
-    # Removes sprites from the physics engine.
+    # Removes sprite from the physics engine.
     #
-    # @param [Sprite] sprites sprite objects
+    # @param [Array]  array user array to remove the sprite
+    # @param [Sprite] sprite sprite object
     #
-    # @return [Sprite] first removed sprite
+    # @return [Sprite] the removed sprite
     #
-    def removeSprite(*sprites)
-      sprites.each {@view.remove _1.getInternal__}
-      sprites.first
+    def removeSprite(array = nil, sprite)
+      @view.remove sprite.getInternal__
+      array&.delete sprite
+      sprite
     end
 
     # Sets gravity for the physics engine.
@@ -1043,6 +1158,96 @@ module RubySketch
       nil
     end
 
+    # Returns the offset of the sprite world.
+    #
+    # @return [Vector] offset of the sprite world
+    #
+    def offset()
+      s, z = @view.scroll, zoom
+      Vector.new s.x / z, s.y / z, s.z / z
+    end
+
+    # Sets the offset of the sprite world.
+    #
+    # @overload offset=(vec)
+    #  @param [Vector] vec offset
+    #
+    # @overload offset=(ary)
+    #  @param [Array<Numeric>] ary an array of offsetX and offsetY
+    #
+    # @return [Vector] offset of the sprite world
+    #
+    def offset=(arg)
+      zoom_   = zoom
+      x, y, z =
+        case arg
+        when Vector then [arg.x,       arg.y,       arg.z]
+        when Array  then [arg[0] || 0, arg[1] || 0, arg[2] || 0]
+        when nil    then [0,           0,           0]
+        else raise ArgumentError
+        end
+      @view.scroll_to x * zoom_, y * zoom_, z * zoom_
+      offset
+    end
+
+    # Returns the x-axis offset of the sprite world.
+    #
+    # @return [Numeric] offset.x
+    #
+    def ox()
+      offset.x
+    end
+
+    # Sets the x-axis offset of the sprite world.
+    #
+    # @param [Numeric] x x-axis offset
+    #
+    # @return [Numeric] offset.x
+    #
+    def ox=(x)
+      o           = offset
+      o.x         = x
+      self.offset = o
+      x
+    end
+
+    # Returns the y-axis offset of the sprite world.
+    #
+    # @return [Numeric] offset.y
+    #
+    def oy()
+      offset.y
+    end
+
+    # Sets the y-axis offset of the sprite world.
+    #
+    # @param [Numeric] x y-axis offset
+    #
+    # @return [Numeric] offset.y
+    #
+    def oy=(x)
+      o           = offset
+      o.y         = y
+      self.offset = o
+      y
+    end
+
+    # Returns the zoom value of the sprite world.
+    #
+    # @return [Numeric] zoom
+    #
+    def zoom()
+      @view.zoom
+    end
+
+    # Sets the zoom value of the sprite world.
+    #
+    # @return [Numeric] zoom
+    #
+    def zoom=(zoom)
+      @view.zoom = zoom
+    end
+
     def debug=(state)
       @view.debug = state
     end
@@ -1060,18 +1265,15 @@ module RubySketch
   # @private
   class Sprite::View < Reflex::View
 
-    attr_accessor :update,
-      :mousePressed, :mouseReleased, :mouseMoved, :mouseDragged, :mouseClicked,
-      :touchStarted, :touchEnded, :touchMoved,
-      :contact, :contact_end, :will_contact
-
-    attr_reader :sprite, :touches
-
     def initialize(sprite, *args, shape:, physics:, **kwargs, &block)
       @sprite = sprite
       super(*args, **kwargs, &block)
 
       @error            = nil
+      @key              = nil
+      @keyCode          = nil
+      @keyRepeat        = false
+      @keysPressed      = nil
       @pointer          = nil
       @pointerPrev      = nil
       @pointersPressed  = []
@@ -1082,6 +1284,18 @@ module RubySketch
       self.static = true if physics
     end
 
+    attr_accessor :update,
+      :mousePressed, :mouseReleased, :mouseMoved, :mouseDragged, :mouseClicked,
+      :touchStarted, :touchEnded, :touchMoved,
+      :keyPressed, :keyReleased, :keyTyped,
+      :contact, :contactEnd, :willContact
+
+    attr_reader :sprite, :key, :keyCode, :keyRepeat, :touches
+
+    def keysPressed()
+      @keysPressed || []
+    end
+
     def mouseX()
       @pointer&.x || 0
     end
@@ -1111,7 +1325,7 @@ module RubySketch
     end
 
     def on_update(e)
-      call_block @update
+      callBlock @update
     end
 
     def on_pointer_down(e)
@@ -1119,8 +1333,8 @@ module RubySketch
       updatePointersPressedAndReleased e, true
       @pointerDownStartPos = to_screen @pointer.pos
 
-      call_block @mousePressed if e.any? {|p| p.id == @pointer.id}
-      call_block @touchStarted
+      callBlock @mousePressed if e.any? {|p| p.id == @pointer.id}
+      callBlock @touchStarted
 
       e.block
     end
@@ -1130,10 +1344,10 @@ module RubySketch
       updatePointersPressedAndReleased e, false
 
       if e.any? {|p| p.id == @pointer.id}
-        call_block @mouseReleased
-        call_block @mouseClicked if mouseClicked?
+        callBlock @mouseReleased
+        callBlock @mouseClicked if mouseClicked?
       end
-      call_block @touchEnded
+      callBlock @touchEnded
 
       @pointerDownStartPos = nil
       @pointersReleased.clear
@@ -1143,29 +1357,42 @@ module RubySketch
       updatePointerStates e
 
       mouseMoved = e.drag? ? @mouseDragged : @mouseMoved
-      call_block mouseMoved if e.any? {|p| p.id == @pointer.id}
-      call_block @touchMoved
+      callBlock mouseMoved if e.any? {|p| p.id == @pointer.id}
+      callBlock @touchMoved
     end
 
     def on_pointer_cancel(e)
       on_pointer_up e
     end
 
+    def on_key_down(e)
+      updateKeyStates e, true
+      callBlock @keyPressed
+      callBlock @keyTyped if e.chars&.empty? == false
+      e.block
+    end
+
+    def on_key_up(e)
+      updateKeyStates e, false
+      callBlock @keyReleased
+      e.block
+    end
+
     def on_contact_begin(e)
       return unless @contact
       v = e.view
-      call_block @contact, v.sprite if v.respond_to?(:sprite)
+      callBlock @contact, v.sprite if v.respond_to?(:sprite)
     end
 
     def on_contact_end(e)
-      return unless @contact_end
+      return unless @contactEnd
       v = e.view
-      call_block @contact_end, v.sprite if v.respond_to?(:sprite)
+      callBlock @contactEnd, v.sprite if v.respond_to?(:sprite)
     end
 
     def will_contact?(v)
-      return true unless @will_contact && v.respond_to?(:sprite)
-      call_block @will_contact, v.sprite
+      return true unless @willContact && v.respond_to?(:sprite)
+      callBlock @willContact, v.sprite
     end
 
     private
@@ -1178,6 +1405,14 @@ module RubySketch
 
     MOUSE_BUTTONS = MOUSE_BUTTON_MAP.values
 
+    def updateKeyStates(event, pressed)
+      set        = (@keysPressed ||= Set.new)
+      @key       = event.chars
+      @keyCode   = event.key
+      @keyRepeat = pressed && set.include?(@keyCode)
+      pressed ? set.add(@keyCode) : set.delete(@keyCode)
+    end
+
     def updatePointerStates(event)
       pointer = event.find {|p| p.id == @pointer&.id} || event.first
       if !mousePressed? || pointer.id == @pointer&.id
@@ -1205,7 +1440,7 @@ module RubySketch
         .then {|pos, startPos| (pos - startPos).length < 3}
     end
 
-    def call_block(block, *args)
+    def callBlock(block, *args)
       block.call(*args) if block && !@error
     rescue Exception => e
       @error = e
@@ -1218,8 +1453,8 @@ module RubySketch
   # @private
   class SpriteWorld::View < Reflex::View
 
-    def initialize(*a, pixels_per_meter: 0, **k, &b)
-      create_world pixels_per_meter if pixels_per_meter > 0
+    def initialize(*a, pixelsPerMeter: 0, **k, &b)
+      create_world pixelsPerMeter if pixelsPerMeter > 0
       super(*a, **k, &b)
       @debug = false
       remove wall

data/lib/rubysketch.rb

@@ -37,9 +37,9 @@ end
 begin
   w, c = RubySketch::WINDOW__, RubySketch::CONTEXT__
 
-  c.class.constants.reject {_1 =~ /__$/}.each do |const|
-    self.class.const_set const, c.class.const_get(const)
-  end
+  c.class.constants
+    .reject {_1 =~ /__$/}
+    .each   {self.class.const_set _1, c.class.const_get(_1)}
 
   w.__send__ :begin_draw
   at_exit do

data/rubysketch.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',        '~> 0.3.3', '>= 0.3.3'
-  s.add_dependency 'rucy',       '~> 0.3.3', '>= 0.3.3'
-  s.add_dependency 'beeps',      '~> 0.3.3', '>= 0.3.3'
-  s.add_dependency 'rays',       '~> 0.3.3', '>= 0.3.3'
-  s.add_dependency 'reflexion',  '~> 0.3.3', '>= 0.3.3'
-  s.add_dependency 'processing', '~> 1.1',   '>= 1.1.5'
+  s.add_dependency 'xot',        '~> 0.3.4', '>= 0.3.4'
+  s.add_dependency 'rucy',       '~> 0.3.4', '>= 0.3.4'
+  s.add_dependency 'beeps',      '~> 0.3.4', '>= 0.3.4'
+  s.add_dependency 'rays',       '~> 0.3.4', '>= 0.3.4'
+  s.add_dependency 'reflexion',  '~> 0.3.4', '>= 0.3.4'
+  s.add_dependency 'processing', '~> 1.1',   '>= 1.1.6'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}

data/test/test_context.rb

@@ -16,16 +16,20 @@ class TestContext < Test::Unit::TestCase
 
   def test_addSprite()
     sp = sprite
-    assert_nil       context.addSprite()
     assert_equal sp, context.addSprite(sp)
-    assert_equal sp, context.addSprite(sp, sprite)
+
+    ary = []
+    assert_equal sp, context.addSprite(ary, sp)
+    assert_equal [sp], ary
   end
 
   def test_removeSprite()
     sp = sprite
-    assert_nil       context.removeSprite()
     assert_equal sp, context.removeSprite(sp)
-    assert_equal sp, context.removeSprite(sp, sprite)
+
+    ary = [sp]
+    assert_equal sp, context.removeSprite(ary, sp)
+    assert_equal [], ary
   end
 
 end# TestContext

data/test/test_sprite.rb

@@ -272,32 +272,32 @@ class TestSprite < Test::Unit::TestCase
     v = s.instance_variable_get :@view__
     assert_nil v.update
     assert_nil v.contact
-    assert_nil v.contact_end
-    assert_nil v.will_contact
+    assert_nil v.contactEnd
+    assert_nil v.willContact
 
     s.update {}
     assert_not_nil v.update
     assert_nil     v.contact
-    assert_nil     v.contact_end
-    assert_nil     v.will_contact
+    assert_nil     v.contactEnd
+    assert_nil     v.willContact
 
     s.contact {}
     assert_not_nil v.update
     assert_not_nil v.contact
-    assert_nil     v.contact_end
-    assert_nil     v.will_contact
+    assert_nil     v.contactEnd
+    assert_nil     v.willContact
 
-    s.contact_end {}
+    s.contactEnd {}
     assert_not_nil v.update
     assert_not_nil v.contact
-    assert_not_nil v.contact_end
-    assert_nil     v.will_contact
+    assert_not_nil v.contactEnd
+    assert_nil     v.willContact
 
     s.contact? {}
     assert_not_nil v.update
     assert_not_nil v.contact
-    assert_not_nil v.contact_end
-    assert_not_nil v.will_contact
+    assert_not_nil v.contactEnd
+    assert_not_nil v.willContact
   end
 
   def test_inspect()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,100 +16,100 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: 1.1.6
 description: A game engine based on the Processing API.
 email: xordog@gmail.com
 executables: []
@@ -159,6 +159,7 @@ files:
 - lib/rubysketch/context.rb
 - lib/rubysketch/easings.rb
 - lib/rubysketch/extension.rb
+- lib/rubysketch/graphics_context.rb
 - lib/rubysketch/helper.rb
 - lib/rubysketch/shape.rb
 - lib/rubysketch/sound.rb