rubysketch 0.6.3 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f36366507d893f908da9d3b2fa6430ac8c954f6d0558abb6f1e361c85cfc9f30
-  data.tar.gz: 3555eadca0ce22d0bcf8b229022dae9c530a35b287b9b432243977dcfa348a01
+  metadata.gz: 39478a6f3e2c65548b50f8f96193c444f5379a1a5e91e3ec25bdb1fa47be87d8
+  data.tar.gz: 17ede8ee12ae9631ea9cb926c60601f121339ab4fe923ac8bcb282739a5d2a9d
 SHA512:
-  metadata.gz: ed560028a92b940c8424a330cd2149918fe74a39e0e749517a262356f2970bcf191dc42f38169c069918b78e27c80cf5f4deb01ee6ae72c80736fad17b9431ab
-  data.tar.gz: f3a445a51801e064dd6565dce2f32f7776b039cde3301242a13655db022a03d6fdaa5a5c97f583a2baf096152e10f742b8545b80f04ba9427113db8333225677
+  metadata.gz: dd9298f2872be15f43011257793f4538b03cef526cb69b2b6391ec2a0b1fe3f828dcc6514c47971c853a3a74cb57c9c39b7341926dda2bd525e48a14a29ad38e
+  data.tar.gz: 33fcf3fd9474370239f7f3403ff34796c7f2301fa9ed7cd540870dfc95ce9c6f5a464db309a0412d53e106616ead1337710e3c091a77d67f247b885952fe2f64

data/.github/workflows/release-gem.yml

@@ -24,7 +24,7 @@ jobs:
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
       - name: test
-        run: bundle exec rake quiet test
+        run: bundle exec rake quiet packages test
 
       - name: create gem
         id: gem

data/.github/workflows/test.yml

@@ -24,6 +24,9 @@ jobs:
       - name: setup dependencies
         run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
 
+      - name: packages
+        run: bundle exec rake packages
+
       - name: lib
         run: bundle exec rake lib
 

data/ChangeLog.md

@@ -1,6 +1,18 @@
 # rubysketch ChangeLog
 
 
+## [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
+
+
 ## [v0.6.3] - 2024-07-05
 
 - Update workflows for test

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)}
@@ -22,6 +21,6 @@ ENV['RDOC'] = 'yardoc --no-private'
 
 default_tasks
 use_bundler
-test_ruby_extension
+test_ruby_extension unless github_actions? && win32?
 generate_documents
 build_ruby_gem

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.7.1

data/lib/rubysketch/all.rb

@@ -1,5 +1,5 @@
-require 'beeps'
 require 'processing/all'
+require 'beeps'
 
 require 'rubysketch/extension'
 require 'rubysketch/helper'

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.2.1'
-  s.add_runtime_dependency 'rucy',       '~> 0.2.1'
-  s.add_runtime_dependency 'beeps',      '~> 0.2.1'
-  s.add_runtime_dependency 'rays',       '~> 0.2.1'
-  s.add_runtime_dependency 'reflexion',  '~> 0.2.1'
-  s.add_runtime_dependency 'processing', '~> 1.0'
+  s.add_runtime_dependency 'xot',        '~> 0.3.1'
+  s.add_runtime_dependency 'rucy',       '~> 0.3.1'
+  s.add_runtime_dependency 'beeps',      '~> 0.3.1'
+  s.add_runtime_dependency 'rays',       '~> 0.3.1'
+  s.add_runtime_dependency 'reflexion',  '~> 0.3.1'
+  s.add_runtime_dependency 'processing', '~> 1.1'
 
   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,34 @@
+require_relative 'helper'
+
+
+return if ci? # TODO: fix tests fail on github actions
+
+
+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.6.3
+  version: 0.7.1
 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,84 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 description: A game engine based on the Processing API.
 email: xordog@gmail.com
 executables: []
@@ -132,6 +132,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 +160,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