rubysketch 0.5.4 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a93ef9dac4ae855bfa85f9a076ed05c807875db70be9c5e72419137499434e
-  data.tar.gz: 2f432e94c80ad231f50ca11df96ecd6a13c389551f75c426e161701e25d85a23
+  metadata.gz: a9465d904b4ad4eed514cb114281c1f19b49e692750456714152033cbabd3bea
+  data.tar.gz: aff3bf85d73c1dc26fc200647a77c0dc2c0133630450f33bb0e98c62b5ac6f5e
 SHA512:
-  metadata.gz: cdf7238a4d07fe88b5d1fe3d68ea6f62d9536b142afda5dad1f4c15538bae2047d4e188bbc88e0777d641650ad9c5f5864720345ad5ec950e2ff18e83f552db9
-  data.tar.gz: 310a71a0b3388876bd0c0910a09bb9aa12e5686e5885ec8e4b2a32cb4af629ed18a010731a77b4a8ea1a9a4be41de504098767d0d133e3344554d5078508ad29
+  metadata.gz: 68579b3732c2a114b8d421b61a92cbe611d412ed84bc3f1bb7cb3d81ff2cd28ecbbd35aa2469cad156fb7510cafcf624d79630a4422f4ba85ce98fd47a06b8c4
+  data.tar.gz: a8227ef0c4a0e7c9653f0825c3b8dfb74036058b2550cc1e5075f85d85579c1450e69f93d5bfd543e66f883b2798eca98af04b2f2747da7e54bdafeb5b99e60e

data/ChangeLog.md

@@ -1,6 +1,33 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.7] - 2023-05-13
+
+- Update dependencies
+
+
+## [v0.5.6] - 2023-05-11
+
+- Add Sprite#center accessor
+- Add Sprite#size=, Sprite#width=, and Sprite#height=
+
+
+## [v0.5.5] - 2023-05-08
+
+- Add Sprite#draw()
+- Add Sprite#angle accessor
+- Add Sprite#pivot accessor
+- Add Sprite#ox and Sprite#oy
+- Add mousePressed, mouseReleased, mouseMoved, mouseDragged, mouseClicked, touchStarted, touchEnded, and touchMoved to Sprite class
+- Add inspect() to classes
+- Alias draw methods
+- Sprite has density 1 by default
+- Sprite is static by deault
+- Add sprite.rb and physics.rb as an example
+- Delete Sound class
+- Remove wall collision by default
+
+
 ## [v0.5.4] - 2023-04-30
 
 - Add Sprite#image=() and Sprite#offset=()

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.7

data/examples/physics.rb

@@ -0,0 +1,24 @@
+%w[xot rucy beeps rays reflex processing rubysketch]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'rubysketch'
+using RubySketch
+
+noStroke
+gravity 0, 1000
+
+sprites = []
+ground  = createSprite 0, height - 10, width, 10
+
+draw do
+  background 100
+  sprite *sprites, ground
+end
+
+mousePressed do
+  sp             = createSprite mouseX, mouseY, 20, 20
+  sp.dynamic     = true
+  sp.restitution = 0.5
+  sprites << sp
+end

data/examples/sprite.rb

@@ -0,0 +1,47 @@
+%w[xot rucy beeps rays reflex processing rubysketch]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'rubysketch'
+using RubySketch
+
+sp = createSprite 100, 100, 50, 50
+sp.angle += Math::PI * 0.2
+
+red = 0
+
+sp.update do
+  red = (red + 1) % 255
+end
+
+sp.draw do |&draw|
+  fill red, 200, 200
+  draw.call
+  fill 0
+  text :hello, 10, 20
+end
+
+sp.mousePressed do
+  p [:pressed, sp.mouseX, sp.mouseY, sp.mouseButton]
+end
+
+sp.mouseReleased do
+  p [:released, sp.mouseX, sp.mouseY, sp.mouseButton]
+end
+
+sp.mouseMoved do
+  p [:moved, sp.mouseX, sp.mouseY, sp.pmouseX, sp.pmouseY]
+end
+
+sp.mouseDragged do
+  p [:dragged, sp.mouseX, sp.mouseY, sp.pmouseX, sp.pmouseY]
+end
+
+sp.mouseClicked do
+  p [:clicked, sp.mouseX, sp.mouseY, sp.mouseButton]
+end
+
+draw do
+  background 0
+  sprite sp
+end

data/lib/rubysketch/all.rb

@@ -6,8 +6,6 @@ require 'rubysketch/window'
 require 'rubysketch/helper'
 
 require 'rubysketch/sprite'
-require 'rubysketch/sound'
-require 'rubysketch/graphics_context'
 require 'rubysketch/context'
 
 

data/lib/rubysketch/context.rb

@@ -3,9 +3,6 @@ module RubySketch
 
   class Context < Processing::Context
 
-    include GraphicsContext
-
-    Sound  = RubySketch::Sound
     Sprite = RubySketch::Sprite
 
     # @private
@@ -43,13 +40,15 @@ module RubySketch
     #  @param [Vector]  off offset of sprite image
     #
     def createSprite(*args, **kwargs)
-      addSprite Sprite.new(*args, **kwargs)
+      addSprite Sprite.new(*args, **kwargs, context: self)
     end
 
     # Adds the sprite to the physics engine.
     #
     # @param [Sprite] sprite sprite object
     #
+    # @return [Sprite] added sprite
+    #
     def addSprite(sprite)
       @layer__.add sprite.getInternal__ if sprite
       sprite
@@ -59,14 +58,57 @@ module RubySketch
     #
     # @param [Sprite] sprite sprite object
     #
+    # @return [Sprite] removed sprite
+    #
     def removeSprite(sprite)
       @layer__.remove sprite.getInternal__ if sprite
       sprite
     end
 
+    # 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 do |sp|
+        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 {drawSprite__ sp, 0, 0, f.w, f.h}
+          end
+        elsif degrees == 0
+          drawSprite__ sp, 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
+            drawSprite__ sp, 0, 0, f.w, f.h
+          end
+        end
+      end
+      nil
+    end
+
+    alias drawSprite sprite
+
     # @private
-    def loadSound(path)
-      Sound.load path
+    def drawSprite__(sp, x, y, w, h)
+      img, off = sp.image, sp.offset
+      if img && off
+        copy img, off.x, off.y, w, h, x, y, w, h
+      elsif img
+        image img, x, y
+      else
+        rect x, y, w, h
+      end
     end
 
     # Sets gravity for the physics engine.
@@ -97,6 +139,11 @@ module RubySketch
   # @private
   class SpriteLayer < Reflex::View
 
+    def initialize(*a, **k, &b)
+      super
+      remove wall
+    end
+
     def on_draw(e)
       e.block
     end

data/lib/rubysketch/sprite.rb

@@ -5,6 +5,8 @@ module RubySketch
   #
   class Sprite
 
+    include Xot::Inspectable
+
     # Initialize sprite object.
     #
     # @overload new(image: img)
@@ -33,13 +35,20 @@ module RubySketch
     #  @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)
+    def initialize(
+      x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil,
+      context: 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)
 
-      @view__ = SpriteView.new(self, x: x, y: y, w: w, h: h, back: :white)
+      @context__ = context || Context.context__
+      @view__    = SpriteView.new(
+        self, x: x, y: y, w: w, h: h,
+        static: true, density: 1, friction: 0, restitution: 0,
+        back: :white)
 
       self.image  = image  if image
       self.offset = offset if offset
@@ -59,7 +68,7 @@ module RubySketch
     #  @param [Vector] vec position vector
     #
     # @overload position=(ary)
-    #  @param [Array<Numeric>] ary positionX, positionY
+    #  @param [Array<Numeric>] ary an array of positionX and positionY
     #
     # @return [Vector] position
     #
@@ -109,6 +118,30 @@ module RubySketch
     alias pos  position
     alias pos= position=
 
+    # Returns the center position of the sprite.
+    #
+    # @return [Vector] center position
+    #
+    def center()
+      Vector.new(x + w / 2, y + h / 2)
+    end
+
+    # Sets the center position of the sprite.
+    #
+    # @overload center=(vec)
+    #  @param [Vector] vec center position
+    #
+    # @overload center=(ary)
+    #  @param [Array<Numeric>] ary an array of centerX and centerY
+    #
+    # @return [Vector] center position
+    #
+    def center=(arg)
+      x, y = *(arg.is_a?(Vector) ? arg.getInternal__.to_a : arg)
+      self.pos = [x - w / 2, y - h / 2]
+      self.center
+    end
+
     # Returns the size of the sprite.
     #
     # @return [Vector] size
@@ -117,6 +150,15 @@ module RubySketch
       @view__.size.toVector
     end
 
+    # Returns the size of the sprite.
+    #
+    # @return [Vector] size
+    #
+    def size=(arg)
+      @view__.size = arg.is_a?(Vector) ? arg.getInternal__ : arg
+      arg
+    end
+
     # Returns the width of the sprite.
     #
     # @return [Numeric] width
@@ -125,6 +167,16 @@ module RubySketch
       @view__.width
     end
 
+    # Sets the width of the sprite.
+    #
+    # @param [Numeric] w width
+    #
+    # @return [Numeric] width
+    #
+    def width=(w)
+      @view__.width = w
+    end
+
     # Returns the height of the sprite.
     #
     # @return [Numeric] height
@@ -133,8 +185,62 @@ module RubySketch
       @view__.height
     end
 
-    alias w width
-    alias h height
+    # Sets the height of the sprite.
+    #
+    # @param [Numeric] h height
+    #
+    # @return [Numeric] height
+    #
+    def height=(h)
+      @view__.height = h
+    end
+
+    alias w  width
+    alias w= width=
+    alias h  height
+    alias h= height=
+
+    # Returns the rotation angle of sprite.
+    #
+    # @return [Numeric] radians or degrees depending on angleMode()
+    #
+    def angle()
+      a, c = @view__.angle, @context__
+      c ? c.fromDegrees__(a) : a * Processing::GraphicsContext::DEG2RAD__
+    end
+
+    # Sets the rotation angle of sprite.
+    #
+    # @param [Numeric] angle radians or degrees depending on angleMode()
+    #
+    # @return [Numeric] angle
+    #
+    def angle=(angle)
+      c = @context__
+      @view__.angle =
+        c ? c.toAngle__(angle) : angle * Processing::GraphicsContext::RAD2DEG__
+      angle
+    end
+
+    # Returns the rotation center of sprite.
+    #
+    # @return [Array<Numeric>] [pivotX, pivotY]
+    #
+    def pivot()
+      @view__.pivot.to_a[0, 2]
+    end
+
+    # Sets the rotation center of 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
+    #
+    # @return [Array<Numeric>] [pivotX, pivotY]
+    #
+    def pivot=(array)
+      @view__.pivot = array
+      pivot
+    end
 
     # Returns the velocity of the sprite.
     #
@@ -150,7 +256,7 @@ module RubySketch
     #  @param [Vector] vec velocity vector
     #
     # @overload velocity=(ary)
-    #  @param [Array<Numeric>] ary velocityX, velocityY
+    #  @param [Array<Numeric>] ary an array of velocityX and velocityY
     #
     # @return [Vector] velocity
     #
@@ -226,14 +332,62 @@ module RubySketch
       @offset__
     end
 
+    # Sets the offset of the sprite image.
+    #
+    # @overload offset=(vec)
+    #  @param [Vector] vec offset
+    #
+    # @overload velocity=(ary)
+    #  @param [Array<Numeric>] ary an array of offsetX and offsetY
+    #
+    # @return [Vector] offset of the sprite image
+    #
     def offset=(arg)
       @offset__ =
         case arg
         when Vector then arg
-        when Array  then Vector.new(*arg[0, 2])
+        when Array  then Vector.new(arg[0] || 0, arg[1] || 0)
         when nil    then nil
         else raise ArgumentError
         end
+      @offset__
+    end
+
+    # Returns the x-axis offset of the sprite image.
+    #
+    # @return [Numeric] offset.x
+    #
+    def ox()
+      @offset__&.x || 0
+    end
+
+    # Sets the x-axis offset of the sprite image.
+    #
+    # @param [Numeric] n x-axis offset
+    #
+    # @return [Numeric] offset.x
+    #
+    def ox=(n)
+      self.offset = [n, oy]
+      n
+    end
+
+    # Returns the y-axis offset of the sprite image.
+    #
+    # @return [Numeric] offset.y
+    #
+    def oy()
+      @offset__&.y || 0
+    end
+
+    # Sets the y-axis offset of the sprite image.
+    #
+    # @param [Numeric] n y-axis offset
+    #
+    # @return [Numeric] offset.y
+    #
+    def oy=(n)
+      self.offset = [ox, n]
     end
 
     # Returns whether the sprite is movable by the physics engine.
@@ -319,6 +473,54 @@ module RubySketch
     alias rest  restitution
     alias rest= restitution=
 
+    # Returns the x-position of the mouse in the sprite coordinates.
+    #
+    # @return [Numeric] x position
+    #
+    def mouseX()
+      @view__.mouseX
+    end
+
+    # Returns the y-position of the mouse in the sprite coordinates.
+    #
+    # @return [Numeric] y position
+    #
+    def mouseY()
+      @view__.mouseY
+    end
+
+    # Returns the previous x-position of the mouse in the sprite coordinates.
+    #
+    # @return [Numeric] x position
+    #
+    def pmouseX()
+      @view__.pmouseX
+    end
+
+    # Returns the previous y-position of the mouse in the sprite coordinates.
+    #
+    # @return [Numeric] y position
+    #
+    def pmouseY()
+      @view__.pmouseY
+    end
+
+    # Returns the mouse button clicked on the sprite.
+    #
+    # @return [LEFT, RIGHT, CENTER] mouse button
+    #
+    def mouseButton()
+      @view__.mouseButton
+    end
+
+    # Returns the touch objects touched on the sprite.
+    #
+    # @return [Array<Touch>] touches
+    #
+    def touches()
+      @view__.touches
+    end
+
     # Defines update block.
     #
     # @example vx is updated every frame
@@ -332,6 +534,134 @@ module RubySketch
       @view__.update = block
     end
 
+    # Defines draw block.
+    #
+    # @example Draw on your own before and after default drawing
+    #  sprite.draw do |&defaultDrawSprite|
+    #    rect 0, 0, 10, 10
+    #    defaultDrawSprite.call
+    #    text :hello, 10, 20
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def draw(&block)
+      @drawBlock__ = block
+      nil
+    end
+
+    # Defines mousePressed block.
+    #
+    # @example Print mouse states on mouse press
+    #  sprite.mousePressed do
+    #    p [sprite.mouseX, sprite.mouseY, sprite.mouseButton]
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def mousePressed(&block)
+      @view__.mousePressed = block
+      nil
+    end
+
+    # Defines mouseReleased block.
+    #
+    # @example Print mouse states on mouse release
+    #  sprite.mouseReleased do
+    #    p [sprite.mouseX, sprite.mouseY, sprite.mouseButton]
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def mouseReleased(&block)
+      @view__.mouseReleased = block
+      nil
+    end
+
+    # Defines mouseMoved block.
+    #
+    # @example Print mouse states on mouse move
+    #  sprite.mouseMoved do
+    #    p [sprite.mouseX, sprite.mouseY, sprite.pmouseX, sprite.pmouseY]
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def mouseMoved(&block)
+      @view__.mouseMoved = block
+      nil
+    end
+
+    # Defines mouseDragged block.
+    #
+    # @example Print mouse states on mouse drag
+    #  sprite.mouseDragged do
+    #    p [sprite.mouseX, sprite.mouseY, sprite.pmouseX, sprite.pmouseY]
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def mouseDragged(&block)
+      @view__.mouseDragged = block
+      nil
+    end
+
+    # Defines mouseClicked block.
+    #
+    # @example Print mouse states on mouse click
+    #  sprite.mouseClicked do
+    #    p [sprite.mouseX, sprite.mouseY, sprite.mouseButton]
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def mouseClicked(&block)
+      @view__.mouseClicked = block
+      nil
+    end
+
+    # Defines touchStarted block.
+    #
+    # @example Print touches on touch start
+    #  sprite.touchStarted do
+    #    p sprite.touches
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def touchStarted(&block)
+      @view__.touchStarted = block
+      nil
+    end
+
+    # Defines touchEnded block.
+    #
+    # @example Print touches on touch end
+    #  sprite.touchEnded do
+    #    p sprite.touches
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def touchEnded(&block)
+      @view__.touchEnded = block
+      nil
+    end
+
+    # Defines touchMoved block.
+    #
+    # @example Print touches on touch move
+    #  sprite.touchMoved do
+    #    p sprite.touches
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def touchMoved(&block)
+      @view__.touchMoved = block
+      nil
+    end
+
     # Defines contact block.
     #
     # @example Score increases when the player sprite touches a coin
@@ -347,7 +677,7 @@ module RubySketch
 
     # Defines contact? block.
     #
-    # @example only collide with an enemy
+    # @example Only collide with an enemy
     #  playerSprite.contact? do |o|
     #    o.enemy?
     #  end
@@ -358,18 +688,6 @@ module RubySketch
       @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__
@@ -381,28 +699,106 @@ module RubySketch
   # @private
   class SpriteView < Reflex::View
 
-    attr_accessor :update, :contact, :will_contact
-    attr_reader :sprite
+    attr_accessor :update,
+      :mousePressed, :mouseReleased, :mouseMoved, :mouseDragged, :mouseClicked,
+      :touchStarted, :touchEnded, :touchMoved,
+      :contact, :will_contact
+
+    attr_reader :sprite, :touches
 
     def initialize(sprite, *a, **k, &b)
       @sprite = sprite
       super(*a, **k, &b)
+
+      @pointerPos       =
+      @pointerPrevPos   = Rays::Point.new 0
+      @pointersPressed  = []
+      @pointersReleased = []
+      @touches          = []
+    end
+
+    def mouseX()
+      @pointerPos.x
+    end
+
+    def mouseY()
+      @pointerPos.y
+    end
+
+    def pmouseX()
+      @pointerPrevPos.x
+    end
+
+    def pmouseY()
+      @pointerPrevPos.y
+    end
+
+    def mouseButton()
+      ((@pointersPressed + @pointersReleased) & [LEFT, RIGHT, CENTER]).last
     end
 
     def on_update(e)
-      @update.call if @update
+      @update&.call
+    end
+
+    def on_pointer_down(e)
+      updatePointerStates e, true
+      @pointerDownStartPos = @pointerPos.dup
+      (@touchStarted || @mousePressed)&.call
+    end
+
+    def on_pointer_up(e)
+      updatePointerStates e, false
+      (@touchEnded || @mouseReleased)&.call
+      if startPos = @pointerDownStartPos
+        @mouseClicked&.call if (@pointerPos - startPos).length < 3
+        @pointerDownStartPos = nil
+      end
+      @pointersReleased.clear
+    end
+
+    def on_pointer_move(e)
+      updatePointerStates e
+      (@touchMoved || (e.drag? ? @mouseDragged : @mouseMoved))&.call
+    end
+
+    def on_pointer_cancel(e)
+      on_pointer_up e
     end
 
     def on_contact(e)
       v = e.view
-      @contact.call v.sprite, e.action if @contact && v.is_a?(SpriteView)
+      @contact.call v.sprite, e.action if @contact && v.respond_to?(:sprite)
     end
 
     def will_contact?(v)
-      return true if !@will_contact || !v.is_a?(SpriteView)
+      return true unless @will_contact && v.respond_to?(:sprite)
       @will_contact.call v.sprite
     end
 
+    private
+
+    MOUSE_BUTTON_MAP = {
+      mouse_left:   Processing::GraphicsContext::LEFT,
+      mouse_right:  Processing::GraphicsContext::RIGHT,
+      mouse_middle: Processing::GraphicsContext::CENTER
+    }
+
+    def updatePointerStates(event, pressed = nil)
+      @pointerPrevPos = @pointerPos
+      @pointerPos     = event.pos.dup
+      @touches        = event.pointers.map {|p| Touch.new(p.id, *p.pos.to_a)}
+      if pressed != nil
+        event.types
+          .tap {|types| types.delete :mouse}
+          .map {|type| MOUSE_BUTTON_MAP[type] || type}
+          .each do |type|
+            (pressed ? @pointersPressed : @pointersReleased).push type
+            @pointersPressed.delete type unless pressed
+          end
+      end
+    end
+
   end# SpriteView
 
 

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.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_runtime_dependency 'xot',        '~> 0.1.35'
+  s.add_runtime_dependency 'rucy',       '~> 0.1.35'
+  s.add_runtime_dependency 'beeps',      '~> 0.1.36'
+  s.add_runtime_dependency 'rays',       '~> 0.1.36'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.38'
+  s.add_runtime_dependency 'processing', '~> 0.5.8'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/test/helper.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[../xot ../rucy ../beeps ../rays ../reflex ../processing .]
   .map  {|s| File.expand_path "../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/test/test_sprite.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 
@@ -67,16 +64,65 @@ class TestSprite < Test::Unit::TestCase
     assert_equal vec(1, 2), s.pos
   end
 
+  def test_center()
+    s = sprite 0, 0, 10, 20
+    assert_equal vec( 5, 10),   s.center
+
+    s.center =   vec 100, 200
+    assert_equal vec( 95, 190), s.pos
+
+    s.center =      [300, 400]
+    assert_equal vec(295, 390), 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
+
+    s      = sprite
+    s.size =     vec 10, 20
+    assert_equal vec(10, 20), s.size
+
+    s.size =        [30, 40]
+    assert_equal vec(30, 40), s.size
   end
 
   def test_wh()
     assert_equal 1, sprite(0, 0, 1, 2).width
+    assert_equal 1, sprite(0, 0, 1, 2).w
     assert_equal 2, sprite(0, 0, 1, 2).height
+    assert_equal 2, sprite(0, 0, 1, 2).h
+
+    s        = sprite
+    s.width  =       10
+    assert_equal vec(10, 0),  s.size
+
+    s.w      =       20
+    assert_equal vec(20, 0),  s.size
+
+    s.height =           30
+    assert_equal vec(20, 30), s.size
+
+    s.h      =           40
+    assert_equal vec(20, 40), s.size
+  end
+
+  def test_angle()
+    s = sprite
+    assert_equal 0,             s.angle
+
+    s.angle = Math::PI
+    assert_in_epsilon Math::PI, s.angle
+  end
+
+  def test_pivot()
+    s = sprite
+    assert_each_in_epsilon [0, 0],     s.pivot
+
+    s.pivot =              [0.1, 0.2]
+    assert_each_in_epsilon [0.1, 0.2], s.pivot
   end
 
   def test_velocity()
@@ -122,18 +168,44 @@ class TestSprite < Test::Unit::TestCase
     s = sprite
     assert_equal nil,       s.offset
 
-    s.offset = [1, 2]
+    s.offset =      [1, 2]
     assert_equal vec(1, 2), s.offset
 
-    s.offset = vec(3, 4)
+    s.offset =   vec(3, 4)
     assert_equal vec(3, 4), s.offset
 
-    s.offset = nil
+    s.offset =      [5]
+    assert_equal vec(5, 0), s.offset
+
+    s.offset =      []
+    assert_equal vec(0, 0), s.offset
+
+    s.offset =   nil
     assert_equal nil,       s.offset
 
     assert_raise(ArgumentError) {s.offset = 1}
   end
 
+  def test_oxoy()
+    s = sprite
+    assert_equal    [0, 0], [s.ox, s.oy]
+    assert_equal    nil,    s.offset
+
+    s.ox = 1
+    assert_equal    [1, 0], [s.ox, s.oy]
+    assert_equal vec(1, 0), s.offset
+
+    s = sprite
+
+    s.oy = 2
+    assert_equal    [0, 2], [s.ox, s.oy]
+    assert_equal vec(0, 2), s.offset
+
+    s.offset = nil
+    assert_equal    [0, 0], [s.ox, s.oy]
+    assert_equal    nil,    s.offset
+  end
+
   def test_dynamic?()
     s = sprite
     assert_equal false, s.dynamic?
@@ -147,10 +219,10 @@ class TestSprite < Test::Unit::TestCase
 
   def test_density()
     s = sprite
-    assert_equal 0, s.dens
-
-    s.dens = 1
     assert_equal 1, s.dens
+
+    s.dens = 2
+    assert_equal 2, s.dens
   end
 
   def test_friction()
@@ -192,4 +264,8 @@ class TestSprite < Test::Unit::TestCase
     assert_not_nil v.will_contact
   end
 
+  def test_inspect()
+    assert_match %r|#<RubySketch::Sprite:0x\w{16}>|, sprite.inspect
+  end
+
 end# TestSprite

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.7
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-05-12 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.34
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.36
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.34
+        version: 0.1.36
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.35
+        version: 0.1.38
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,13 +156,13 @@ files:
 - RubySketch.podspec
 - VERSION
 - examples/hello.rb
+- examples/physics.rb
+- examples/sprite.rb
 - lib/rubysketch.rb
 - lib/rubysketch/all.rb
 - lib/rubysketch/context.rb
 - lib/rubysketch/extension.rb
-- lib/rubysketch/graphics_context.rb
 - lib/rubysketch/helper.rb
-- lib/rubysketch/sound.rb
 - lib/rubysketch/sprite.rb
 - lib/rubysketch/window.rb
 - pod.rake
@@ -170,7 +170,6 @@ files:
 - src/RubySketch.h
 - src/RubySketch.mm
 - test/helper.rb
-- test/test_sound.rb
 - test/test_sprite.rb
 homepage: https://github.com/xord/rubysketch
 licenses: []
@@ -196,5 +195,4 @@ specification_version: 4
 summary: A game engine based on the Processing API.
 test_files:
 - test/helper.rb
-- test/test_sound.rb
 - test/test_sprite.rb

data/lib/rubysketch/graphics_context.rb

@@ -1,30 +0,0 @@
-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 = v.frame, v.angle
-        if angle == 0
-          sp.on_draw__ f.x, f.y, f.w, f.h
-        else
-          pushMatrix do
-            translate f.x, f.y
-            rotate radians(angle)
-            sp.on_draw__ 0, 0, f.w, f.h
-          end
-        end
-      end
-    end
-
-  end# GraphicsContext
-
-
-end# RubySketch

data/lib/rubysketch/sound.rb

@@ -1,86 +0,0 @@
-module RubySketch
-
-
-  # @private
-  class Sound
-
-    # @private
-    def initialize(sound)
-      @sound = sound
-    end
-
-    # Play sound.
-    #
-    def play()
-      old = @player
-      @player = @sound.play
-      old&.stop
-      true
-    end
-
-    # Pause sound.
-    #
-    def pause()
-      return false unless @player
-      @player.pause
-      true
-    end
-
-    # Stop sound.
-    #
-    def stop()
-      return false unless @player
-      @player.stop
-      @player = nil
-      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?()
-      @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)
-    end
-
-  end# Sound
-
-
-end# RubySketch

data/test/test_sound.rb

@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-require_relative 'helper'
-
-
-class TestSound < Test::Unit::TestCase
-
-  RS = RubySketch
-  B  = Beeps
-
-  PATH = 'test.wav'
-
-  def sound()
-    RS::Sound.load PATH
-  end
-
-  def setup()
-    B::Sound.new(B::Oscillator.new >> B::Gain.new(gain: 0), 0.1).save PATH
-  end
-
-  def teardown()
-    B::SoundPlayer.stop_all
-    File.delete PATH if File.exist?(PATH)
-  end
-
-  def test_play()
-    s = sound
-    assert_equal [false, false, true],  [s.playing?, s.paused?, s.stopped?]
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_pause()
-    s = sound
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-    s.pause
-    assert_equal [false, true,  false], [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_stop()
-    s = sound
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-    s.stop
-    assert_equal [false, false, true],  [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_play_end_then_stop()
-    s = sound
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-    sleep 0.2
-    assert_equal [false, false, true],  [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_play_after_pause()
-    s = sound
-    s.play
-    s.pause
-    assert_equal [false, true,  false], [s.playing?, s.paused?, s.stopped?]
-    s.play
-    assert_equal [true,  false, false], [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_stop_after_pause()
-    s = sound
-    s.play
-    s.pause
-    assert_equal [false, true,  false], [s.playing?, s.paused?, s.stopped?]
-    s.stop
-    assert_equal [false, false, true],  [s.playing?, s.paused?, s.stopped?]
-  end
-
-  def test_save_load()
-    s = sound
-
-    File.delete PATH
-    assert_false File.exist? PATH
-
-    s.save PATH
-    assert_true  File.exist? PATH
-
-    assert_nothing_raised {RS::Sound.load(PATH).play}
-  end
-
-end# TestSound