processing 0.5.32 → 0.5.34

data/lib/processing/vector.rb

@@ -3,6 +3,9 @@ module Processing
 
   # Vector class.
   #
+  # @see https://processing.org/reference/PVector.html
+  # @see https://p5js.org/reference/#/p5.Vector
+  #
   class Vector
 
     include Comparable
@@ -22,6 +25,9 @@ module Processing
     # @param v [Vector]  vector object to copy
     # @param a [Array]   array like [x, y, z]
     #
+    # @see https://processing.org/reference/PVector.html
+    # @see https://p5js.org/reference/#/p5.Vector
+    #
     def initialize(x = 0, y = 0, z = 0, context: nil)
       @point = case x
         when Rays::Point then x.dup
@@ -42,6 +48,9 @@ module Processing
     #
     # @return [Vector] duplicated vector object
     #
+    # @see https://processing.org/reference/PVector_copy_.html
+    # @see https://p5js.org/reference/#/p5.Vector/copy
+    #
     alias copy dup
 
     # Sets x, y and z.
@@ -60,6 +69,9 @@ module Processing
     #
     # @return [nil] nil
     #
+    # @see https://processing.org/reference/PVector_set_.html
+    # @see https://p5js.org/reference/#/p5.Vector/set
+    #
     def set(*args)
       initialize(*args)
       self
@@ -69,6 +81,9 @@ module Processing
     #
     # @return [Numeric] x value of vector
     #
+    # @see https://processing.org/reference/PVector_x.html
+    # @see https://p5js.org/reference/#/p5.Vector/x
+    #
     def x()
       @point.x
     end
@@ -77,6 +92,9 @@ module Processing
     #
     # @return [Numeric] y value of vector
     #
+    # @see https://processing.org/reference/PVector_y.html
+    # @see https://p5js.org/reference/#/p5.Vector/y
+    #
     def y()
       @point.y
     end
@@ -85,6 +103,9 @@ module Processing
     #
     # @return [Numeric] z value of vector
     #
+    # @see https://processing.org/reference/PVector_z.html
+    # @see https://p5js.org/reference/#/p5.Vector/z
+    #
     def z()
       @point.z
     end
@@ -93,6 +114,9 @@ module Processing
     #
     # @return [Numeric] x value of vector
     #
+    # @see https://processing.org/reference/PVector_x.html
+    # @see https://p5js.org/reference/#/p5.Vector/x
+    #
     def x=(x)
       @point.x = x
     end
@@ -101,6 +125,9 @@ module Processing
     #
     # @return [Numeric] y value of vector
     #
+    # @see https://processing.org/reference/PVector_y.html
+    # @see https://p5js.org/reference/#/p5.Vector/y
+    #
     def y=(y)
       @point.y = y
     end
@@ -109,6 +136,9 @@ module Processing
     #
     # @return [Numeric] z value of vector
     #
+    # @see https://processing.org/reference/PVector_z.html
+    # @see https://p5js.org/reference/#/p5.Vector/z
+    #
     def z=(z)
       @point.z = z
     end
@@ -127,6 +157,9 @@ module Processing
     #
     # @return [Vector] interporated vector
     #
+    # @see https://processing.org/reference/PVector_lerp_.html
+    # @see https://p5js.org/reference/#/p5.Vector/lerp
+    #
     def lerp(*args, amount)
       v      = toVector__(*args)
       self.x = x + (v.x - x) * amount
@@ -143,6 +176,9 @@ module Processing
     #
     # @return [Vector] interporated vector
     #
+    # @see https://processing.org/reference/PVector_lerp_.html
+    # @see https://p5js.org/reference/#/p5.Vector/lerp
+    #
     def self.lerp(v1, v2, amount)
       v1.dup.lerp v2, amount
     end
@@ -153,6 +189,9 @@ module Processing
     #
     # @return [Array] array of x, y, z
     #
+    # @see https://processing.org/reference/PVector_array_.html
+    # @see https://p5js.org/reference/#/p5.Vector/array
+    #
     def array(n = 3)
       @point.to_a n
     end
@@ -172,6 +211,9 @@ module Processing
     #
     # @return [Vector] added vector
     #
+    # @see https://processing.org/reference/PVector_add_.html
+    # @see https://p5js.org/reference/#/p5.Vector/add
+    #
     def add(*args)
       @point += toVector__(*args).getInternal__
       self
@@ -190,6 +232,9 @@ module Processing
     #
     # @return [Vector] subtracted vector
     #
+    # @see https://processing.org/reference/PVector_sub_.html
+    # @see https://p5js.org/reference/#/p5.Vector/sub
+    #
     def sub(*args)
       @point -= toVector__(*args).getInternal__
       self
@@ -201,6 +246,9 @@ module Processing
     #
     # @return [Vector] multiplied vector
     #
+    # @see https://processing.org/reference/PVector_mult_.html
+    # @see https://p5js.org/reference/#/p5.Vector/mult
+    #
     def mult(num)
       @point *= num
       self
@@ -212,6 +260,9 @@ module Processing
     #
     # @return [Vector] divided vector
     #
+    # @see https://processing.org/reference/PVector_div_.html
+    # @see https://p5js.org/reference/#/p5.Vector/div
+    #
     def div(num)
       @point /= num
       self
@@ -223,6 +274,9 @@ module Processing
     #
     # @return [Vector] added vector
     #
+    # @see https://processing.org/reference/PVector_add_.html
+    # @see https://p5js.org/reference/#/p5.Vector/add
+    #
     def +(v)
       dup.add v
     end
@@ -233,6 +287,9 @@ module Processing
     #
     # @return [Vector] subtracted vector
     #
+    # @see https://processing.org/reference/PVector_sub_.html
+    # @see https://p5js.org/reference/#/p5.Vector/sub
+    #
     def -(v)
       dup.sub v
     end
@@ -243,6 +300,9 @@ module Processing
     #
     # @return [Vector] multiplied vector
     #
+    # @see https://processing.org/reference/PVector_mult_.html
+    # @see https://p5js.org/reference/#/p5.Vector/mult
+    #
     def *(num)
       dup.mult num
     end
@@ -253,6 +313,9 @@ module Processing
     #
     # @return [Vector] divided vector
     #
+    # @see https://processing.org/reference/PVector_div_.html
+    # @see https://p5js.org/reference/#/p5.Vector/div
+    #
     def /(num)
       dup.div num
     end
@@ -268,6 +331,9 @@ module Processing
     #
     # @return [Vector] added vector
     #
+    # @see https://processing.org/reference/PVector_add_.html
+    # @see https://p5js.org/reference/#/p5.Vector/add
+    #
     def self.add(v1, v2, target = nil)
       v = v1 + v2
       target.set v if self === target
@@ -285,6 +351,9 @@ module Processing
     #
     # @return [Vector] subtracted vector
     #
+    # @see https://processing.org/reference/PVector_sub_.html
+    # @see https://p5js.org/reference/#/p5.Vector/sub
+    #
     def self.sub(v1, v2, target = nil)
       v = v1 - v2
       target.set v if self === target
@@ -302,6 +371,9 @@ module Processing
     #
     # @return [Vector] multiplied vector
     #
+    # @see https://processing.org/reference/PVector_mult_.html
+    # @see https://p5js.org/reference/#/p5.Vector/mult
+    #
     def self.mult(v1, num, target = nil)
       v = v1 * num
       target.set v if self === target
@@ -319,6 +391,9 @@ module Processing
     #
     # @return [Vector] divided vector
     #
+    # @see https://processing.org/reference/PVector_div_.html
+    # @see https://p5js.org/reference/#/p5.Vector/div
+    #
     def self.div(v1, num, target = nil)
       v = v1 / num
       target.set v if self === target
@@ -329,6 +404,9 @@ module Processing
     #
     # @return [Numeric] length
     #
+    # @see https://processing.org/reference/PVector_mag_.html
+    # @see https://p5js.org/reference/#/p5.Vector/mag
+    #
     def mag()
       @point.length
     end
@@ -337,6 +415,9 @@ module Processing
     #
     # @return [Numeric] squared length
     #
+    # @see https://processing.org/reference/PVector_magSq_.html
+    # @see https://p5js.org/reference/#/p5.Vector/magSq
+    #
     def magSq()
       Rays::Point::dot(@point, @point)
     end
@@ -351,6 +432,9 @@ module Processing
     #
     # @return [Vector] vector with new length
     #
+    # @see https://processing.org/reference/PVector_setMag_.html
+    # @see https://p5js.org/reference/#/p5.Vector/setMag
+    #
     def setMag(target = nil, len)
       (target || self).set @point.normal * len
     end
@@ -361,6 +445,9 @@ module Processing
     #
     # @return [Vector] normalized vector
     #
+    # @see https://processing.org/reference/PVector_normalize_.html
+    # @see https://p5js.org/reference/#/p5.Vector/normalize
+    #
     def normalize(target = nil)
       (target || self).set @point.normal
     end
@@ -371,6 +458,9 @@ module Processing
     #
     # @return [Vector] new vector
     #
+    # @see https://processing.org/reference/PVector_limit_.html
+    # @see https://p5js.org/reference/#/p5.Vector/limit
+    #
     def limit(max)
       setMag max if magSq > max ** 2
       self
@@ -382,6 +472,9 @@ module Processing
     #
     # @return [Numeric] the distance
     #
+    # @see https://processing.org/reference/PVector_dist_.html
+    # @see https://p5js.org/reference/#/p5.Vector/dist
+    #
     def dist(v)
       (self - v).mag
     end
@@ -393,6 +486,9 @@ module Processing
     #
     # @return [Numeric] the distance
     #
+    # @see https://processing.org/reference/PVector_dist_.html
+    # @see https://p5js.org/reference/#/p5.Vector/dist
+    #
     def self.dist(v1, v2)
       v1.dist v2
     end
@@ -410,6 +506,9 @@ module Processing
     #
     # @return [Numeric] result of dot product
     #
+    # @see https://processing.org/reference/PVector_dot_.html
+    # @see https://p5js.org/reference/#/p5.Vector/dot
+    #
     def dot(*args)
       Rays::Point::dot getInternal__, toVector__(*args).getInternal__
     end
@@ -421,6 +520,9 @@ module Processing
     #
     # @return [Numeric] result of dot product
     #
+    # @see https://processing.org/reference/PVector_dot_.html
+    # @see https://p5js.org/reference/#/p5.Vector/dot
+    #
     def self.dot(v1, v2)
       v1.dot v2
     end
@@ -438,6 +540,9 @@ module Processing
     #
     # @return [Numeric] result of cross product
     #
+    # @see https://processing.org/reference/PVector_cross_.html
+    # @see https://p5js.org/reference/#/p5.Vector/cross
+    #
     def cross(a, *rest)
       target = self.class === rest.last ? rest.pop : nil
       v = self.class.new Rays::Point::cross getInternal__, toVector__(a, *rest).getInternal__
@@ -452,6 +557,9 @@ module Processing
     #
     # @return [Numeric] result of cross product
     #
+    # @see https://processing.org/reference/PVector_cross_.html
+    # @see https://p5js.org/reference/#/p5.Vector/cross
+    #
     def self.cross(v1, v2, target = nil)
       v1.cross v2, target
     end
@@ -462,6 +570,9 @@ module Processing
     #
     # @return [Vector] rotated this object
     #
+    # @see https://processing.org/reference/PVector_rotate_.html
+    # @see https://p5js.org/reference/#/p5.Vector/rotate
+    #
     def rotate(angle)
       deg = @context ?
         @context.toDegrees__(angle) : angle * GraphicsContext::RAD2DEG__
@@ -473,6 +584,9 @@ module Processing
     #
     # @return [Numeric] the angle in radians
     #
+    # @see https://processing.org/reference/PVector_heading_.html
+    # @see https://p5js.org/reference/#/p5.Vector/heading
+    #
     def heading()
       Math.atan2 y, x
     end
@@ -484,6 +598,9 @@ module Processing
     #
     # @return [Vector] rotated vector
     #
+    # @see https://processing.org/reference/PVector_fromAngle_.html
+    # @see https://p5js.org/reference/#/p5.Vector/fromAngle
+    #
     def self.fromAngle(angle, target = nil)
       v = self.new(1, 0, 0).rotate(angle)
       target.set v if target
@@ -497,6 +614,9 @@ module Processing
     #
     # @return [Numeric] angle in radians
     #
+    # @see https://processing.org/reference/PVector_angleBetween_.html
+    # @see https://p5js.org/reference/#/p5.Vector/angleBetween
+    #
     def self.angleBetween(v1, v2)
       x1, y1, z1 = v1.array
       x2, y2, z2 = v2.array
@@ -514,6 +634,9 @@ module Processing
     #
     # @return [Vector] a random vector
     #
+    # @see https://processing.org/reference/PVector_random2D_.html
+    # @see https://p5js.org/reference/#/p5.Vector/random2D
+    #
     def self.random2D(target = nil)
       v = self.new(1, 0, 0)
       v.getInternal__.rotate! rand 0.0...360.0
@@ -527,6 +650,9 @@ module Processing
     #
     # @return [Vector] a random vector
     #
+    # @see https://processing.org/reference/PVector_random3D_.html
+    # @see https://p5js.org/reference/#/p5.Vector/random3D
+    #
     def self.random3D(target = nil)
       angle = rand 0.0...(Math::PI * 2)
       z     = rand(-1.0..1.0)

data/lib/processing/window.rb

@@ -6,14 +6,6 @@ module Processing
 
     include Xot::Inspectable
 
-    attr_accessor :setup, :update, :draw,
-      :key_down, :key_up,
-      :pointer_down, :pointer_up, :pointer_move,
-      :move, :resize, :motion,
-      :before_draw, :after_draw, :update_window, :update_canvas
-
-    attr_accessor :auto_resize
-
     def initialize(width = 500, height = 500, *args, **kwargs, &block)
       Processing.instance_variable_set :@window, self
 
@@ -26,19 +18,16 @@ module Processing
       @overlay_view = @canvas_view.add Reflex::View.new name: :overlay
 
       super(*args, size: [width, height], **kwargs, &block)
+      self.center = screen.center
     end
 
-    def canvas_image()
-      @canvas.image
-    end
+    attr_accessor :setup, :update, :draw, :move, :resize, :motion,
+      :key_down, :key_up, :pointer_down, :pointer_up, :pointer_move, :wheel,
+      :before_draw, :after_draw, :update_window, :update_canvas
 
-    def canvas_painter()
-      @canvas.painter
-    end
+    attr_accessor :auto_resize
 
-    def window_painter()
-      self.painter
-    end
+    attr_reader :canvas
 
     def event()
       @events.last
@@ -64,7 +53,9 @@ module Processing
     end
 
     def on_change_pixel_density(pixel_density)
-      resize_canvas width, height, window_pixel_density: pixel_density
+      resize_canvas(
+        @canvas.width, @canvas.height,
+        window_pixel_density: pixel_density)
     end
 
     def on_activate(e)
@@ -80,7 +71,7 @@ module Processing
     end
 
     def on_draw(e)
-      window_painter.pixel_density.tap do |pd|
+      painter.pixel_density.tap do |pd|
         prev, @prev_pixel_density = @prev_pixel_density, pd
         on_change_pixel_density pd if prev && pd != prev
       end
@@ -127,28 +118,35 @@ module Processing
       draw_canvas {call_block block, e} if block
     end
 
+    def on_canvas_wheel(e)
+      draw_canvas {call_block @wheel, e} if @wheel
+    end
+
     def on_canvas_resize(e)
       resize_canvas e.width, e.height if @auto_resize
       draw_canvas {call_block @resize, e} if @resize
     end
 
-    def resize_canvas(width, height, pixel_density = nil, window_pixel_density: nil)
-      painting = canvas_painter.painting?
-      canvas_painter.__send__ :end_paint if painting
+    def resize_canvas(
+      width, height,
+      pixel_density       = nil,
+      window_pixel_density: nil,
+      antialiasing:         nil)
+
+      painting = @canvas.painter.painting?
+      @canvas.painter.__send__ :end_paint if painting
 
       @pixel_density = pixel_density if pixel_density
 
       resized =
         begin
-          @canvas.resize width, height, @pixel_density || window_pixel_density
+          pd = @pixel_density || window_pixel_density
+          @canvas.resize width, height, pd, antialiasing
         ensure
-          canvas_painter.__send__ :begin_paint if painting
+          @canvas.painter.__send__ :begin_paint if painting
         end
 
-      if resized
-        @update_canvas.call canvas_image, canvas_painter if @update_canvas
-        size width, height
-      end
+      @update_canvas&.call @canvas.image, @canvas.painter if resized
     end
 
     private
@@ -157,12 +155,12 @@ module Processing
       scrollx, scrolly, zoom = get_scroll_and_zoom
       @canvas_view.scroll_to scrollx, scrolly
       @canvas_view.zoom  = zoom
-      @overlay_view.size = canvas_image.size
+      @overlay_view.size = @canvas.image.size
     end
 
     def get_scroll_and_zoom()
-      ww, wh =              width.to_f,              height.to_f
-      cw, ch = canvas_image.width.to_f, canvas_image.height.to_f
+      ww, wh =               width.to_f,               height.to_f
+      cw, ch = @canvas.image.width.to_f, @canvas.image.height.to_f
       return [0, 0, 1] if ww == 0 || wh == 0 || cw == 0 || ch == 0
 
       wratio, cratio = ww / wh, cw / ch
@@ -184,21 +182,21 @@ module Processing
     end
 
     def begin_draw()
-      canvas_painter.__send__ :begin_paint
+      @canvas.painter.__send__ :begin_paint
       @before_draw&.call
     end
 
     def end_draw()
       @after_draw&.call
-      canvas_painter.__send__ :end_paint
+      @canvas.painter.__send__ :end_paint
     end
 
     def drawing?()
-      canvas_painter.painting?
+      @canvas.painter.painting?
     end
 
     def draw_screen(painter)
-      window_painter.image canvas_image
+      painter.image @canvas.render
     end
 
     def call_block(block, event, *args)
@@ -214,60 +212,98 @@ module Processing
   end# Window
 
 
+  # @private
   class Window::Canvas
 
-    attr_reader :image, :painter
-
     def initialize(window, width, height)
-      @image   = nil
-      @painter = window.painter
+      @framebuffer = nil
+      @paintable   = nil
+      @painter     = window.painter
+
+      @painter.miter_limit = 10
 
       resize width, height
-      painter.miter_limit = 10
     end
 
-    def resize(width, height, pixel_density = nil)
+    attr_reader :painter
+
+    def resize(width, height, pixel_density = nil, antialiasing = nil)
       return false if width <= 0 || height <= 0
 
+      cs = @framebuffer&.color_space || Rays::RGBA
+      pd = pixel_density || (@framebuffer || @painter).pixel_density
+      aa = antialiasing == nil ? antialiasing? : (antialiasing && pd < 2)
       return false if
-        width         == @image&.width  &&
-        height        == @image&.height &&
-        pixel_density == @painter.pixel_density
+        width  == @framebuffer&.width  &&
+        height == @framebuffer&.height &&
+        pd     == @framebuffer&.pixel_density &&
+        aa     == antialiasing?
 
-      old_image   = @image
-      old_painter = @painter
-      cs          = old_image&.color_space || Rays::RGBA
-      pd          = pixel_density || old_painter.pixel_density
+      old_paintable, old_painter = @paintable, @painter
 
-      @image   = Rays::Image.new width, height, cs, pd
-      @painter = @image.painter
+      @framebuffer = Rays::Image.new width, height, cs, pd
+      @paintable   = aa ? Rays::Image.new(width, height, cs, pd * 2) : @framebuffer
+      @painter     = @paintable.painter
 
-      @painter.paint {image old_image} if old_image
+      @painter.paint {image old_paintable} if old_paintable
       copy_painter old_painter, @painter
 
       GC.start
       return true
     end
 
+    def render()
+      @framebuffer.paint {|p| p.image @paintable} if antialiasing?
+      @framebuffer
+    end
+
+    def image()
+      @paintable
+    end
+
+    def width()
+      @framebuffer.width
+    end
+
+    def height()
+      @framebuffer.height
+    end
+
+    def pixel_density()
+      @framebuffer.pixel_density
+    end
+
+    def antialiasing?()
+      !!@framebuffer && !!@paintable && @framebuffer != @paintable
+    end
+
     private
 
     def copy_painter(from, to)
-      to.fill         = from.fill
-      to.stroke       = from.stroke
-      to.stroke_width = from.stroke_width
-      to.stroke_cap   = from.stroke_cap
-      to.stroke_join  = from.stroke_join
-      to.miter_limit  = from.miter_limit
-      to.font         = from.font
+      to.fill          = from.fill
+      to.stroke        = from.stroke
+      to.stroke_width  = from.stroke_width
+      to.stroke_cap    = from.stroke_cap
+      to.stroke_join   = from.stroke_join
+      to.miter_limit   = from.miter_limit
+      to.clip          = from.clip
+      to.blend_mode    = from.blend_mode
+      to.font          = from.font
+      to.texture       = from.texture
+      to.texcoord_mode = from.texcoord_mode
+      to.texcoord_wrap = from.texcoord_wrap
+      to.shader        = from.shader
     end
 
   end# Window::Canvas
 
 
+  # @private
   class Window::CanvasView < Reflex::View
 
     def on_update(e)
       window.on_canvas_update e
+      Thread.pass
     end
 
     def on_draw(e)
@@ -278,6 +314,10 @@ module Processing
       window.on_canvas_pointer e
     end
 
+    def on_wheel(e)
+      window.on_canvas_wheel e
+    end
+
     def on_resize(e)
       window.on_canvas_resize e
     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.41'
-  s.add_runtime_dependency 'rucy',      '~> 0.1.43'
-  s.add_runtime_dependency 'rays',      '~> 0.1.48'
-  s.add_runtime_dependency 'reflexion', '~> 0.1.56'
+  s.add_runtime_dependency 'xot',       '~> 0.1.42'
+  s.add_runtime_dependency 'rucy',      '~> 0.1.44'
+  s.add_runtime_dependency 'rays',      '~> 0.1.49'
+  s.add_runtime_dependency 'reflexion', '~> 0.1.57'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}