rubysketch 0.5.28 → 0.5.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a27c613bb9a268367ce581b9b4caa9e89d546f763680ec8b9b408bdadaed0c16
-  data.tar.gz: b0503752020cc76e453922183b34c78d049c2c3b4665438cc024286cadf679c5
+  metadata.gz: dbbb972756576a0aa6c5dfc70ba1682776dd0f95c1bc0d0ec20a06dce0e1bd01
+  data.tar.gz: 7ce985bbaee1c81f3b20dea0392cd2b5459af3e520eb8552840306d32ba03adb
 SHA512:
-  metadata.gz: 43c0549b9f6b9381351dad8204a389cf96e80da008d9b0c4a656ad67749a5736a9aff196378905cd42ef012df46e09a49c16f6176882a01cf292cab03056e315
-  data.tar.gz: a66d891ae5a36ba98adb5611f5c5ed7c79f517dcf12a44d2debdcd175dbc2e7e4a8673358ea532712d5a02858f72452139677eb632913f390b6bfbf64ab27c8d
+  metadata.gz: f0f53b5fb3464b8cc6e0f9ff3b3c4d76d465816a5c6414b99a3d5724ca9c20411c37091f8a2b9ed850e05b863c8ef958ed7dceaf8257189dbdb1df125033d7fa
+  data.tar.gz: 1e9696d6e23b5333f4c784abd7847fd2ebb00e4dd210945c4f92b251eed80f7485cc1694fd1d09003c9a7cfe9e8ff1a95275cca6cb928d53814c65cdeb184781

data/ChangeLog.md

@@ -1,6 +1,18 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.30] - 2023-08-24
+
+- Fix failed test
+
+
+## [v0.5.29] - 2023-08-23
+
+- Add Sprite#contact_end()
+- Sprite.new() can take 'physics:' keyword parameter
+- Fix that calling clearInterval() inside interval timer block would be ignored
+
+
 ## [v0.5.28] - 2023-07-30
 
 - Update dependencies
@@ -8,7 +20,7 @@
 
 ## [v0.5.27] - 2023-07-30
 
-- add vibrate()
+- Add vibrate()
 
 
 ## [v0.5.26] - 2023-07-26
@@ -46,12 +58,12 @@
 
 ## [v0.5.20] - 2023-07-09
 
-- fix that calling mousePressed() without block removes mousePressed block
+- Fix that calling mousePressed() without block removes mousePressed block
 
 
 ## [v0.5.19] - 2023-06-27
 
-- add loadSound() and RubySketch::Sound class
+- Add loadSound() and RubySketch::Sound class
 
 
 ## [v0.5.18] - 2023-06-22
@@ -93,8 +105,8 @@
 
 ## [v0.5.11] - 2023-05-26
 
-- add left, top, right, and bottom accessors to Sprite class
-- add show(), hide(), and hidden?() to Sprite class
+- Add left, top, right, and bottom accessors to Sprite class
+- Add show(), hide(), and hidden?() to Sprite class
 
 
 ## [v0.5.10] - 2023-05-21
@@ -161,19 +173,19 @@
 
 ## [v0.5.2] - 2023-03-02
 
-- depend to processing-0.5.2 gem
+- Depend to processing-0.5.2 gem
 
 
 ## [v0.5.1] - 2023-03-01
 
-- fix bugs
+- Fix bugs
 
 
 ## [v0.5.0] - 2023-02-09
 
-- add Sprite class
+- Add Sprite class
 
 
 ## [v0.4.0] - 2023-02-08
 
-- first version
+- First version

data/VERSION

@@ -1 +1 @@
-0.5.28
+0.5.30

data/lib/rubysketch/context.rb

@@ -59,8 +59,8 @@ module RubySketch
       now, nextTime = Time.now.to_f, startTime + seconds
       nextTime      = now if nextTime < now
       setTimeout__ id, nextTime do
-        block.call(*args)
         setInterval__ id, nextTime, seconds, args, &block
+        block.call(*args)
       end
     end
 

data/lib/rubysketch/sprite.rb

@@ -37,7 +37,7 @@ module RubySketch
     #
     def initialize(
       x = 0, y = 0, w = nil, h = nil, image: nil, offset: nil,
-      context: nil)
+      physics: true, context: nil)
 
       w ||= (image&.width  || 0)
       h ||= (image&.height || 0)
@@ -47,7 +47,7 @@ module RubySketch
       @context__ = context || Context.context__
       @view__    = SpriteView.new(
         self, x: x, y: y, w: w, h: h,
-        static: true, density: 1, friction: 0, restitution: 0,
+        physics: physics, density: 1, friction: 0, restitution: 0,
         back: :white)
 
       self.image  = image  if image
@@ -842,6 +842,21 @@ module RubySketch
     #
     def contact(&block)
       @view__.contact = block if block
+      nil
+    end
+
+    # Defines contact_end block.
+    #
+    # @example Call jumping() when the player sprite leaves the ground sprite
+    #  playerSprite.contact_end do |o|
+    #    jumping if o == groundSprite
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def contact_end(&block)
+      @view__.contact_end = block if block
+      nil
     end
 
     # Defines contact? block.
@@ -855,6 +870,7 @@ module RubySketch
     #
     def contact?(&block)
       @view__.will_contact = block if block
+      nil
     end
 
     # @private
@@ -871,13 +887,13 @@ module RubySketch
     attr_accessor :update,
       :mousePressed, :mouseReleased, :mouseMoved, :mouseDragged, :mouseClicked,
       :touchStarted, :touchEnded, :touchMoved,
-      :contact, :will_contact
+      :contact, :contact_end, :will_contact
 
     attr_reader :sprite, :touches
 
-    def initialize(sprite, *a, **k, &b)
+    def initialize(sprite, *args, physics:, **kwargs, &block)
       @sprite = sprite
-      super(*a, **k, &b)
+      super(*args, **kwargs, &block)
 
       @error            = nil
       @pointer          = nil
@@ -885,6 +901,8 @@ module RubySketch
       @pointersPressed  = []
       @pointersReleased = []
       @touches          = []
+
+      self.static = true if physics
     end
 
     def mouseX()
@@ -957,8 +975,15 @@ module RubySketch
     end
 
     def on_contact_begin(e)
+      return unless @contact
+      v = e.view
+      call_block @contact, v.sprite if v.respond_to?(:sprite)
+    end
+
+    def on_contact_end(e)
+      return unless @contact_end
       v = e.view
-      call_block @contact, v.sprite, e.action if v.respond_to?(:sprite)
+      call_block @contact_end, v.sprite if v.respond_to?(:sprite)
     end
 
     def will_contact?(v)
@@ -997,7 +1022,7 @@ module RubySketch
     end
 
     def mouseClicked?()
-      return false unless @pointer && @pointerDownStartPos
+      return false unless parent && @pointer && @pointerDownStartPos
       [to_screen(@pointer.pos), @pointerDownStartPos]
         .map {|pos| Rays::Point.new pos.x, pos.y, 0}
         .then {|pos, startPos| (pos - startPos).length < 3}

data/test/test_sprite.rb

@@ -272,21 +272,31 @@ class TestSprite < Test::Unit::TestCase
     v = s.instance_variable_get :@view__
     assert_nil v.update
     assert_nil v.contact
+    assert_nil v.contact_end
     assert_nil v.will_contact
 
     s.update {}
     assert_not_nil v.update
     assert_nil     v.contact
+    assert_nil     v.contact_end
     assert_nil     v.will_contact
 
     s.contact {}
     assert_not_nil v.update
     assert_not_nil v.contact
+    assert_nil     v.contact_end
+    assert_nil     v.will_contact
+
+    s.contact_end {}
+    assert_not_nil v.update
+    assert_not_nil v.contact
+    assert_not_nil v.contact_end
     assert_nil     v.will_contact
 
     s.contact? {}
     assert_not_nil v.update
     assert_not_nil v.contact
+    assert_not_nil v.contact_end
     assert_not_nil v.will_contact
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.28
+  version: 0.5.30
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-30 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot