rubysketch 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aae68b50056538ec9f1de57091af05176af8b629331d40e16b640de83d4a610
-  data.tar.gz: 8929fd46a62eeb5457f386a72b255d3a6267fc1380bb29aabe9b093a722ecb34
+  metadata.gz: 82a93ef9dac4ae855bfa85f9a076ed05c807875db70be9c5e72419137499434e
+  data.tar.gz: 2f432e94c80ad231f50ca11df96ecd6a13c389551f75c426e161701e25d85a23
 SHA512:
-  metadata.gz: fe6b88ffc3d9ee14f6b9206df4b554d498cd6a4b5b13a21baf8a6b0cfcebec4888322d12f6cee09829cc7a1038ad9ad2854945d5bb4e8706337bbfa310c113ab
-  data.tar.gz: 56dac7438fb09ed3d8164e390e44dc785be289e6c4a4e5c3b9550fd5363c87f0a5a05f94806b6f68e691019e9297e2be6710435c5b0cafa35b2527ca1d7d1124
+  metadata.gz: cdf7238a4d07fe88b5d1fe3d68ea6f62d9536b142afda5dad1f4c15538bae2047d4e188bbc88e0777d641650ad9c5f5864720345ad5ec950e2ff18e83f552db9
+  data.tar.gz: 310a71a0b3388876bd0c0910a09bb9aa12e5686e5885ec8e4b2a32cb4af629ed18a010731a77b4a8ea1a9a4be41de504098767d0d133e3344554d5078508ad29

data/.github/workflows/utils.rb

@@ -20,8 +20,9 @@ def setup_dependencies(build: true, only: nil)
 
   exts.each do |ext|
     gem   = RENAMES[ext.to_sym].then {|s| s || ext}
-    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
     ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+    opts  = '-c advice.detachedHead=false --depth 1'
+    clone = "git clone #{opts} https://github.com/xord/#{ext}.git ../#{ext}"
 
     # 'rake subtree:push' pushes all subrepos, so cloning by new tag
     # often fails before tagging each new tag

data/ChangeLog.md

@@ -1,6 +1,13 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.4] - 2023-04-30
+
+- Add Sprite#image=() and Sprite#offset=()
+- gravity() takes vector by pixel
+- Add documents for Sprite class and test it
+
+
 ## [v0.5.3] - 2023-04-22
 
 - Depends on Beeps

data/RubySketch.podspec

@@ -23,11 +23,15 @@ Pod::Spec.new do |s|
   incdirs = exts.map {|x| "#{root}/#{x}/include"}.concat %W[
     #{root}/src
     #{root}/beeps/vendor/stk/include
+    #{root}/beeps/vendor/AudioFile
+    #{root}/beeps/vendor/r8brain-free-src
+    #{root}/beeps/vendor/signalsmith-stretch
     #{root}/rays/vendor/glm
     #{root}/rays/vendor/clipper/cpp
     #{root}/rays/vendor/poly2tri/poly2tri
     #{root}/rays/vendor/splines-lib
-    #{root}/reflex/vendor/Box2D/Box2D
+    #{root}/reflex/vendor/box2d/include
+    #{root}/reflex/vendor/box2d/src
     ${PODS_ROOT}/CRuby/CRuby/include
   ]
 
@@ -63,16 +67,25 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Beeps" do |spec|
-    spec.source_files = "beeps/src/*.cpp"
-    spec.frameworks   = %w[OpenAL]
+    spec    .source_files = "beeps/src/*.cpp"
+    spec.osx.source_files = "beeps/src/osx/*.{cpp,mm}"
+    spec.ios.source_files = "beeps/src/osx/*.{cpp,mm}"
+    spec.frameworks       = %w[OpenAL AVFoundation]
 
     spec.subspec "STK" do |sub|
       sub.source_files  = "beeps/vendor/stk/src/*.cpp"
-      sub.exclude_files = %W[Tcp Udp Socket Thread Mutex InetWv Rt].map {|s|
+      sub.exclude_files = %w[Tcp Udp Socket Thread Mutex InetWv Rt].map {|s|
         "beeps/vendor/stk/src/#{s}*.cpp"
       }
     end
 
+    spec.subspec "R8BrainFreeSrc" do |sub|
+      sub.source_files  = "beeps/vendor/r8brain-free-src/*.cpp"
+      sub.exclude_files = %w[example pffft_double/].map {|s|
+        "beeps/vendor/r8brain-free-src/#{s}*.cpp"
+      }
+    end
+
     spec.subspec "Ext" do |ext|
       ext.source_files = "beeps/ext/beeps/*.cpp"
     end
@@ -108,7 +121,7 @@ Pod::Spec.new do |s|
     spec.ios.frameworks   = %w[CoreMotion]
 
     spec.subspec "Box2D" do |sub|
-      sub.source_files = "reflex/vendor/Box2D/Box2D/Box2D/**/*.cpp"
+      sub.source_files = "reflex/vendor/box2d/src/**/*.cpp"
     end
 
     spec.subspec "Ext" do |ext|

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/rubysketch/all.rb

@@ -1,4 +1,3 @@
-require 'forwardable'
 require 'beeps'
 require 'processing/all'
 
@@ -10,3 +9,11 @@ require 'rubysketch/sprite'
 require 'rubysketch/sound'
 require 'rubysketch/graphics_context'
 require 'rubysketch/context'
+
+
+module RubySketch
+
+  Vector = Processing::Vector
+  Image  = Processing::Image
+
+end# RubySketch

data/lib/rubysketch/context.rb

@@ -5,47 +5,103 @@ module RubySketch
 
     include GraphicsContext
 
+    Sound  = RubySketch::Sound
+    Sprite = RubySketch::Sprite
+
+    # @private
     def initialize(window)
       super
-      @sprites__ = window.add SpritesView.new
+      @layer__ = window.add_overlay SpriteLayer.new
     end
 
+    # Creates a new sprite and add it to physics engine.
+    #
+    # @overload createSprite(image: img)
+    #  pos: [0, 0], size: [image.width, image.height]
+    #  @param [Image] img sprite image
+    #
+    # @overload createSprite(x, y, image: img)
+    #  pos: [x, y], size: [image.width, image.height]
+    #  @param [Numeric] x   x of sprite position
+    #  @param [Numeric] y   y of sprite position
+    #  @param [Image]   img sprite image
+    #
+    # @overload createSprite(x, y, w, h)
+    #  pos(x, y), size: [w, h]
+    #  @param [Numeric] x x of sprite position
+    #  @param [Numeric] y y of sprite position
+    #  @param [Numeric] w width of sprite
+    #  @param [Numeric] h height of sprite
+    #
+    # @overload createSprite(x, y, w, h, image: img, offset: off)
+    #  pos: [x, y], size: [w, h], offset: [offset.x, offset.x]
+    #  @param [Numeric] x   x of sprite position
+    #  @param [Numeric] y   y of sprite position
+    #  @param [Numeric] w   width of sprite
+    #  @param [Numeric] h   height of sprite
+    #  @param [Image]   img sprite image
+    #  @param [Vector]  off offset of sprite image
+    #
     def createSprite(*args, **kwargs)
       addSprite Sprite.new(*args, **kwargs)
     end
 
+    # Adds the sprite to the physics engine.
+    #
+    # @param [Sprite] sprite sprite object
+    #
     def addSprite(sprite)
-      @sprites__.add sprite.getInternal__ if sprite
+      @layer__.add sprite.getInternal__ if sprite
       sprite
     end
 
+    # Removes the sprite from the physics engine.
+    #
+    # @param [Sprite] sprite sprite object
+    #
     def removeSprite(sprite)
-      @sprites__.remove sprite.getInternal__ if sprite
+      @layer__.remove sprite.getInternal__ if sprite
       sprite
     end
 
+    # @private
     def loadSound(path)
       Sound.load path
     end
 
+    # Sets gravity for the physics engine.
+    #
+    # @overload gravity(vec)
+    #  @param [Vector] vec gracity vector
+    #
+    # @overload gravity(ary)
+    #  @param [Array<Numeric>] ary gravityX, gravityY
+    #
+    # @overload gravity(x, y)
+    #  @param [Numeric] x x of gravity vector
+    #  @param [Numeric] y y of gracity vector
+    #
     def gravity(*args)
       x, y =
-        case args
-        when Processing::Vector then args.array
+        case arg = args.first
+        when Vector then arg.array
+        when Array  then arg
         else args
         end
-      @sprites__.then do |v|
-        v.gravity x * v.meter, y * v.meter
-      end
+      @layer__.gravity x, y
     end
 
-    class SpritesView < Reflex::View
-      def on_draw(e)
-        e.block
-      end
+  end# Context
+
+
+  # @private
+  class SpriteLayer < Reflex::View
+
+    def on_draw(e)
+      e.block
     end
 
-  end# Context
+  end# SpriteLayer
 
 
 end# RubySketch

data/lib/rubysketch/extension.rb

@@ -1,6 +1,7 @@
 module RubySketch
 
 
+  # @private
   module Extension
 
     module_function

data/lib/rubysketch/graphics_context.rb

@@ -3,34 +3,27 @@ module RubySketch
 
   module GraphicsContext
 
+    # Draws one or more sprites.
+    #
+    # @param [Array<Sprite>] sprites
+    #
     def sprite(*sprites)
       sprites.flatten! if sprites.first&.is_a? Array
       sprites.each do |sp|
         v = sp.getInternal__
-        f, angle, img, offset = v.frame, v.angle, sp.image, sp.offset
+        f, angle = v.frame, v.angle
         if angle == 0
-          drawSprite__ f.x, f.y, f.w, f.h, img, offset
+          sp.on_draw__ f.x, f.y, f.w, f.h
         else
           pushMatrix do
             translate f.x, f.y
             rotate radians(angle)
-            drawSprite__ 0, 0, f.w, f.h, img, offset
+            sp.on_draw__ 0, 0, f.w, f.h
           end
         end
       end
     end
 
-    def drawSprite__(x, y, w, h, img, offset)
-      if img && offset
-        ox, oy = offset
-        copy img, ox, oy, w, h, x, y, w, h
-      elsif img
-        image img, x, y
-      else
-        rect x, y, w, h
-      end
-    end
-
   end# GraphicsContext
 
 

data/lib/rubysketch/helper.rb

@@ -1,3 +1,4 @@
+# @private
 class Rays::Point
   def toVector()
     Processing::Vector.new x, y, z

data/lib/rubysketch/sound.rb

@@ -1,6 +1,7 @@
 module RubySketch
 
 
+  # @private
   class Sound
 
     # @private
@@ -8,6 +9,8 @@ module RubySketch
       @sound = sound
     end
 
+    # Play sound.
+    #
     def play()
       old = @player
       @player = @sound.play
@@ -15,12 +18,16 @@ module RubySketch
       true
     end
 
+    # Pause sound.
+    #
     def pause()
       return false unless @player
       @player.pause
       true
     end
 
+    # Stop sound.
+    #
     def stop()
       return false unless @player
       @player.stop
@@ -28,22 +35,46 @@ module RubySketch
       true
     end
 
+    # Returns whether the sound is playing or not.
+    #
+    # @return [Boolean] playing or not
+    #
     def playing?()
       @player ? @player.playing? : false
     end
 
+    # Returns whether the sound is paused or not.
+    #
+    # @return [Boolean] paused or not
+    #
     def paused?()
-      !playing? && !stopped?
+      @player ? @player.paused? : false
     end
 
+    # Returns whether the sound is stopped or not.
+    #
+    # @return [Boolean] stopped or not
+    #
     def stopped?()
       @player ? @player.stopped? : true
     end
 
+    # Save the sound data to a file.
+    #
+    # @param [String] path file path
+    #
+    # @return [Sound] self
+    #
     def save(path)
       @sound.save path
     end
 
+    # Load a sound file.
+    #
+    # @param [String] path file path
+    #
+    # @return [Sound] sound object
+    #
     def self.load(path)
       f = Beeps::FileIn.new path
       self.new Beeps::Sound.new(f, f.seconds, nchannels: f.nchannels)

data/lib/rubysketch/sprite.rb

@@ -1,128 +1,409 @@
 module RubySketch
 
 
+  # Sprite object.
+  #
   class Sprite
 
-    extend Forwardable
+    # Initialize sprite object.
+    #
+    # @overload new(image: img)
+    #  pos: [0, 0], size: [image.width, image.height]
+    #  @param [Image] img sprite image
+    #
+    # @overload new(x, y, image: img)
+    #  pos: [x, y], size: [image.width, image.height]
+    #  @param [Numeric] x   x of sprite position
+    #  @param [Numeric] y   y of sprite position
+    #  @param [Image]   img sprite image
+    #
+    # @overload new(x, y, w, h)
+    #  pos(x, y), size: [w, h]
+    #  @param [Numeric] x x of sprite position
+    #  @param [Numeric] y y of sprite position
+    #  @param [Numeric] w width of sprite
+    #  @param [Numeric] h height of sprite
+    #
+    # @overload new(x, y, w, h, image: img, offset: off)
+    #  pos: [x, y], size: [w, h], offset: [offset.x, offset.x]
+    #  @param [Numeric] x   x of sprite position
+    #  @param [Numeric] y   y of sprite position
+    #  @param [Numeric] w   width of sprite
+    #  @param [Numeric] h   height of sprite
+    #  @param [Image]   img sprite image
+    #  @param [Vector]  off offset of sprite image
+    #
+    def initialize(x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil)
+      w ||= (image&.width  || 0)
+      h ||= (image&.height || 0)
+      raise 'invalid size'  unless w >= 0 && h >= 0
+      raise 'invalid image' if image && !image.getInternal__.is_a?(Rays::Image)
 
-    def initialize(x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil, dynamic: false)
-      w ||= image&.width  || 0
-      h ||= image&.height || 0
-      raise 'invalid size' unless w >= 0 && h >= 0
+      @view__ = SpriteView.new(self, x: x, y: y, w: w, h: h, back: :white)
 
-      @image__, @offset__ = image, offset
-      @view__ = View.new self, x: x, y: y, w: w, h: h, back: :white, dynamic: dynamic
+      self.image  = image  if image
+      self.offset = offset if offset
     end
 
-    def_delegators :@view__,
-      :x, :x=,
-      :y, :y=,
-      :w,     :h,
-      :width, :height,
-      :dynamic?,    :dynamic=,
-      :density,     :density=,
-      :friction,    :friction=,
-      :restitution, :restitution=
+    # Returns the position of the sprite.
+    #
+    # @return [Vector] position
+    #
+    def position()
+      @view__.position.toVector
+    end
 
-    def update(&block)
-      @view__.on_update = block
+    # Sets the position of the sprite.
+    #
+    # @overload position=(vec)
+    #  @param [Vector] vec position vector
+    #
+    # @overload position=(ary)
+    #  @param [Array<Numeric>] ary positionX, positionY
+    #
+    # @return [Vector] position
+    #
+    def position=(arg)
+      @view__.position = arg.is_a?(Vector) ? arg.getInternal__ : arg
+      arg
     end
 
-    def contact(&block)
-      @view__.on_contact = block
+    # Returns the x-coordinate position of the sprite.
+    #
+    # @return [Numeric] sprite position x
+    #
+    def x()
+      @view__.x
     end
 
-    def contact?(&block)
-      @view__.will_contact = block
+    # Set the x-coordinate position of the sprite.
+    #
+    # @param [Numeric] n sprite position x
+    #
+    # @return [Numeric] sprite position x
+    #
+    def x=(n)
+      @view__.x = n
+      n
     end
 
-    def position()
-      @view__.position.toVector
+    # Returns the y-coordinate position of the sprite.
+    #
+    # @return [Numeric] sprite position y
+    #
+    def y()
+      @view__.y
     end
 
-    def position=(vector)
-      @view__.position = vector.getInternal__
+    # Set the y-coordinate position of the sprite.
+    #
+    # @param [Numeric] n sprite position y
+    #
+    # @return [Numeric] sprite position y
+    #
+    def y=(n)
+      @view__.y = n
+      n
     end
 
+    alias pos  position
+    alias pos= position=
+
+    # Returns the size of the sprite.
+    #
+    # @return [Vector] size
+    #
     def size()
       @view__.size.toVector
     end
 
-    def image()
-      @image__
+    # Returns the width of the sprite.
+    #
+    # @return [Numeric] width
+    #
+    def width()
+      @view__.width
     end
 
-    def offset()
-      @offset__
+    # Returns the height of the sprite.
+    #
+    # @return [Numeric] height
+    #
+    def height()
+      @view__.height
     end
 
+    alias w width
+    alias h height
+
+    # Returns the velocity of the sprite.
+    #
+    # @return [Vector] velocity
+    #
     def velocity()
       @view__.velocity.toVector
     end
 
-    def velocity=(vector)
-      @view__.velocity = vector.getInternal__
+    # Sets the velocity of the sprite.
+    #
+    # @overload velocity=(vec)
+    #  @param [Vector] vec velocity vector
+    #
+    # @overload velocity=(ary)
+    #  @param [Array<Numeric>] ary velocityX, velocityY
+    #
+    # @return [Vector] velocity
+    #
+    def velocity=(arg)
+      @view__.velocity = arg.is_a?(Vector) ? arg.getInternal__ : arg
+      arg
     end
 
+    # Returns the x-axis velocity of the sprite.
+    #
+    # @return [Numeric] velocity.x
+    #
     def vx()
       @view__.velocity.x
     end
 
-    def vx=(value)
-      @view__.velocity = @view__.velocity.tap {|v| v.x = value}
-      value
+    # Sets the x-axis velocity of the sprite.
+    #
+    # @param [Numeric] n x-axis velocity
+    #
+    # @return [Numeric] velocity.x
+    #
+    def vx=(n)
+      @view__.velocity = @view__.velocity.tap {|v| v.x = n}
+      n
     end
 
+    # Returns the y-axis velocity of the sprite.
+    #
+    # @return [Numeric] velocity.y
+    #
     def vy()
       @view__.velocity.y
     end
 
-    def vy=(value)
-      @view__.velocity = @view__.velocity.tap {|v| v.y = value}
-      value
+    # Sets the y-axis velocity of the sprite.
+    #
+    # @param [Numeric] n y-axis velocity
+    #
+    # @return [Numeric] velocity.y
+    #
+    def vy=(n)
+      @view__.velocity = @view__.velocity.tap {|v| v.y = n}
+      n
+    end
+
+    alias vel  velocity
+    alias vel= velocity=
+
+    # Returns the image of the sprite.
+    #
+    # @return [Image] sprite image
+    #
+    def image()
+      @image__
+    end
+
+    # Sets the sprite image.
+    #
+    # @param [Image] img sprite image
+    #
+    # @return [Image] sprite image
+    #
+    def image=(img)
+      @image__ = img
+    end
+
+    # Returns the offset of the sprite image.
+    #
+    # @return [Vector] offset of the sprite image
+    #
+    def offset()
+      @offset__
+    end
+
+    def offset=(arg)
+      @offset__ =
+        case arg
+        when Vector then arg
+        when Array  then Vector.new(*arg[0, 2])
+        when nil    then nil
+        else raise ArgumentError
+        end
+    end
+
+    # Returns whether the sprite is movable by the physics engine.
+    #
+    # @return [Boolean] true if dynamic
+    #
+    def dynamic?()
+      @view__.dynamic?
+    end
+
+    # Sets whether the sprite is movable by the physics engine.
+    #
+    # @param [Boolean] bool movable or not
+    #
+    # @return [Boolean] true if dynamic
+    #
+    def dynamic=(bool)
+      @view__.dynamic = bool
+      bool
+    end
+
+    # Returns the density of the sprite.
+    #
+    # @return [Numeric] density
+    #
+    def density()
+      @view__.density
+    end
+
+    # Sets the density of the sprite.
+    #
+    # @param [Numeric] n density
+    #
+    # @return [Numeric] density
+    #
+    def density=(n)
+      @view__.density = n
+      n
+    end
+
+    # Returns the friction of the sprite.
+    #
+    # @return [Numeric] friction
+    #
+    def friction()
+      @view__.friction
+    end
+
+    # Sets the friction of the sprite.
+    #
+    # @param [Numeric] n friction
+    #
+    # @return [Numeric] friction
+    #
+    def friction=(n)
+      @view__.friction = n
+      n
+    end
+
+    # Returns the restitution of the sprite.
+    #
+    # @return [Numeric] restitution
+    #
+    def restitution()
+      @view__.restitution
+    end
+
+    # Sets the restitution of the sprite.
+    #
+    # @param [Numeric] n restitution
+    #
+    # @return [Numeric] restitution
+    #
+    def restitution=(n)
+      @view__.restitution = n
+      n
     end
 
-    alias pos   position
-    alias pos=  position=
-    alias vel   velocity
-    alias vel=  velocity=
     alias dens  density
     alias dens= density=
     alias fric  friction
-    alias fric= friction
+    alias fric= friction=
     alias rest  restitution
     alias rest= restitution=
 
+    # Defines update block.
+    #
+    # @example vx is updated every frame
+    #  sprite.update do
+    #    self.vx *= 0.9
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def update(&block)
+      @view__.update = block
+    end
+
+    # Defines contact block.
+    #
+    # @example Score increases when the player sprite touches a coin
+    #  playerSprite.contact do |o|
+    #    score += 1 if o.coin?
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def contact(&block)
+      @view__.contact = block
+    end
+
+    # Defines contact? block.
+    #
+    # @example only collide with an enemy
+    #  playerSprite.contact? do |o|
+    #    o.enemy?
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def contact?(&block)
+      @view__.will_contact = block
+    end
+
+    # @private
+    def on_draw__(x, y, w, h)
+      img, off = frame, @image__, @offset__
+      if img && off
+        copy img, off.x, off.y, f.w, h, x, y, w, h
+      elsif img
+        image img, x, y
+      else
+        rect x, y, w, h
+      end
+    end
+
     # @private
     def getInternal__()
       @view__
     end
 
-    class View < Reflex::View
-      attr_accessor :update, :contact, :will_contact
-      attr_reader :sprite
+  end# Sprite
 
-      def initialize(sprite, *a, **k, &b)
-        @sprite = sprite
-        super(*a, **k, &b)
-      end
 
-      def on_update(e)
-        @update.call if @update
-      end
+  # @private
+  class SpriteView < Reflex::View
 
-      def on_contact(e)
-        v = e.view
-        @contact.call v.sprite, e.action if @contact && v.is_a?(View)
-      end
+    attr_accessor :update, :contact, :will_contact
+    attr_reader :sprite
 
-      def will_contact?(v)
-        return true if !@will_contact || !v.is_a?(View)
-        @will_contact.call v.sprite
-      end
+    def initialize(sprite, *a, **k, &b)
+      @sprite = sprite
+      super(*a, **k, &b)
     end
 
-  end# Sprite
+    def on_update(e)
+      @update.call if @update
+    end
+
+    def on_contact(e)
+      v = e.view
+      @contact.call v.sprite, e.action if @contact && v.is_a?(SpriteView)
+    end
+
+    def will_contact?(v)
+      return true if !@will_contact || !v.is_a?(SpriteView)
+      @will_contact.call v.sprite
+    end
+
+  end# SpriteView
 
 
 end# RubySketch

data/lib/rubysketch/window.rb

@@ -1,6 +1,7 @@
 module RubySketch
 
 
+  # @private
   class Window < Processing::Window
 
     def on_update(e)

data/pod.rake

@@ -19,15 +19,17 @@ task :setup
 
 repos.each do |repo, ver|
   rakefile = "#{repo}/Rakefile"
-  opts     = {
-    depth:  1,
-    branch: (ENV['RUBYSKETCH_BRANCH'] || "v#{ver}")
-  }.map {|k, v| "--#{k} #{v}"}.join ' '
+  opts     = [
+    '-c advice.detachedHead=false',
+    '--no-single-branch',
+    '--depth 1',
+    "--branch #{ENV['RUBYSKETCH_BRANCH'] || ('v' + ver)}"
+  ]
 
   task :setup => rakefile
 
   file rakefile do
-    sh %( git clone #{opts} #{github}/#{repo} )
+    sh %( git clone #{opts.join ' '} #{github}/#{repo} )
     sh %( cd #{repo} && VENDOR_NOCOMPILE=1 rake vendor erb )
   end
 end

data/rubysketch.gemspec

@@ -28,12 +28,12 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'xot',        '~> 0.1.33'
-  s.add_runtime_dependency 'rucy',       '~> 0.1.33'
-  s.add_runtime_dependency 'beeps',      '~> 0.1.33'
-  s.add_runtime_dependency 'rays',       '~> 0.1.33'
-  s.add_runtime_dependency 'reflexion',  '~> 0.1.33'
-  s.add_runtime_dependency 'processing', '~> 0.5.3'
+  s.add_runtime_dependency 'xot',        '~> 0.1.34'
+  s.add_runtime_dependency 'rucy',       '~> 0.1.34'
+  s.add_runtime_dependency 'beeps',      '~> 0.1.35'
+  s.add_runtime_dependency 'rays',       '~> 0.1.34'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.35'
+  s.add_runtime_dependency 'processing', '~> 0.5.5'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/test/test_sound.rb

@@ -73,7 +73,7 @@ class TestSound < Test::Unit::TestCase
     assert_equal [false, false, true],  [s.playing?, s.paused?, s.stopped?]
   end
 
-  def test_save()
+  def test_save_load()
     s = sound
 
     File.delete PATH
@@ -81,10 +81,8 @@ class TestSound < Test::Unit::TestCase
 
     s.save PATH
     assert_true  File.exist? PATH
-  end
 
-  def test_load()
-    assert_nothing_raised {sound.play}
+    assert_nothing_raised {RS::Sound.load(PATH).play}
   end
 
 end# TestSound

data/test/test_sprite.rb

@@ -6,18 +6,190 @@ require_relative 'helper'
 
 class TestSprite < Test::Unit::TestCase
 
+  RS = RubySketch
+
   def sprite(*args, **kwargs)
-    RubySketch::Sprite.new(*args, **kwargs)
+    RS::Sprite.new(*args, **kwargs)
   end
 
   def vec(*args, **kwargs)
-    Processing::Vector.new(*args, **kwargs)
+    RS::Vector.new(*args, **kwargs)
+  end
+
+  def image(w, h)
+    RS::Image.new Rays::Image.new(w, h)
   end
 
   def test_initialize()
-    assert_equal 0,         sprite.x
-    assert_equal 0,         sprite.y
-    assert_equal vec(0, 0), sprite.pos
+    assert_equal vec(0, 0), sprite            .pos
+    assert_equal vec(1, 2), sprite(1, 2)      .pos
+    assert_equal vec(1, 2), sprite(1, 2, 3, 4).pos
+
+    assert_equal vec(0, 0), sprite                                .size
+    assert_equal vec(3, 4), sprite(1, 2, 3, 4)                    .size
+    assert_equal vec(5, 6), sprite(            image: image(5, 6)).size
+    assert_equal vec(5, 6), sprite(1, 2,       image: image(5, 6)).size
+    assert_equal vec(3, 4), sprite(1, 2, 3, 4, image: image(5, 6)).size
+
+    assert_equal nil,    sprite                    .image
+    assert_equal [1, 2], sprite(image: image(1, 2)).image.size
+
+    assert_equal nil,       sprite.offset
+    assert_equal vec(1, 2), sprite(offset:    [1, 2]).offset
+    assert_equal vec(1, 2), sprite(offset: vec(1, 2)).offset
+
+    assert_raise {sprite 0, 0, -1, 0}
+    assert_raise {sprite 0, 0, 0, -1}
+  end
+
+  def test_position()
+    s = sprite
+    assert_equal vec(0, 0), s.pos
+
+    s.pos = vec(1, 2)
+    assert_equal vec(1, 2), s.pos
+
+    s.pos = [3, 4]
+    assert_equal vec(3, 4), s.pos
+  end
+
+  def test_xy()
+    s = sprite
+    assert_equal     0,     s.x
+    assert_equal vec(0, 0), s.pos
+
+    s.x = 1
+    assert_equal     1,     s.x
+    assert_equal vec(1, 0), s.pos
+
+    s.y = 2
+    assert_equal        2,  s.y
+    assert_equal vec(1, 2), s.pos
+  end
+
+  def test_size()
+    assert_equal vec(0, 0), sprite                    .size
+    assert_equal vec(1, 0), sprite(0, 0, 1)           .size
+    assert_equal vec(1, 2), sprite(0, 0, 1, 2)        .size
+    assert_equal vec(3, 4), sprite(image: image(3, 4)).size
+  end
+
+  def test_wh()
+    assert_equal 1, sprite(0, 0, 1, 2).width
+    assert_equal 2, sprite(0, 0, 1, 2).height
+  end
+
+  def test_velocity()
+    s = sprite
+    assert_equal vec(0, 0), s.vel
+
+    s.vel = vec(1, 2)
+    assert_equal vec(1, 2), s.vel
+
+    s.vel = [3, 4]
+    assert_equal vec(3, 4), s.vel
+  end
+
+  def test_vxvy()
+    s = sprite
+    assert_equal     0,     s.vx
+    assert_equal vec(0, 0), s.vel
+
+    s.vx = 1
+    assert_equal     1,     s.vx
+    assert_equal vec(1, 0), s.vel
+
+    s.vy = 2
+    assert_equal        2,  s.vy
+    assert_equal vec(1, 2), s.vel
+  end
+
+  def test_image()
+    s = sprite
+    assert_equal nil,    s.image
+
+    s.image = image(1, 2)
+    assert_equal [1, 2], s.image.size
+
+    s.image = image(3, 4)
+    assert_equal [3, 4], s.image.size
+
+    s.image = nil
+    assert_equal nil,    s.image
+  end
+
+  def test_offset()
+    s = sprite
+    assert_equal nil,       s.offset
+
+    s.offset = [1, 2]
+    assert_equal vec(1, 2), s.offset
+
+    s.offset = vec(3, 4)
+    assert_equal vec(3, 4), s.offset
+
+    s.offset = nil
+    assert_equal nil,       s.offset
+
+    assert_raise(ArgumentError) {s.offset = 1}
+  end
+
+  def test_dynamic?()
+    s = sprite
+    assert_equal false, s.dynamic?
+
+    s.dynamic = true
+    assert_equal true,  s.dynamic?
+
+    s.dynamic = false
+    assert_equal false, s.dynamic?
+  end
+
+  def test_density()
+    s = sprite
+    assert_equal 0, s.dens
+
+    s.dens = 1
+    assert_equal 1, s.dens
+  end
+
+  def test_friction()
+    s = sprite
+    assert_equal 0, s.fric
+
+    s.fric = 1
+    assert_equal 1, s.fric
+  end
+
+  def test_restitution()
+    s = sprite
+    assert_equal 0, s.rest
+
+    s.rest = 1
+    assert_equal 1, s.rest
+  end
+
+  def test_blocks()
+    s = sprite
+    v = s.instance_variable_get :@view__
+    assert_nil v.update
+    assert_nil v.contact
+    assert_nil v.will_contact
+
+    s.update {}
+    assert_not_nil v.update
+    assert_nil     v.contact
+    assert_nil     v.will_contact
+
+    s.contact {}
+    assert_not_nil v.update
+    assert_not_nil v.contact
+    assert_nil     v.will_contact
+
+    s.contact? {}
+    assert_not_nil v.update
+    assert_not_nil v.contact
+    assert_not_nil v.will_contact
   end
 
 end# TestSprite

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.34
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.33
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement