rubysketch 0.5.24 → 0.5.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5538cde508d958c69978b0cdf51727303c3c509f96fae21a30b41cfabc99a9a8
-  data.tar.gz: 9b7fd39a1684f7fe49fbc98250c0315038419566443209fddce8701ff9683228
+  metadata.gz: 26c49c9860053850965c49ba550e222dbbc31dd41c26ed5a0e3ccba96cc70f30
+  data.tar.gz: f6d5e3eff58ce12340eccf50bb9dc2d21f19403ad54828890fe49c19428a9f30
 SHA512:
-  metadata.gz: f71cd9de84e98317c61ad25c013cf0d6ec2257cc884138984908ee6ecd505c7a87068798539b8491fcccad90e7a829dea8d62fb907483c46be215cea010cb074
-  data.tar.gz: 4758d91420fb1069ce87438ec0df5cfea7af382847f9375bc7869f48fce5ed3d21936d0af79c0c3b2a166121991f922a82944c5a89515e1b09f872fb8723b7cd
+  metadata.gz: fbab1d6a12f52dbbef8c66be6dc86fccfb5da9c63807ea579ca4b61042d4e8df0fa223f533eb2ef6505054b4d4e0cfe812e9eadebd6926ae65ec0a22243c0760
+  data.tar.gz: a942e138e2350c873a148cf2ec17f58c6aded29685956f00c35eb50583403d3771dfe84b8ea3d303c01c0026e93fdd079716b47699f21d4a86189de378f96234

data/ChangeLog.md

@@ -1,6 +1,17 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.26] - 2023-07-26
+
+- Rescue exceptions thrown at sprite event handlers
+
+
+## [v0.5.25] - 2023-07-22
+
+- Freeze EASINGS
+- Fix that clearTimer() fails clearing timer in very rare cases
+
+
 ## [v0.5.24] - 2023-07-21
 
 - Add animate(), animateValue(), and EASINGS

data/VERSION

@@ -1 +1 @@
-0.5.24
+0.5.26

data/lib/rubysketch/context.rb

@@ -9,7 +9,7 @@ module RubySketch
     # @private
     def initialize(window)
       super
-      @timers__, @nextTimerID__ = {}, 0
+      @timers__, @firingTimers__, @nextTimerID__ = {}, {}, 0
 
       @layer__ = window.add_overlay SpriteLayer.new
 
@@ -44,7 +44,7 @@ module RubySketch
     def setInterval(seconds = 0, *args, id: nextTimerID__, now: false, &block)
       return unless block
       time = Time.now.to_f
-      block.call *args if now
+      block.call(*args) if now
       setInterval__ id, time, seconds, args, &block
     end
 
@@ -59,7 +59,7 @@ module RubySketch
       now, nextTime = Time.now.to_f, startTime + seconds
       nextTime      = now if nextTime < now
       setTimeout__ id, nextTime do
-        block.call *args
+        block.call(*args)
         setInterval__ id, nextTime, seconds, args, &block
       end
     end
@@ -71,7 +71,7 @@ module RubySketch
     # @return [nil] nil
     #
     def clearTimer(id)
-      @timers__.delete id
+      [@timers__, @firingTimers__].each {|timers| timers.delete id}
       nil
     end
 
@@ -87,11 +87,11 @@ module RubySketch
     # @private
     def fireTimers__()
       now    = Time.now.to_f
-      blocks = []
-      @timers__.delete_if do |_, (time, args, block)|
-        (now >= time).tap {|fire| blocks.push [block, args] if fire}
+      @firingTimers__.clear
+      @timers__.delete_if do |id, (time, args, block)|
+        (now >= time).tap {|fire| @firingTimers__[id] = [block, args] if fire}
       end
-      blocks.each {|block, args| block.call *args}
+      @firingTimers__.each {|_, (block, args)| block.call(*args)}
     end
 
     # Animate with easing functions

data/lib/rubysketch/easings.rb

@@ -100,6 +100,6 @@ module RubySketch
        backInOut: backInOut,
     elasticInOut: elasticInOut,
      bounceInOut: bounceInOut
-  }
+  }.freeze
 
 end# RubySketch

data/lib/rubysketch/sprite.rb

@@ -879,6 +879,7 @@ module RubySketch
       @sprite = sprite
       super(*a, **k, &b)
 
+      @error            = nil
       @pointer          = nil
       @pointerPrev      = nil
       @pointersPressed  = []
@@ -915,7 +916,7 @@ module RubySketch
     end
 
     def on_update(e)
-      @update&.call
+      call_block @update
     end
 
     def on_pointer_down(e)
@@ -923,8 +924,8 @@ module RubySketch
       updatePointersPressedAndReleased e, true
       @pointerDownStartPos = to_screen @pointer.pos
       if e.view_index == 0
-        @mousePressed&.call if e.any? {|p| p.id == @pointer.id}
-        @touchStarted&.call
+        call_block @mousePressed if e.any? {|p| p.id == @pointer.id}
+        call_block @touchStarted
       end
     end
 
@@ -933,10 +934,10 @@ module RubySketch
       updatePointersPressedAndReleased e, false
       if e.view_index == 0
         if e.any? {|p| p.id == @pointer.id}
-          @mouseReleased&.call
-          @mouseClicked&.call if mouseClicked?
+          call_block @mouseReleased
+          call_block @mouseClicked if mouseClicked?
         end
-        @touchEnded&.call
+        call_block @touchEnded
       end
       @pointerDownStartPos = nil
       @pointersReleased.clear
@@ -946,8 +947,8 @@ module RubySketch
       updatePointerStates e
       if e.view_index == 0
         mouseMoved = e.drag? ? @mouseDragged : @mouseMoved
-        mouseMoved&.call if e.any? {|p| p.id == @pointer.id}
-        @touchMoved&.call
+        call_block mouseMoved if e.any? {|p| p.id == @pointer.id}
+        call_block @touchMoved
       end
     end
 
@@ -957,12 +958,12 @@ module RubySketch
 
     def on_contact_begin(e)
       v = e.view
-      @contact.call v.sprite, e.action if @contact && v.respond_to?(:sprite)
+      call_block @contact, v.sprite, e.action if @contact && v.respond_to?(:sprite)
     end
 
     def will_contact?(v)
       return true unless @will_contact && v.respond_to?(:sprite)
-      @will_contact.call v.sprite
+      call_block @will_contact, v.sprite
     end
 
     private
@@ -1002,6 +1003,13 @@ module RubySketch
         .then {|pos, startPos| (pos - startPos).length < 3}
     end
 
+    def call_block(block, *args)
+      block.call(*args) if block && !@error
+    rescue Exception => e
+      @error = e
+      $stderr.puts e.full_message
+    end
+
   end# SpriteView
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.5.26
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-21 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot