processing 0.5.17 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d69cca41be46b8a061bcafc55fd36cf71d50616b5b5697ab558dfac1c9c2449c
-  data.tar.gz: 4b3869b1fb410a2da488c03dd58e95fa1f0c42521888869bd70c0c18904831dc
+  metadata.gz: 38d42dd83841388f9b8370f48c36eabcaae5dce9f9ae584449d8825e2590f7d8
+  data.tar.gz: 46b6326966f81f0a9c40973462dbc58ce6c3806824f8dffed255233301f2797f
 SHA512:
-  metadata.gz: 0db54f243695541c85db93d6f28bf3bc42dc76d68e40e3d63cc4e3524110f33372987be661a9fe1e58698d7c3eae40c32b6a76f7660102efbd952591f041db33
-  data.tar.gz: e0719f14ed2fddc28d2dc908339fb633a3dcf645f20a98a52a333541078154aab4c5bcdb1dd36032b1dabbed8f229915ee8b36549085a785446b6aae38e6debc
+  metadata.gz: 60eb487e89d54e1961c7dcf522b14693083d6b84883aa482d310b87ad05a462ffbf837860b9bbcfc7f045fcdf446fbf32ee92b5ea1e565a87595ce281fa8076e
+  data.tar.gz: b898bb281b641d2f7ac64523c5d8a0ca7d8ee8e86f0e4f2a3af47d0f51cb5d739cdd9fe28f26bb864177b56a51425c732a0b526592c45d95d340cd233e5f53a7

data/ChangeLog.md

@@ -1,6 +1,12 @@
 # processing ChangeLog
 
 
+## [v0.5.18] - 2023-06-11
+
+- mousePressed, mouseReleased, mouseMoved, mouseDragged, mouseClicked ignore multiple touches
+- Fix that pointer event handles only the first pointer’s type and ignoring rest pointer's types
+
+
 ## [v0.5.17] - 2023-06-07
 
 - Add Image#set() and Image#get()

data/VERSION

@@ -1 +1 @@
-0.5.17
+0.5.18

data/lib/processing/context.rb

@@ -42,8 +42,8 @@ module Processing
       @key__              = nil
       @keyCode__          = nil
       @keysPressed__      = Set.new
-      @pointerPos__       =
-      @pointerPrevPos__   = Rays::Point.new 0
+      @pointer__          = nil
+      @pointerPrev__      = nil
       @pointersPressed__  = []
       @pointersReleased__ = []
       @touches__          = []
@@ -92,19 +92,24 @@ module Processing
         mouse_middle: CENTER
       }
 
-      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| mouseButtonMap[type] || type}
-            .each do |type|
-              (pressed ? @pointersPressed__ : @pointersReleased__).push type
-              @pointersPressed__.delete type unless pressed
-            end
+      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)}
+      }
+
+      updatePointersPressedAndReleased = -> event, pressed {
+        event.map(&:types).flatten
+          .tap {|types| types.delete :mouse}
+          .map {|type| mouseButtonMap[type] || type}
+          .each do |type|
+            (pressed ? @pointersPressed__ : @pointersReleased__).push type
+            if !pressed && index = @pointersPressed__.index(type)
+              @pointersPressed__.delete_at index
+            end
+          end
       }
 
       @window__.key_down = proc do |e|
@@ -119,29 +124,29 @@ module Processing
       end
 
       @window__.pointer_down = proc do |e|
-        updatePointerStates.call e, true
-        @pointerDownStartPos__ = @pointerPos__.dup
-        (@touchStartedBlock__ || @mousePressedBlock__)&.call
+        updatePointerStates.call e
+        updatePointersPressedAndReleased.call e, true
+        @mousePressedBlock__&.call if e.any? {|p| p.id == @pointer__.id}
+        @touchStartedBlock__&.call
       end
 
       @window__.pointer_up = proc do |e|
-        updatePointerStates.call e, false
-        (@touchEndedBlock__ || @mouseReleasedBlock__)&.call
-        if startPos = @pointerDownStartPos__
-          @mouseClickedBlock__&.call if (@pointerPos__ - startPos).length < 3
-          @pointerDownStartPos__ = nil
+        updatePointerStates.call e
+        updatePointersPressedAndReleased.call e, false
+        if e.any? {|p| p.id == @pointer__.id}
+          @mouseReleasedBlock__&.call
+          @mouseClickedBlock__&.call if
+            (@pointer__.pos - @pointer__.down.pos).length < 3
         end
+        @touchEndedBlock__&.call
         @pointersReleased__.clear
       end
 
       @window__.pointer_move = proc do |e|
         updatePointerStates.call e
-        (@touchMovedBlock__ || @mouseMovedBlock__)&.call
-      end
-
-      @window__.pointer_drag = proc do |e|
-        updatePointerStates.call e
-        (@touchMovedBlock__ || @mouseDraggedBlock__)&.call
+        mouseMoved = e.drag? ? @mouseDraggedBlock__ : @mouseMovedBlock__
+        mouseMoved&.call if e.any? {|p| p.id == @pointer__.id}
+        @touchMovedBlock__&.call
       end
 
       @window__.move = proc do |e|
@@ -513,7 +518,7 @@ module Processing
     # @return [Numeric] horizontal position of mouse
     #
     def mouseX()
-      @pointerPos__.x
+      @pointer__&.x || 0
     end
 
     # Returns mouse y position
@@ -521,7 +526,7 @@ module Processing
     # @return [Numeric] vertical position of mouse
     #
     def mouseY()
-      @pointerPos__.y
+      @pointer__&.y || 0
     end
 
     # Returns mouse x position in previous frame
@@ -529,7 +534,7 @@ module Processing
     # @return [Numeric] horizontal position of mouse
     #
     def pmouseX()
-      @pointerPrevPos__.x
+      @pointerPrev__&.x || 0
     end
 
     # Returns mouse y position in previous frame
@@ -537,7 +542,7 @@ module Processing
     # @return [Numeric] vertical position of mouse
     #
     def pmouseY()
-      @pointerPrevPos__.y
+      @pointerPrev__&.y || 0
     end
 
     # Returns which mouse button was pressed

data/lib/processing/window.rb

@@ -8,7 +8,7 @@ module Processing
 
     attr_accessor :setup, :update, :draw,
       :key_down, :key_up,
-      :pointer_down, :pointer_up, :pointer_move, :pointer_drag,
+      :pointer_down, :pointer_up, :pointer_move,
       :move, :resize, :motion,
       :before_draw, :after_draw, :update_canvas
 
@@ -117,7 +117,7 @@ module Processing
       block = case e.action
         when :down        then @pointer_down
         when :up, :cancel then @pointer_up
-        when :move        then e.drag? ? @pointer_drag : @pointer_move
+        when :move        then @pointer_move
       end
       draw_canvas {call_block block, e} if block
     end

data/processing.gemspec

@@ -25,10 +25,10 @@ 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 'rays',      '~> 0.1.40'
-  s.add_runtime_dependency 'reflexion', '~> 0.1.43'
+  s.add_runtime_dependency 'xot',       '~> 0.1.39'
+  s.add_runtime_dependency 'rucy',      '~> 0.1.39'
+  s.add_runtime_dependency 'rays',      '~> 0.1.42'
+  s.add_runtime_dependency 'reflexion', '~> 0.1.45'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: processing
 version: !ruby/object:Gem::Version
-  version: 0.5.17
+  version: 0.5.18
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ 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: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.42
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.43
+        version: 0.1.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.43
+        version: 0.1.45
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement