rubysketch 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ed7b40a8931568bfd81cd39f25ec6abca7ba60e5d0b6a991de18408f9bd6ccf
-  data.tar.gz: 9ac428feb4aa2594929cdfddc813b0512dedf24661096ab4ca48b41c60a95f39
+  metadata.gz: 93686f5e5b80dac29a8c7993c4372d3674a5bbe92ef22331d8e895da75a7b15c
+  data.tar.gz: 6b495222f590b892311174a068b9c8cb0e8b0f25d7e21cd3438d76a15aa04ff7
 SHA512:
-  metadata.gz: 12664a28fdc8bd19cfd3587bf19da5f8e975b3cb20899af3f5eeb02a4c03dff1af2d7cc62fcc5f15a96100bbfdc4b11e306fe01899134abe050f9e0412c19496
-  data.tar.gz: ec1e31873aae6a80404a99c9c8079beefefa124e03ad3b6e8c0dc7d942bdb7dec89084a28e537249abb138c8a66c75c0a6523b49265b85e217e50bec1fa12b8c
+  metadata.gz: 1b7a0890ac1cf8861b009df29db44a474a242eeaeacb626a0dec3728aa0bcf79d577b994e04de52d54f00cf9ec09a04129cde5b194da045b1be3a4cd40a80fea
+  data.tar.gz: 7a92b59921075b96ec61349c9b5b7db24c168adba51be66c13369b5135b7e6aa7c015ea781622253238922b913fe6fc6853eb03c18103a4b175e00b5a3ff2f2d

data/ChangeLog.md

@@ -1,6 +1,11 @@
 # rubysketch ChangeLog
 
 
+## [v0.5.17] - 2023-06-11
+
+- Improve mouse event handling for Sprite class
+
+
 ## [v0.5.16] - 2023-06-08
 
 - Update dependencies

data/VERSION

@@ -1 +1 @@
-0.5.16
+0.5.17

data/lib/rubysketch/sprite.rb

@@ -726,11 +726,11 @@ module RubySketch
     #    p [sprite.mouseX, sprite.mouseY, sprite.mouseButton]
     #  end
     #
-    # @return [nil] nil
+    # @return [Boolean] is any mouse button pressed or not
     #
     def mousePressed(&block)
       @view__.mousePressed = block
-      nil
+      @view__.mousePressed?
     end
 
     # Defines mouseReleased block.
@@ -879,27 +879,31 @@ module RubySketch
       @sprite = sprite
       super(*a, **k, &b)
 
-      @pointerPos       =
-      @pointerPrevPos   = Rays::Point.new 0
+      @pointer          = nil
+      @pointerPrev      = nil
       @pointersPressed  = []
       @pointersReleased = []
       @touches          = []
     end
 
     def mouseX()
-      @pointerPos.x
+      @pointer&.x || 0
     end
 
     def mouseY()
-      @pointerPos.y
+      @pointer&.y || 0
     end
 
     def pmouseX()
-      @pointerPrevPos.x
+      @pointerPrev&.x || 0
     end
 
     def pmouseY()
-      @pointerPrevPos.y
+      @pointerPrev&.y || 0
+    end
+
+    def mousePressed?()
+      not @pointersPressed.empty?
     end
 
     def mouseButton()
@@ -907,7 +911,7 @@ module RubySketch
     end
 
     def clickCount()
-      clicked? ? 1 : 0
+      mouseClicked? ? 1 : 0
     end
 
     def on_update(e)
@@ -915,16 +919,24 @@ module RubySketch
     end
 
     def on_pointer_down(e)
-      updatePointerStates e, true
-      @pointerDownStartPos = to_screen @pointerPos
-      (@touchStarted || @mousePressed)&.call if e.view_index == 0
+      updatePointerStates e
+      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
+      end
     end
 
     def on_pointer_up(e)
-      updatePointerStates e, false
+      updatePointerStates e
+      updatePointersPressedAndReleased e, false
       if e.view_index == 0
-        (@touchEnded || @mouseReleased)&.call
-        @mouseClicked&.call if clicked?
+        if e.any? {|p| p.id == @pointer.id}
+          @mouseReleased&.call
+          @mouseClicked&.call if mouseClicked?
+        end
+        @touchEnded&.call
       end
       @pointerDownStartPos = nil
       @pointersReleased.clear
@@ -932,8 +944,11 @@ module RubySketch
 
     def on_pointer_move(e)
       updatePointerStates e
-      mouseMoved = e.drag? ? @mouseDragged : @mouseMoved
-      (@touchMoved || mouseMoved)&.call if e.view_index == 0
+      if e.view_index == 0
+        mouseMoved = e.drag? ? @mouseDragged : @mouseMoved
+        mouseMoved&.call if e.any? {|p| p.id == @pointer.id}
+        @touchMoved&.call
+      end
     end
 
     def on_pointer_cancel(e)
@@ -958,24 +973,29 @@ module RubySketch
       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
+    def updatePointerStates(event)
+      pointer = event.find {|p| p.id == @pointer&.id} || event.first
+      if !mousePressed? || pointer.id == @pointer&.id
+        @pointerPrev, @pointer = @pointer, pointer.dup
       end
+      @touches = event.map {|p| Touch.new(p.id, *p.pos.to_a)}
+    end
+
+    def updatePointersPressedAndReleased(event, pressed)
+      event.map(&:types).flatten
+        .tap {|types| types.delete :mouse}
+        .map {|type| MOUSE_BUTTON_MAP[type] || type}
+        .each do |type|
+          (pressed ? @pointersPressed : @pointersReleased).push type
+          if !pressed && index = @pointersPressed.index(type)
+            @pointersPressed.delete_at index
+          end
+        end
     end
 
-    def clicked?()
-      return false unless @pointerPos && @pointerDownStartPos
-      [to_screen(@pointerPos), @pointerDownStartPos]
+    def mouseClicked?()
+      return false unless @pointer && @pointerDownStartPos
+      [to_screen(@pointer.pos), @pointerDownStartPos]
         .map {|pos| Rays::Point.new pos.x, pos.y, 0}
         .then {|pos, startPos| (pos - startPos).length < 3}
     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.1.38'
-  s.add_runtime_dependency 'rucy',       '~> 0.1.38'
-  s.add_runtime_dependency 'beeps',      '~> 0.1.39'
-  s.add_runtime_dependency 'rays',       '~> 0.1.41'
-  s.add_runtime_dependency 'reflexion',  '~> 0.1.44'
-  s.add_runtime_dependency 'processing', '~> 0.5.17'
+  s.add_runtime_dependency 'xot',        '~> 0.1.39'
+  s.add_runtime_dependency 'rucy',       '~> 0.1.39'
+  s.add_runtime_dependency 'beeps',      '~> 0.1.40'
+  s.add_runtime_dependency 'rays',       '~> 0.1.42'
+  s.add_runtime_dependency 'reflexion',  '~> 0.1.45'
+  s.add_runtime_dependency 'processing', '~> 0.5.18'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-11 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.38
+        version: 0.1.39
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.44
+        version: 0.1.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.44
+        version: 0.1.45
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.17
+        version: 0.5.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.17
+        version: 0.5.18
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement