rubysketch 0.7 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5b5a3bdcb9365635d1d4509650462be5ad4c7b388c1e5890e450bbdfbafe62e
-  data.tar.gz: 53356ca730ba8f0028bb4eac2d282f8d49fd3652d332959e41b8f0442395ed87
+  metadata.gz: 128e3372ca4c86e23ed577d27da331f1e032fc5d62caef06914ef6b5b5e26587
+  data.tar.gz: c6e0ce577b7a63fb20eb7d07283fba86e4816d7dd334759ea51ce0c803012d60
 SHA512:
-  metadata.gz: 3d1a7ce424660280b3084cdaf72ad2a1d5c9c2bd9908d792a053f7f11ca8b5728693545d63de35bb33e7affd1f2632b4e144ca2360d69e91175c9d2f36941863
-  data.tar.gz: 22da78a09bafff3e96b71b9ae4742384891a97039baaa8ea98d093c5c493e55d09a61f218d0a34c4a62587a7aa2e1add20430da74402fc707293313620cbcdd9
+  metadata.gz: 840bcc958ab2ce6f9fb5f32b77de389b7adc8b8d048ddcc97a07b54786ded6f3b09d2b66335c53d7852d0f22b0becc5a581bdddac0e2744ec20cf49d941e2f22
+  data.tar.gz: e1f631877a8eba471de0122ea02a025f1ee250f3a1558a0795ea6fa9b54120597e48153aa3afa6ba729f72a2e5782e07ccfbaa5179172850bdca85c00ab54303

data/.github/workflows/utils.rb

@@ -20,7 +20,7 @@ def setup_dependencies(build: true, only: nil)
 
   exts.each do |ext|
     gem   = RENAMES[ext.to_sym].then {|s| s || ext}
-    ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+    ver   = gemspec[/add_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}"
 

data/ChangeLog.md

@@ -1,6 +1,19 @@
 # rubysketch ChangeLog
 
 
+## [v0.7.2] - 2025-01-14
+
+- Update workflow files
+- Set minumum version for runtime dependency
+
+
+## [v0.7.1] - 2025-01-13
+
+- Add SpriteWorld class
+- addSprite and removeSprite can take many sprites
+- Sprite#hide returns self
+
+
 ## [v0.7] - 2024-07-06
 
 - Support Windows

data/Gemfile.lock

@@ -3,16 +3,14 @@ GEM
   specs:
     power_assert (2.0.3)
     rake (13.1.0)
-    rexml (3.3.1)
-      strscan
-    strscan (3.1.0)
+    rexml (3.4.0)
     test-unit (3.6.1)
       power_assert
     yard (0.9.34)
 
 PLATFORMS
   arm64-darwin-21
-  arm64-darwin-22
+  arm64-darwin-23
 
 DEPENDENCIES
   rake

data/Rakefile

@@ -1,6 +1,5 @@
 # -*- mode: ruby -*-
 
-
 %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/VERSION

@@ -1 +1 @@
-0.7
+0.7.2

data/lib/rubysketch/context.rb

@@ -3,18 +3,20 @@ module RubySketch
 
   class Context < Processing::Context
 
-    Sprite = RubySketch::Sprite
-    Circle = RubySketch::Circle
-    Sound  = RubySketch::Sound
+    Sprite      = RubySketch::Sprite
+    SpriteWorld = RubySketch::SpriteWorld
+    Circle      = RubySketch::Circle
+    Sound       = RubySketch::Sound
 
     # @private
     def initialize(window)
       super
+      @window__                                  = window
       @timers__, @firingTimers__, @nextTimerID__ = {}, {}, 0
 
-      @layer__ = window.add_overlay SpriteLayer.new
+      @world__ = createWorld
 
-      window.update_window = proc do
+      @window__.update_window = proc do
         fireTimers__
         Beeps.process_streams!
       end
@@ -114,10 +116,10 @@ module RubySketch
           block.call fun.call(1.0), true
         else
           block.call fun.call(t), false
-          setTimeout 0, id: id, &eachDrawBlock
+          setTimeout id: id, &eachDrawBlock
         end
       end
-      setTimeout 0, id: id, &eachDrawBlock
+      setTimeout id: id, &eachDrawBlock
     end
 
     # Animate value with easing functions
@@ -188,30 +190,30 @@ module RubySketch
     #  @param [Numeric] y   y of the sprite position
     #  @param [Shape]   shp shape of the sprite for physics calculations
     #
+    # @return [Sprite] the new sprite object
+    #
     def createSprite(*args, **kwargs)
-      addSprite Sprite.new(*args, **kwargs, context: self)
+      @world__.createSprite(*args, context: self, **kwargs)
     end
 
-    # Adds the sprite to the physics engine.
+    # Adds sprites to the physics engine.
     #
-    # @param [Sprite] sprite sprite object
+    # @param [Sprite] sprites sprite objects
     #
-    # @return [Sprite] added sprite
+    # @return [Sprite] first added sprite
     #
-    def addSprite(sprite)
-      @layer__.add sprite.getInternal__ if sprite
-      sprite
+    def addSprite(*sprites)
+      @world__.addSprite(*sprites)
     end
 
-    # Removes the sprite from the physics engine.
+    # Removes sprites from the physics engine.
     #
-    # @param [Sprite] sprite sprite object
+    # @param [Sprite] sprites sprite objects
     #
-    # @return [Sprite] removed sprite
+    # @return [Sprite] first removed sprite
     #
-    def removeSprite(sprite)
-      @layer__.remove sprite.getInternal__ if sprite
-      sprite
+    def removeSprite(*sprites)
+      @world__.removeSprite(*sprites)
     end
 
     # Draws one or more sprites.
@@ -249,6 +251,36 @@ module RubySketch
 
     alias drawSprite sprite
 
+    # Creates a new world to calculate the physics of sprites.
+    #
+    # @return [SpriteWorld] the new world object
+    #
+    def createWorld(pixels_per_meter: 0)
+      addWorld SpriteWorld.new pixels_per_meter: pixels_per_meter
+    end
+
+    # Adds worlds
+    #
+    # @param [SpriteWorld] worlds world objects
+    #
+    # @return [SpriteWorld] first added world
+    #
+    def addWorld(*worlds)
+      worlds.each {@window__.add_overlay _1.getInternal__}
+      worlds.first
+    end
+
+    # Removes worlds
+    #
+    # @param [SpriteWorld] worlds world objects
+    #
+    # @return [SpriteWorld] first removed world
+    #
+    def removeWorld(*worlds)
+      worlds.each {@window__.remove_overlay _1.getInternal__}
+      worlds.first
+    end
+
     # Loads sound file.
     #
     # @param [String] path path for sound file
@@ -271,40 +303,21 @@ module RubySketch
     #  @param [Numeric] x x of gravity vector
     #  @param [Numeric] y y of gracity vector
     #
-    def gravity(*args)
-      x, y =
-        case arg = args.first
-        when Vector then arg.array
-        when Array  then arg
-        else args
-        end
-      @layer__.gravity x, y
+    # @return [nil] nil
+    #
+    def gravity(...)
+      @world__.gravity(...)
     end
 
     # Generates haptic feedback
     #
     # @return [nil] nil
     #
-    def vibrate ()
+    def vibrate()
       Reflex.vibrate
     end
 
   end# Context
 
 
-  # @private
-  class SpriteLayer < Reflex::View
-
-    def initialize(*a, **k, &b)
-      super
-      remove wall
-    end
-
-    def on_draw(e)
-      e.block false
-    end
-
-  end# SpriteLayer
-
-
 end# RubySketch

data/lib/rubysketch/sprite.rb

@@ -65,7 +65,7 @@ module RubySketch
 
       @context__ = context || Context.context__
       @shape__   = shape
-      @view__    = SpriteView.new(
+      @view__    = View.new(
         self, x: x, y: y, w: w, h: h,
         shape: @shape__, physics: physics, back: :white)
       @view__.set density: 1, friction: 0, restitution: 0
@@ -93,6 +93,7 @@ module RubySketch
     #
     def hide()
       @view__.hide
+      self
     end
 
     # Returns the sprite is visible
@@ -915,8 +916,132 @@ module RubySketch
   end# Sprite
 
 
+  # A class Manages sprites.
+  #
+  class SpriteWorld
+
+    # Create a new physics world
+    #
+    def initialize(pixels_per_meter: 0)
+      @view, @debug = View.new(pixels_per_meter: pixels_per_meter), false
+    end
+
+    # Creates a new sprite and add it to physics engine.
+    #
+    # @overload createSprite(x, y, w, h)
+    #  pos(x, y), size: [w, h]
+    #  @param [Numeric] x x of the sprite position
+    #  @param [Numeric] y y of the sprite position
+    #  @param [Numeric] w width of the sprite
+    #  @param [Numeric] h height of the sprite
+    #
+    # @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 the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Image]   img sprite image
+    #
+    # @overload createSprite(x, y, image: img, offset: off)
+    #  pos: [x, y], size: [image.width, image.height], offset: [offset.x, offset.x]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Image]   img sprite image
+    #  @param [Vector]  off offset of the sprite image
+    #
+    # @overload createSprite(x, y, image: img, shape: shp)
+    #  pos: [x, y], size: [image.width, image.height]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Image]   img sprite image
+    #
+    # @overload createSprite(x, y, image: img, offset: off, shape: shp)
+    #  pos: [x, y], size: [image.width, image.height], offset: [offset.x, offset.x]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Image]   img sprite image
+    #  @param [Vector]  off offset of the sprite image
+    #  @param [Shape]   shp shape of the sprite for physics calculations
+    #
+    # @overload createSprite(x, y, shape: shp)
+    #  pos: [x, y], size: [shape.width, shape.height]
+    #  @param [Numeric] x   x of the sprite position
+    #  @param [Numeric] y   y of the sprite position
+    #  @param [Shape]   shp shape of the sprite for physics calculations
+    #
+    # @return [Sprite] the new sprite object
+    #
+    def createSprite(*args, context: nil, **kwargs)
+      context ||= Context.context__
+      addSprite Sprite.new(*args, context: context, **kwargs)
+    end
+
+    # Adds sprites to the physics engine.
+    #
+    # @param [Sprite] sprites sprite objects
+    #
+    # @return [Sprite] first added sprite
+    #
+    def addSprite(*sprites)
+      sprites.each {@view.add _1.getInternal__}
+      sprites.first
+    end
+
+    # Removes sprites from the physics engine.
+    #
+    # @param [Sprite] sprites sprite objects
+    #
+    # @return [Sprite] first removed sprite
+    #
+    def removeSprite(*sprites)
+      sprites.each {@view.remove _1.getInternal__}
+      sprites.first
+    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
+    #
+    # @return [nil] nil
+    #
+    def gravity(*args)
+      x, y =
+        case arg = args.first
+        when Vector then arg.array
+        when Array  then arg
+        else args
+        end
+      @view.gravity x, y
+      nil
+    end
+
+    def debug=(state)
+      @view.debug = state
+    end
+
+    def debug? = @view.debug?
+
+    # @private
+    def getInternal__()
+      @view
+    end
+
+  end# SpriteWorld
+
+
   # @private
-  class SpriteView < Reflex::View
+  class Sprite::View < Reflex::View
 
     attr_accessor :update,
       :mousePressed, :mouseReleased, :mouseMoved, :mouseDragged, :mouseClicked,
@@ -976,33 +1101,33 @@ module RubySketch
       updatePointerStates e
       updatePointersPressedAndReleased e, true
       @pointerDownStartPos = to_screen @pointer.pos
-      if e.view_index == 0
-        call_block @mousePressed if e.any? {|p| p.id == @pointer.id}
-        call_block @touchStarted
-      end
+
+      call_block @mousePressed if e.any? {|p| p.id == @pointer.id}
+      call_block @touchStarted
+
+      e.block
     end
 
     def on_pointer_up(e)
       updatePointerStates e
       updatePointersPressedAndReleased e, false
-      if e.view_index == 0
-        if e.any? {|p| p.id == @pointer.id}
-          call_block @mouseReleased
-          call_block @mouseClicked if mouseClicked?
-        end
-        call_block @touchEnded
+
+      if e.any? {|p| p.id == @pointer.id}
+        call_block @mouseReleased
+        call_block @mouseClicked if mouseClicked?
       end
+      call_block @touchEnded
+
       @pointerDownStartPos = nil
       @pointersReleased.clear
     end
 
     def on_pointer_move(e)
       updatePointerStates e
-      if e.view_index == 0
-        mouseMoved = e.drag? ? @mouseDragged : @mouseMoved
-        call_block mouseMoved if e.any? {|p| p.id == @pointer.id}
-        call_block @touchMoved
-      end
+
+      mouseMoved = e.drag? ? @mouseDragged : @mouseMoved
+      call_block mouseMoved if e.any? {|p| p.id == @pointer.id}
+      call_block @touchMoved
     end
 
     def on_pointer_cancel(e)
@@ -1070,7 +1195,28 @@ module RubySketch
       $stderr.puts e.full_message
     end
 
-  end# SpriteView
+  end# Sprite::View
+
+
+  # @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
+      super(*a, **k, &b)
+      @debug = false
+      remove wall
+    end
+
+    attr_writer :debug
+
+    def debug? = @debug
+
+    def on_draw(e)
+      e.block false unless debug?
+    end
+
+  end# SpriteWorld::View
 
 
 end# RubySketch

data/lib/rubysketch.rb

@@ -4,23 +4,25 @@ require 'rubysketch/all'
 module RubySketch
   w = (ENV['WIDTH']  || 500).to_i
   h = (ENV['HEIGHT'] || 500).to_i
-  WINDOW  = Processing::Window.new(w, h) {start}
-  CONTEXT = RubySketch::Context.new WINDOW
+  WINDOW__  = Processing::Window.new(w, h) {start}
+  CONTEXT__ = RubySketch::Context.new WINDOW__
 
   refine Object do
-    (CONTEXT.methods - Object.instance_methods).each do |method|
-      define_method method do |*args, **kwargs, &block|
-        CONTEXT.__send__ method, *args, **kwargs, &block
+    (CONTEXT__.methods - Object.instance_methods)
+      .reject {_1 =~ /__$/} # methods for internal use
+      .each do |method|
+        define_method(method) do |*args, **kwargs, &block|
+          CONTEXT__.__send__(method, *args, **kwargs, &block)
+        end
       end
-    end
   end
 end# RubySketch
 
 
 begin
-  w, c = RubySketch::WINDOW, RubySketch::CONTEXT
+  w, c = RubySketch::WINDOW__, RubySketch::CONTEXT__
 
-  c.class.constants.each do |const|
+  c.class.constants.reject {_1 =~ /__$/}.each do |const|
     self.class.const_set const, c.class.const_get(const)
   end
 

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_runtime_dependency 'xot',        '~> 0.3'
-  s.add_runtime_dependency 'rucy',       '~> 0.3'
-  s.add_runtime_dependency 'beeps',      '~> 0.3'
-  s.add_runtime_dependency 'rays',       '~> 0.3'
-  s.add_runtime_dependency 'reflexion',  '~> 0.3'
-  s.add_runtime_dependency 'processing', '~> 1.1'
+  s.add_dependency 'xot',        '~> 0.3.2', '>= 0.3.2'
+  s.add_dependency 'rucy',       '~> 0.3.2', '>= 0.3.2'
+  s.add_dependency 'beeps',      '~> 0.3.2', '>= 0.3.2'
+  s.add_dependency 'rays',       '~> 0.3.2', '>= 0.3.2'
+  s.add_dependency 'reflexion',  '~> 0.3.2', '>= 0.3.2'
+  s.add_dependency 'processing', '~> 1.1',   '>= 1.1.2'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}

data/src/RubySketch.mm

@@ -72,8 +72,8 @@ ReflexViewController_show (UIViewController*, ReflexViewController*)
 		CRBValue* ret = [CRuby evaluate:[NSString stringWithFormat:@
 			"raise 'already started' unless require 'rubysketch'\n"
 			"load '%@'\n"
-			"RubySketch::WINDOW.__send__ :end_draw\n"
-			"RubySketch::WINDOW.show",
+			"RubySketch::WINDOW__.__send__ :end_draw\n"
+			"RubySketch::WINDOW__.show",
 			path
 		]];
 		return ret && ret.toBOOL;

data/test/test_context.rb

@@ -0,0 +1,31 @@
+require_relative 'helper'
+
+
+class TestContext < Test::Unit::TestCase
+
+  RS = RubySketch
+  P  = Processing
+
+  def context()
+    RS::Context.new P::Window.new
+  end
+
+  def sprite(*args, **kwargs)
+    RS::Sprite.new(*args, **kwargs)
+  end
+
+  def test_addSprite()
+    sp = sprite
+    assert_nil       context.addSprite()
+    assert_equal sp, context.addSprite(sp)
+    assert_equal sp, context.addSprite(sp, sprite)
+  end
+
+  def test_removeSprite()
+    sp = sprite
+    assert_nil       context.removeSprite()
+    assert_equal sp, context.removeSprite(sp)
+    assert_equal sp, context.removeSprite(sp, sprite)
+  end
+
+end# TestContext

data/test/test_sound.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require_relative 'helper'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.7.2
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,70 +16,100 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +117,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,6 +127,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 description: A game engine based on the Processing API.
 email: xordog@gmail.com
 executables: []
@@ -132,6 +168,7 @@ files:
 - src/RubySketch.h
 - src/RubySketch.mm
 - test/helper.rb
+- test/test_context.rb
 - test/test_sound.rb
 - test/test_sprite.rb
 homepage: https://github.com/xord/rubysketch
@@ -159,5 +196,6 @@ specification_version: 4
 summary: A game engine based on the Processing API.
 test_files:
 - test/helper.rb
+- test/test_context.rb
 - test/test_sound.rb
 - test/test_sprite.rb