rubysketch 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0394813335c89ce937297ef2c62819dc3c11f70dbbf74efd320eaf0a72f8b386'
-  data.tar.gz: 9acea3187bd120239a7c387fa272e252593dc7ce0afa73425f39f65fe0b2d6bb
+  metadata.gz: 5a179e1170c79df6daea6d79f66eddc3aa7b50d22b2c685bcb36864f0644212e
+  data.tar.gz: 39565ddbcc31a7b6ef472c1fed40c91be91958531246b1673698afcd68ae621e
 SHA512:
-  metadata.gz: 7d1824db8f17db944d6b1a2d6069b1acfcc4dafdf3d52facc2e5cdf0281108b825e89150e509c7e58ad8e2c7641d3ee9e6612f8486ebf9190ccd30cc48dbd1ae
-  data.tar.gz: bdefffaabba512793dddc3204d749a22968096f464a9107214630012585f40f2aedd294216af321c4ae83f4fd5eb11e24d2eaab4fd1486cb39c3ecb50714c00f
+  metadata.gz: 435879c3538ece61aaecee0c19e6ece104934316fb113b2f23d9dc57394ded709417e30e32a7697ba1c465927b9d615fa945d1d4a4aa5068629509a33fcdbfff
+  data.tar.gz: b310a39f0c5e5fc55130d8c2cdd71c7620d17a42976d51fc73d7b09d41eeac15854482280bb213a937eda3474185935f27a1dcb6fd2983fad9a144c140fb337a

data/ChangeLog.md

@@ -1,6 +1,12 @@
 # RubySketch ChangeLog
 
 
+## [0.3.17] - 2021-12-5
+
+- add 'mouseButton'
+- pointer cancel event calls pointer_up block
+
+
 ## [0.3.16] - 2021-2-14
 
 - add key, keyCode and keyPressed system values

data/VERSION

@@ -1 +1 @@
-0.3.17
+0.3.18

data/lib/rubysketch/processing.rb

@@ -1829,7 +1829,7 @@ module RubySketch
         @keysPressed__     = Set.new
         @pointerPos__      =
         @pointerPrevPos__  = [0, 0]
-        @pointersPressed__ = Set.new
+        @pointersPressed__ = []
         @touches__         = []
         @motionGravity__   = createVector 0, 0
 
@@ -1864,12 +1864,21 @@ module RubySketch
           end
         }
 
+        mouseButtonMap = {
+          mouse_left:   LEFT,
+          mouse_right:  RIGHT,
+          mouse_middle: CENTER
+        }
+
         updatePointerStates = -> event, pressed = nil {
           @pointerPos__ = event.pos.to_a
           @touches__    = event.pointers.map {|p| Touch.new(p.id, *p.pos.to_a)}
           if pressed != nil
-            set, type = @pointersPressed__, event.type
-            pressed ? set.add(type) : set.delete(type)
+            array = @pointersPressed__
+            event.type
+              .tap {|types| types.delete :mouse}
+              .map {|type| mouseButtonMap[type] || type}
+              .each {|type| pressed ? array.push(type) : array.delete(type)}
           end
         }
 
@@ -2142,6 +2151,14 @@ module RubySketch
         @pointerPrevPos__[1]
       end
 
+      # Returns which mouse button was pressed
+      #
+      # @return [Numeric] LEFT, RIGHT, CENTER or 0
+      #
+      def mouseButton()
+        (@pointersPressed__ & [LEFT, RIGHT, CENTER]).last || 0
+      end
+
       # Returns array of touches
       #
       # @return [Array] Touch objects

data/lib/rubysketch/window.rb

@@ -24,7 +24,7 @@ module RubySketch
       painter.miter_limit = 10
       resize_canvas 1, 1
 
-      @canvas_view = add Reflex::View.new {|v|
+      @canvas_view = add Reflex::View.new(name: :canvas) {|v|
         v.on(:update)  {|e| on_canvas_update e}
         v.on(:draw)    {|e| on_canvas_draw e}
         v.on(:pointer) {|e| on_canvas_pointer e}
@@ -58,7 +58,7 @@ module RubySketch
     end
 
     def on_key(e)
-      block = case e.type
+      block = case e.action
         when :down then @key_down
         when :up   then @key_up
       end
@@ -81,9 +81,9 @@ module RubySketch
 
     def on_canvas_pointer(e)
       block = case e.action
-        when :down then @pointer_down
-        when :up   then @pointer_up
-        when :move then e.drag? ? @pointer_drag : @pointer_move
+        when :down        then @pointer_down
+        when :up, :cancel then @pointer_up
+        when :move        then e.drag? ? @pointer_drag : @pointer_move
       end
       draw_canvas {call_block block, e} if block
     end

data/rubysketch.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency 'reflexion', '~> 0.1'
+  s.add_runtime_dependency 'reflexion', '~> 0.1.24'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reflexion
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.24
 description: Creative Coding Framework have API compatible to Processing API or p5.js.
 email: xordog@gmail.com
 executables: []