processing 0.5.16 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6025b178164394ad3493995863e8077280dbf2745abd4c2a84223fcbfb6aa65
-  data.tar.gz: 41a9a7b7410d0a6aa5bc34e611e17432722a85a15179eb746511aa75f46eaa97
+  metadata.gz: 38d42dd83841388f9b8370f48c36eabcaae5dce9f9ae584449d8825e2590f7d8
+  data.tar.gz: 46b6326966f81f0a9c40973462dbc58ce6c3806824f8dffed255233301f2797f
 SHA512:
-  metadata.gz: cbdf458466e765affb174fce19573fab4d4cfe76e106aaef421fc4e66f95e7b02a6c2d5bc11662756a313f0cabbadfb705f75306b0f7627c32386a17da365030
-  data.tar.gz: 11a736963e87ab5b91c087dce0fcd863c29f5912a6bbfd20d643345f0ead8f268e7a0784f3ceeb7bf903a0d06d500c350e82f9fc34c25d61f23d0cdf2b828554
+  metadata.gz: 60eb487e89d54e1961c7dcf522b14693083d6b84883aa482d310b87ad05a462ffbf837860b9bbcfc7f045fcdf446fbf32ee92b5ea1e565a87595ce281fa8076e
+  data.tar.gz: b898bb281b641d2f7ac64523c5d8a0ca7d8ee8e86f0e4f2a3af47d0f51cb5d739cdd9fe28f26bb864177b56a51425c732a0b526592c45d95d340cd233e5f53a7

data/ChangeLog.md

@@ -1,6 +1,20 @@
 # 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()
+- Add color(), red(), green(), blue(), and alpha()
+- Add lerpColor()
+- Add focused()
+
+
 ## [v0.5.16] - 2023-06-02
 
 - Fix failed tests and add tests

data/VERSION

@@ -1 +1 @@
-0.5.16
+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|
@@ -468,6 +473,14 @@ module Processing
       @window__.height
     end
 
+    # Returns weather the window is active or not.
+    #
+    # @return [Boolean] active or not
+    #
+    def focused()
+      @window__.active?
+    end
+
     # Returns the number of frames since the program started.
     #
     # @return [Integer] total number of frames
@@ -505,7 +518,7 @@ module Processing
     # @return [Numeric] horizontal position of mouse
     #
     def mouseX()
-      @pointerPos__.x
+      @pointer__&.x || 0
     end
 
     # Returns mouse y position
@@ -513,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
@@ -521,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
@@ -529,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/graphics_context.rb

@@ -324,6 +324,59 @@ module Processing
       @colorMode__
     end
 
+    # Creates color value.
+    #
+    # @overload color(gray)
+    # @overload color(gray, alpha)
+    # @overload color(v1, v2, v3)
+    # @overload color(v1, v2, v3, alpha)
+    #
+    # @param gray  [Numeric] the value for gray
+    # @param alpha [Numeric] the value for alpha
+    # @param v1    [Numeric] the value for red or hue
+    # @param v2    [Numeric] the value for green or saturation
+    # @param v3    [Numeric] the value for blue or brightness
+    #
+    # @return [Integer] the rgba color value
+    #
+    def color(*args)
+      toRGBA__(*args)
+        .map {|n| (n * 255).to_i.clamp 0, 255}
+        .then {|r, g, b, a| Image.toColor__ r, g, b, a}
+    end
+
+    # Returns the red value of the color.
+    #
+    # @return [Numeric] the red value
+    #
+    def red(color)
+      ((color >> 16) & 0xff) / 255.0 * @colorMaxes__[0]
+    end
+
+    # Returns the green value of the color.
+    #
+    # @return [Numeric] the green value
+    #
+    def green(color)
+      ((color >> 8) & 0xff) / 255.0 * @colorMaxes__[1]
+    end
+
+    # Returns the blue value of the color.
+    #
+    # @return [Numeric] the blue value
+    #
+    def blue(color)
+      (color & 0xff) / 255.0 * @colorMaxes__[2]
+    end
+
+    # Returns the red value of the color.
+    #
+    # @return [Numeric] the red value
+    #
+    def alpha(color)
+      ((color >> 24) & 0xff) / 255.0 * @colorMaxes__[3]
+    end
+
     # @private
     private def toRGBA__(*args)
       a, b, c, d = args
@@ -1427,6 +1480,22 @@ module Processing
       start + (stop - start) * amount
     end
 
+    # Returns the interpolated color between color1 and color2.
+    #
+    # @param color1 [Integer] the 1st color for interpolation
+    # @param color2 [Integer] the 2nd color for interpolation
+    # @param amount [Numeric] amount to interpolate
+    #
+    # @return [Integer] interporated color
+    #
+    def lerpColor(color1, color2, amount)
+      color(
+        lerp(red(  color1), red(  color2), amount),
+        lerp(green(color1), green(color2), amount),
+        lerp(blue( color1), blue( color2), amount),
+        lerp(alpha(color1), alpha(color2), amount))
+    end
+
     # Maps a number from range start1..stop1 to range start2..stop2.
     #
     # @param value  [Numeric] number to be mapped

data/lib/processing/image.rb

@@ -39,6 +39,30 @@ module Processing
       @image.size
     end
 
+    # Sets the color of the pixel.
+    #
+    # @param x [Integer] x position of the pixel
+    # @param y [Integer] y position of the pixel
+    # @param c [Integer] color value
+    #
+    # @return [nil] nil
+    #
+    def set(x, y, c)
+      @image.bitmap[x, y] = self.class.fromColor__ c
+      nil
+    end
+
+
+    # Returns the color of the pixel.
+    #
+    # @return [Integer] color value (0xAARRGGBB)
+    #
+    def get(x, y)
+      @image.bitmap[x, y]
+        .map {|n| (n * 255).to_i.clamp 0, 255}
+        .then {|r, g, b, a| self.class.toColor__ r, g, b, a}
+    end
+
     # Applies an image filter.
     #
     # overload filter(shader)
@@ -135,6 +159,24 @@ module Processing
       end
     end
 
+    # @private
+    def self.fromColor__(color)
+      [
+        color >> 16 & 0xff,
+        color >> 8  & 0xff,
+        color       & 0xff,
+        color >> 24 & 0xff
+      ]
+    end
+
+    # @private
+    def self.toColor__(r, g, b, a)
+      (r & 0xff) << 16 |
+      (g & 0xff) << 8  |
+      (b & 0xff)       |
+      (a & 0xff) << 24
+    end
+
   end# Image
 
 

data/lib/processing/window.rb

@@ -6,9 +6,9 @@ module Processing
 
     include Xot::Inspectable
 
-    attr_accessor :setup, :update, :draw, :resize,
+    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
 
@@ -18,6 +18,7 @@ module Processing
       Processing.instance_variable_set :@window, self
 
       @events       = []
+      @active       = false
       @error        = nil
       @auto_resize  = true
       @canvas       = Canvas.new self, width, height
@@ -43,6 +44,10 @@ module Processing
       @events.last
     end
 
+    def active?()
+      @active
+    end
+
     def add_overlay(view)
       @overlay_view.add view
     end
@@ -58,14 +63,18 @@ module Processing
       call_block @setup, nil
     end
 
-    def on_resize(e)
-      on_canvas_resize e
-    end
-
     def on_change_pixel_density(pixel_density)
       resize_canvas width, height, window_pixel_density: pixel_density
     end
 
+    def on_activate(e)
+      @active = true
+    end
+
+    def on_deactivate(e)
+      @active = false
+    end
+
     def on_draw(e)
       window_painter.pixel_density.tap do |pd|
         prev, @prev_pixel_density = @prev_pixel_density, pd
@@ -108,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.39'
-  s.add_runtime_dependency 'reflexion', '~> 0.1.42'
+  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'

data/test/test_graphics_context.rb

@@ -40,4 +40,44 @@ class TestGraphicsContext < Test::Unit::TestCase
     assert_raise {g.blendMode LEFT}
   end
 
+  def test_color()
+    g = graphics
+
+    g.colorMode G::RGB, 255
+    c = g.color 10, 20, 30, 40
+    assert_equal 0x280a141e, c
+    assert_equal [10, 20, 30, 40], [g.red(c), g.green(c), g.blue(c), g.alpha(c)]
+
+    g.colorMode G::RGB, 1.0
+    c = g.color 0.1, 0.2, 0.3, 0.4
+    assert_equal 0x6619334c, c
+    assert_in_delta 0.1, g.red(c),   1 / 256.0
+    assert_in_delta 0.2, g.green(c), 1 / 256.0
+    assert_in_delta 0.3, g.blue(c),  1 / 256.0
+    assert_in_delta 0.4, g.alpha(c), 1 / 256.0
+  end
+
+  def test_lerp()
+    g = graphics
+
+    assert_equal 1.0, g.lerp(1.0, 2.0, 0.0)
+    assert_equal 1.5, g.lerp(1.0, 2.0, 0.5)
+    assert_equal 2.0, g.lerp(1.0, 2.0, 1.0)
+
+    assert_equal 0.9, g.lerp(1.0, 2.0, -0.1)
+    assert_equal 2.1, g.lerp(1.0, 2.0,  1.1)
+  end
+
+  def test_lerpColor()
+    g = graphics
+    c = -> red, green, blue {g.color red, green, blue}
+
+    assert_equal c[10, 20, 30], g.lerpColor(c[10, 20, 30], c[50, 60, 70], 0.0)
+    assert_equal c[30, 40, 50], g.lerpColor(c[10, 20, 30], c[50, 60, 70], 0.5)
+    assert_equal c[50, 60, 70], g.lerpColor(c[10, 20, 30], c[50, 60, 70], 1.0)
+
+    assert_equal c[-10, 0,  10], g.lerpColor(c[10, 20, 30], c[50, 60, 70], -0.5)
+    assert_equal c[ 70, 80, 90], g.lerpColor(c[10, 20, 30], c[50, 60, 70],  1.5)
+  end
+
 end# TestGraphics

data/test/test_image.rb

@@ -5,8 +5,36 @@ class TestImage < Test::Unit::TestCase
 
   P = Processing
 
-  def image(w = 10, h = 10)
-    P::Image.new(Rays::Image.new w, h)
+  def image(w = 10, h = 10, &block)
+    img = Rays::Image.new w, h
+    img.paint &block if block
+    P::Image.new img
+  end
+
+  def test_set_color()
+    g = graphics
+    i = image(2, 2) {fill 0; rect 0, 0, 1, 1}
+
+    assert_equal g.color(0, 0, 0),   i.get(0, 0)
+
+    i.set 0, 0,  g.color(0, 255, 0)
+    assert_equal g.color(0, 255, 0), i.get(0, 0)
+
+    i.set 0, 0,  g.color(0, 0, 255)
+    assert_equal g.color(0, 0, 255), i.get(0, 0)
+  end
+
+  def test_get_color()
+    g = graphics
+    i = image 2, 2 do
+      fill 1, 0, 0; rect 0, 0, 1, 1
+      fill 0, 1, 0; rect 1, 0, 1, 1
+      fill 0, 0, 1; rect 0, 1, 1, 1
+    end
+
+    assert_equal g.color(255, 0, 0), i.get(0, 0)
+    assert_equal g.color(0, 255, 0), i.get(1, 0)
+    assert_equal g.color(0, 0, 255), i.get(0, 1)
   end
 
   def test_inspect()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: processing
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.18
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-02 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.39
+        version: 0.1.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.42
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.42
+        version: 0.1.45
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.42
+        version: 0.1.45
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement