rubysketch 0.3.18 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a179e1170c79df6daea6d79f66eddc3aa7b50d22b2c685bcb36864f0644212e
-  data.tar.gz: 39565ddbcc31a7b6ef472c1fed40c91be91958531246b1673698afcd68ae621e
+  metadata.gz: acfaff485263c8e6557c8610df2a4643e53d1046e55cf813c79b648492e84d52
+  data.tar.gz: d7beb5170988d554771d50d5a726b1f51c961cded8a3cf3370dc55ccc91059fb
 SHA512:
-  metadata.gz: 435879c3538ece61aaecee0c19e6ece104934316fb113b2f23d9dc57394ded709417e30e32a7697ba1c465927b9d615fa945d1d4a4aa5068629509a33fcdbfff
-  data.tar.gz: b310a39f0c5e5fc55130d8c2cdd71c7620d17a42976d51fc73d7b09d41eeac15854482280bb213a937eda3474185935f27a1dcb6fd2983fad9a144c140fb337a
+  metadata.gz: 95ce0e61b8db2f0046bfd43070dd9d10f24b48f7838b267509b98e9a4b6930aa8958c065ae7af253c3877c754a5187ce970b80722421c32e6fbb9de4d1ebc05a
+  data.tar.gz: a810edf5f210a8a505fc3830697a46a76a743860a90118d1de38e99192d0cf43639dd5410409baf040c4b6feb0275a90d2cb330230b7457890d8555b9f257d5e

data/.github/workflows/release.yml

@@ -12,10 +12,10 @@ jobs:
       - name: checkout
         uses: actions/checkout@v2
 
-      - name: ruby 2.7
+      - name: ruby 3.0
         uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.7.x
+          ruby-version: 3.0.x
 
       - name: install gems
         run: |

data/.github/workflows/test.yml

@@ -13,10 +13,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: ruby 2.7
+      - name: ruby 3.0
         uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.7.x
+          ruby-version: 3.0.x
 
       - name: install gems
         run: |

data/ChangeLog.md

@@ -1,12 +1,41 @@
 # RubySketch ChangeLog
 
 
-## [0.3.17] - 2021-12-5
+## [0.3.21] - 2022-x-x
+
+- add rubysketch-glsl.rb
+- add blend(), createImage(), setTitle(), tint() and noTint()
+- add save() that saves screen image to file
+- circle() function is affected by ellipseMode()
+- point() draws by line(x, y, x, y)
+- change initial values for strokeCap and strokeJoin to ROUND and MITER
+
+
+## [0.3.20] - 2022-07-24
+
+- add mouseClicked()
+- add blendMode()
+- add clip() and noClip()
+- translate() can take 'z' parameter
+- fix that resizing canvas consumes too much memory
+
+
+## [0.3.19] - 2021-12-5
+
+- fix runtime error
+
+
+## [0.3.18] - 2021-12-5
 
 - add 'mouseButton'
 - pointer cancel event calls pointer_up block
 
 
+## [0.3.17] - 2021-12-5
+
+- add Touch#id
+
+
 ## [0.3.16] - 2021-2-14
 
 - add key, keyCode and keyPressed system values

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'yard'
-gem 'reflexion'
+gemspec

data/Rakefile

@@ -22,7 +22,7 @@ test_ruby_extension
 generate_documents
 build_ruby_gem
 
-task :default => :test
+task :default
 
 
 namespace :version do

data/RubySketch.podspec

@@ -0,0 +1,28 @@
+# -*- mode: ruby -*-
+
+
+Pod::Spec.new do |s|
+  s.name         = "RubySketch"
+  s.version      = File.readlines(File.expand_path 'VERSION', __dir__)[0].chomp
+  s.summary      = "Yet Another Processing implementation for Ruby"
+  s.description  = "Yet Another Processing implementation for Ruby"
+  s.license      = "MIT"
+  s.source       = {:git => "https://github.com/xord/rubysketch.git"}
+  s.author       = {"xordog" => "xordog@gmail.com"}
+  s.homepage     = "https://github.com/xord/rubysketch"
+
+  s.osx.deployment_target = "10.10"
+  s.ios.deployment_target = "10.0"
+
+  incdirs = %W[
+    #{s.name}/src
+    CRuby/CRuby/include
+    Reflexion/reflex/include
+  ].map {|s| "${PODS_ROOT}/#{s}"}
+
+  s.preserve_paths = "src"
+  s.source_files   = "src/*.mm"
+  s.xcconfig       = {"HEADER_SEARCH_PATHS" => incdirs.join(' ')}
+
+  s.resource_bundles = {'RubySketch' => %w[lib VERSION]}
+end

data/VERSION

@@ -1 +1 @@
-0.3.18
+0.3.21

data/examples/glsl.rb

@@ -2,16 +2,13 @@
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
-require 'rubysketch'
+require 'rubysketch-glsl'
 
-
-RubySketch::GLSL.start <<END
-  varying vec4 v_TexCoord;
+RubySketch::GLSL.run <<END
   uniform vec2 resolution;
   uniform float time;
-  void main ()
-  {
-    vec2 pos = v_TexCoord.xy / resolution;
-    gl_FragColor = vec4(pos, float(mod(time, 1.0)), 1);
+  void main() {
+    vec2 pos = gl_FragCoord.xy / resolution;
+    gl_FragColor = vec4(pos * abs(sin(time)), 0, 1);
   }
 END

data/lib/rubysketch/glsl.rb

@@ -1,29 +1,36 @@
 module RubySketch
 
 
-  # @private
-  class GLSL
+  # OpenGL Shader Language
+  #
+  module GLSL
 
-    def initialize(glsl)
-      @shader = Reflex::Shader.new glsl
-    end
 
     # @private
-    def on_start__(window)
-      start = Time.now.to_f
-
-      window.draw = proc do |e, painter|
-        painter.paint do |p|
-          c = window.canvas
-          w = c.width
-          h = c.height
-          t = Time.now.to_f - start
-          p.shader @shader, resolution: [w, h], time: t if @shader
+    class Context
+
+      # @private
+      def initialize(window, shader_source)
+        shader = Rays::Shader.new shader_source
+        start  = now__
+        window.draw = proc do |e|
+          i, p = window.canvas_image, window.canvas_painter
+          w, h = i.width, i.height
+          p.shader shader, resolution: [w, h], time: now__ - start
           p.fill 1
           p.rect 0, 0, w, h
         end
       end
-    end
+
+      private
+
+      # @private
+      def now__()
+        Time.now.to_f
+      end
+
+    end# Context
+
 
   end# GLSL
 

data/lib/rubysketch/processing.rb

@@ -624,9 +624,34 @@ module RubySketch
       # @return [nil] nil
       #
       def copy(img = nil, sx, sy, sw, sh, dx, dy, dw, dh)
+        blend img, sx, sy, sw, sh, dx, dy, dw, dh, :normal
+      end
+
+      # Blends image.
+      #
+      # @overload blend(sx, sy, sw, sh, dx, dy, dw, dh, mode)
+      # @overload blend(img, sx, sy, sw, sh, dx, dy, dw, dh, mode)
+      #
+      # @param img  [Image]   image for blend source
+      # @param sx   [Numrtic] x position of source region
+      # @param sy   [Numrtic] y position of source region
+      # @param sw   [Numrtic] width of source region
+      # @param sh   [Numrtic] height of source region
+      # @param dx   [Numrtic] x position of destination region
+      # @param dy   [Numrtic] y position of destination region
+      # @param dw   [Numrtic] width of destination region
+      # @param dh   [Numrtic] height of destination region
+      # @param mode [BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, EXCLUSION, MULTIPLY, SCREEN, REPLACE] blend mode
+      #
+      # @return [nil] nil
+      #
+      def blend(img = nil, sx, sy, sw, sh, dx, dy, dw, dh, mode)
         img ||= self
         @image.paint do |painter|
+          current = painter.blend_mode
+          painter.blend_mode = mode
           painter.image img.getInternal__, sx, sy, sw, sh, dx, dy, dw, dh
+          painter.blend_mode = current
         end
       end
 
@@ -850,13 +875,17 @@ module RubySketch
       #
       TAU        = PI * 2
 
-      # RGB mode for colorMode().
+      # RGBA format for createImage().
       #
-      RGB = :rgb
+      RGBA = :rgba
+
+      # RGB format for createImage, or RGB mode for colorMode().
+      #
+      RGB  = :rgb
 
       # HSB mode for colorMode().
       #
-      HSB = :hsb
+      HSB  = :hsb
 
       # Radian mode for angleMode().
       #
@@ -882,6 +911,73 @@ module RubySketch
       #
       RADIUS  = :radius
 
+      # Mode for strokeCap().
+      #
+      BUTT   = :butt
+
+      # Mode for strokeJoin().
+      #
+      MITER  = :miter
+
+      # Mode for strokeCap() and strokeJoin().
+      #
+      ROUND  = :round
+
+      # Mode for strokeCap() and strokeJoin().
+      #
+      SQUARE = :square
+
+      # Mode for blendMode().
+      #
+      BLEND     = :normal
+
+      # Mode for blendMode().
+      #
+      ADD       = :add
+
+      # Mode for blendMode().
+      #
+      SUBTRACT  = :subtract
+
+      # Mode for blendMode().
+      #
+      LIGHTEST  = :lightest
+
+      # Mode for blendMode().
+      #
+      DARKEST   = :darkest
+
+      # Mode for blendMode().
+      #
+      EXCLUSION = :exclusion
+
+      # Mode for blendMode().
+      #
+      MULTIPLY  = :multiply
+
+      # Mode for blendMode().
+      #
+      SCREEN    = :screen
+
+      # Mode for blendMode().
+      #
+      REPLACE   = :replace
+
+      # Key code or Mode for textAlign().
+      LEFT     = :left
+
+      # Key code or Mode for textAlign().
+      RIGHT    = :right
+
+      # Mode for textAlign().
+      TOP      = :top
+
+      # Mode for textAlign().
+      BOTTOM   = :bottom
+
+      # Mode for textAlign().
+      BASELINE = :baseline
+
       # Key codes.
       ENTER     = :enter
       SPACE     = :space
@@ -931,37 +1027,7 @@ module RubySketch
       UP        = :up
       DOWN      = :down
 
-      # Key code or Mode for textAlign().
-      LEFT     = :left
-
-      # Key code or Mode for textAlign().
-      RIGHT    = :right
-
-      # Mode for textAlign().
-      TOP      = :top
-
-      # Mode for textAlign().
-      BOTTOM   = :bottom
-
-      # Mode for textAlign().
-      BASELINE = :baseline
-
-      # Mode for strokeCap().
-      #
-      BUTT   = :butt
-
-      # Mode for strokeJoin().
-      #
-      MITER  = :miter
-
-      # Mode for strokeCap() and strokeJoin().
-      #
-      ROUND  = :round
-
-      # Mode for strokeCap() and strokeJoin().
-      #
-      SQUARE = :square
-
+      # @private
       def init__(image, painter)
         @drawing__     = false
         @hsbColor__    = false
@@ -970,10 +1036,12 @@ module RubySketch
         @rectMode__    = nil
         @ellipseMode__ = nil
         @imageMode__   = nil
+        @tint__        = nil
         @textAlignH__  = nil
         @textAlignV__  = nil
         @matrixStack__ = []
         @styleStack__  = []
+        @fontCache__   = {}
 
         updateCanvas__ image, painter
 
@@ -982,13 +1050,18 @@ module RubySketch
         rectMode    CORNER
         ellipseMode CENTER
         imageMode   CORNER
+        blendMode   BLEND
+        strokeCap   ROUND
+        strokeJoin  MITER
         textAlign   LEFT
 
         fill 255
         stroke 0
         strokeWeight 1
+        noTint
       end
 
+      # @private
       def updateCanvas__(image, painter)
         @image__, @painter__ = image, painter
       end
@@ -1146,6 +1219,17 @@ module RubySketch
         end
       end
 
+      # Sets blend mode. Default is BLEND.
+      #
+      # @param mode [BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, EXCLUSION, MULTIPLY, SCREEN, REPLACE]
+      #
+      # @return [nil] nil
+      #
+      def blendMode(mode)
+        @painter__.blend_mode = mode
+        nil
+      end
+
       # Sets fill color.
       #
       # @overload fill(rgb)
@@ -1169,6 +1253,15 @@ module RubySketch
         nil
       end
 
+      # Disables filling.
+      #
+      # @return [nil] nil
+      #
+      def noFill()
+        @painter__.fill nil
+        nil
+      end
+
       # Sets stroke color.
       #
       # @overload stroke(rgb)
@@ -1192,6 +1285,15 @@ module RubySketch
         nil
       end
 
+      # Disables drawing stroke.
+      #
+      # @return [nil] nil
+      #
+      def noStroke()
+        @painter__.stroke nil
+        nil
+      end
+
       # Sets stroke weight.
       #
       # @param weight [Numeric] width of stroke
@@ -1225,33 +1327,78 @@ module RubySketch
         nil
       end
 
-      # Disables filling.
+      # Sets fill color for drawing images.
+      #
+      # @overload tint(rgb)
+      # @overload tint(rgb, alpha)
+      # @overload tint(gray)
+      # @overload tint(gray, alpha)
+      # @overload tint(r, g, b)
+      # @overload tint(r, g, b, alpha)
+      #
+      # @param rgb   [String]  color code like '#00AAFF'
+      # @param gray  [Integer]  gray value (0..255)
+      # @param r     [Integer]   red value (0..255)
+      # @param g     [Integer] green value (0..255)
+      # @param b     [Integer]  blue value (0..255)
+      # @param alpha [Integer] alpha value (0..255)
       #
       # @return [nil] nil
       #
-      def noFill()
-        @painter__.fill nil
+      def tint(*args)
+        @tint__ = args
         nil
       end
 
-      # Disables drawing stroke.
+      # Resets tint color.
       #
       # @return [nil] nil
       #
-      def noStroke()
-        @painter__.stroke nil
+      def noTint()
+        @tint__ = nil
+      end
+
+      # Limits the drawable rectangle.
+      #
+      # The parameters a, b, c, and d are determined by rectMode().
+      #
+      # @param a [Numeric] horizontal position of the drawable area, by default
+      # @param b [Numeric] vertical position of the drawable area, by default
+      # @param c [Numeric] width of the drawable area, by default
+      # @param d [Numeric] height of the drawable area, by default
+      #
+      # @return [nil] nil
+      #
+      def clip(a, b, c, d)
+        x, y, w, h = toXYWH__ @imageMode__, a, b, c, d
+        @painter__.clip x, y, w, h
+        nil
+      end
+
+      # Disables clipping.
+      #
+      # @return [nil] nil
+      #
+      def noClip()
+        @painter__.no_clip
         nil
       end
 
       # Sets font.
       #
+      # @overload textFont(font)
+      # @overload textFont(name)
+      # @overload textFont(font, size)
+      # @overload textFont(name, size)
+      #
+      # @param font [Font]    font
       # @param name [String]  font name
       # @param size [Numeric] font size (max 256)
       #
       # @return [Font] current font
       #
-      def textFont(name = nil, size = nil)
-        setFont__ name, size if name || size
+      def textFont(font = nil, size = nil)
+        setFont__ font, size if font || size
         Font.new @painter__.font
       end
 
@@ -1262,7 +1409,7 @@ module RubySketch
       # @return [nil] nil
       #
       def textSize(size)
-        setFont__ @painter__.font.name, size
+        setFont__ nil, size
         nil
       end
 
@@ -1284,9 +1431,15 @@ module RubySketch
       end
 
       # @private
-      def setFont__(name, size)
-        size = 256 if size && size > 256
-        @painter__.font name, size
+      def setFont__(fontOrName, size)
+        name = case fontOrName
+          when Font then fontOrName.name
+          else fontOrName || @painter__.font.name
+          end
+        size ||= @painter__.font.size
+        size = 256 if size > 256
+        font = @fontCache__[[name, size]] ||= Rays::Font.new name, size
+        @painter__.font = font
       end
 
       # Clears screen.
@@ -1313,7 +1466,7 @@ module RubySketch
         if rgba[3] == 1
           @painter__.background(*rgba)
         else
-          @painter__.push fill: rgba, stroke: nil do |_|
+          @painter__.push fill: rgba, stroke: :none do |_|
             @painter__.rect 0, 0, width, height
           end
         end
@@ -1329,9 +1482,7 @@ module RubySketch
       #
       def point(x, y)
         assertDrawing__
-        w = @painter__.stroke_width
-        w = 1 if w == 0
-        @painter__.ellipse x - (w / 2.0), y - (w / 2.0), w, w
+        @painter__.line x, y, x, y
         nil
       end
 
@@ -1352,14 +1503,16 @@ module RubySketch
 
       # Draws a rectangle.
       #
+      # The parameters a, b, c, and d are determined by rectMode().
+      #
       # @overload rect(a, b, c, d)
       # @overload rect(a, b, c, d, r)
       # @overload rect(a, b, c, d, tl, tr, br, bl)
       #
-      # @param a  [Numeric] horizontal position of the shape by default
-      # @param b  [Numeric] vertical position of the shape by default
-      # @param c  [Numeric] width of the shape by default
-      # @param d  [Numeric] height of the shape by default
+      # @param a  [Numeric] horizontal position of the shape, by default
+      # @param b  [Numeric] vertical position of the shape, by default
+      # @param c  [Numeric] width of the shape, by default
+      # @param d  [Numeric] height of the shape, by default
       # @param r  [Numeric] radius for all corners
       # @param tl [Numeric] radius for top-left corner
       # @param tr [Numeric] radius for top-right corner
@@ -1382,10 +1535,12 @@ module RubySketch
 
       # Draws an ellipse.
       #
-      # @param a [Numeric] horizontal position of the shape
-      # @param b [Numeric] vertical position of the shape
-      # @param c [Numeric] width of the shape
-      # @param d [Numeric] height of the shape
+      # The parameters a, b, c, and d are determined by ellipseMode().
+      #
+      # @param a [Numeric] horizontal position of the shape, by default
+      # @param b [Numeric] vertical position of the shape, by default
+      # @param c [Numeric] width of the shape, by default
+      # @param d [Numeric] height of the shape, by default
       #
       # @return [nil] nil
       #
@@ -1410,10 +1565,12 @@ module RubySketch
 
       # Draws an arc.
       #
-      # @param a     [Numeric] horizontal position of the shape
-      # @param b     [Numeric] vertical position of the shape
-      # @param c     [Numeric] width of the shape
-      # @param d     [Numeric] height of the shape
+      # The parameters a, b, c, and d are determined by ellipseMode().
+      #
+      # @param a     [Numeric] horizontal position of the shape, by default
+      # @param b     [Numeric] vertical position of the shape, by default
+      # @param c     [Numeric] width of the shape, by default
+      # @param d     [Numeric] height of the shape, by default
       # @param start [Numeric] angle to start the arc
       # @param stop  [Numeric] angle to stop the arc
       #
@@ -1516,6 +1673,8 @@ module RubySketch
 
       # Draws a text.
       #
+      # The parameters a, b, c, and d are determined by rectMode().
+      #
       # @overload text(str)
       # @overload text(str, x, y)
       # @overload text(str, a, b, c, d)
@@ -1523,10 +1682,10 @@ module RubySketch
       # @param str [String]  text to draw
       # @param x   [Numeric] horizontal position of the text
       # @param y   [Numeric] vertical position of the text
-      # @param a   [Numeric] equivalent to parameters of the rect(), see rectMode()
-      # @param b   [Numeric] equivalent to parameters of the rect(), see rectMode()
-      # @param c   [Numeric] equivalent to parameters of the rect(), see rectMode()
-      # @param d   [Numeric] equivalent to parameters of the rect(), see rectMode()
+      # @param a   [Numeric] horizontal position of the text, by default
+      # @param b   [Numeric] vertical position of the text, by default
+      # @param c   [Numeric] width of the text, by default
+      # @param d   [Numeric] height of the text, by default
       #
       # @return [nil] nil
       #
@@ -1553,22 +1712,27 @@ module RubySketch
 
       # Draws an image.
       #
+      # The parameters a, b, c, and d are determined by imageMode().
+      #
       # @overload image(img, a, b)
       # @overload image(img, a, b, c, d)
       #
       # @param img [Image] image to draw
-      # @param a   [Numeric] horizontal position of the image
-      # @param b   [Numeric] vertical position of the image
-      # @param c   [Numeric] width of the image
-      # @param d   [Numeric] height of the image
+      # @param a   [Numeric] horizontal position of the image, by default
+      # @param b   [Numeric] vertical position of the image, by default
+      # @param c   [Numeric] width of the image, by default
+      # @param d   [Numeric] height of the image, by default
       #
       # @return [nil] nil
       #
       def image(img, a, b, c = nil, d = nil)
         assertDrawing__
-        i = img.getInternal__
+        i          = img.getInternal__
         x, y, w, h = toXYWH__ @imageMode__, a, b, c || i.width, d || i.height
-        @painter__.image i, x, y, w, h
+        tint       = @tint__ ? toRGBA__(*@tint__) : 1
+        @painter__.push fill: tint, stroke: :none do |_|
+          @painter__.image i, x, y, w, h
+        end
         nil
       end
 
@@ -1590,21 +1754,59 @@ module RubySketch
       # @return [nil] nil
       #
       def copy(img = nil, sx, sy, sw, sh, dx, dy, dw, dh)
+        blend img, sx, sy, sw, sh, dx, dy, dw, dh, BLEND
+      end
+
+      # Blends image.
+      #
+      # @overload blend(sx, sy, sw, sh, dx, dy, dw, dh, mode)
+      # @overload blend(img, sx, sy, sw, sh, dx, dy, dw, dh, mode)
+      #
+      # @param img  [Image]   image for blend source
+      # @param sx   [Numrtic] x position of source region
+      # @param sy   [Numrtic] y position of source region
+      # @param sw   [Numrtic] width of source region
+      # @param sh   [Numrtic] height of source region
+      # @param dx   [Numrtic] x position of destination region
+      # @param dy   [Numrtic] y position of destination region
+      # @param dw   [Numrtic] width of destination region
+      # @param dh   [Numrtic] height of destination region
+      # @param mode [BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, EXCLUSION, MULTIPLY, SCREEN, REPLACE] blend mode
+      #
+      # @return [nil] nil
+      #
+      def blend(img = nil, sx, sy, sw, sh, dx, dy, dw, dh, mode)
         assertDrawing__
-        src = img&.getInternal__ || @window__.canvas_image
+        src     = img&.getInternal__ || @window__.canvas_image
+        current = @painter__.blend_mode
+
+        @painter__.blend_mode = mode
         @painter__.image src, sx, sy, sw, sh, dx, dy, dw, dh
+        @painter__.blend_mode = current
+      end
+
+      # Saves screen image to file.
+      #
+      # @param filename [String] file name to save image
+      #
+      def save(filename)
+        @window__.canvas_image.save filename
       end
 
       # Applies translation matrix to current transformation matrix.
       #
-      # @param x [Numeric] horizontal transformation
-      # @param y [Numeric] vertical transformation
+      # @overload translate(x, y)
+      # @overload translate(x, y, z)
+      #
+      # @param x [Numeric] left/right translation
+      # @param y [Numeric] up/down translation
+      # @param y [Numeric] forward/backward translation
       #
       # @return [nil] nil
       #
-      def translate(x, y)
+      def translate(x, y, z = 0)
         assertDrawing__
-        @painter__.translate x, y
+        @painter__.translate x, y, z
         nil
       end
 
@@ -1684,6 +1886,8 @@ module RubySketch
           @painter__.stroke_width,
           @painter__.stroke_cap,
           @painter__.stroke_join,
+          @painter__.clip,
+          @painter__.blend_mode,
           @painter__.font,
           @hsbColor__,
           @colorMaxes__,
@@ -1711,6 +1915,8 @@ module RubySketch
         @painter__.stroke_width,
         @painter__.stroke_cap,
         @painter__.stroke_join,
+        @painter__.clip,
+        @painter__.blend_mode,
         @painter__.font,
         @hsbColor__,
         @colorMaxes__,
@@ -1828,7 +2034,7 @@ module RubySketch
         @keyCode__         = nil
         @keysPressed__     = Set.new
         @pointerPos__      =
-        @pointerPrevPos__  = [0, 0]
+        @pointerPrevPos__  = Rays::Point.new 0
         @pointersPressed__ = []
         @touches__         = []
         @motionGravity__   = createVector 0, 0
@@ -1852,7 +2058,6 @@ module RubySketch
             @redraw__ = false
             drawFrame.call
           end
-          @pointerPrevPos__ = @pointerPos__
         end
 
         updateKeyStates = -> event, pressed {
@@ -1871,11 +2076,12 @@ module RubySketch
         }
 
         updatePointerStates = -> event, pressed = nil {
-          @pointerPos__ = event.pos.to_a
+          @pointerPrevPos__ = @pointerPos__
+          @pointerPos__ = event.pos.dup
           @touches__    = event.pointers.map {|p| Touch.new(p.id, *p.pos.to_a)}
           if pressed != nil
             array = @pointersPressed__
-            event.type
+            event.types
               .tap {|types| types.delete :mouse}
               .map {|type| mouseButtonMap[type] || type}
               .each {|type| pressed ? array.push(type) : array.delete(type)}
@@ -1895,12 +2101,17 @@ module RubySketch
 
         @window__.pointer_down = proc do |e|
           updatePointerStates.call e, true
+          @pointerDownStartPos__ = @pointerPos__.dup
           (@touchStartedBlock__ || @mousePressedBlock__)&.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
+          end
         end
 
         @window__.pointer_move = proc do |e|
@@ -1921,6 +2132,8 @@ module RubySketch
 
       # Defines setup block.
       #
+      # @return [nil] nil
+      #
       def setup(&block)
         @window__.setup = block
         nil
@@ -1928,6 +2141,8 @@ module RubySketch
 
       # Defines draw block.
       #
+      # @return [nil] nil
+      #
       def draw(&block)
         @drawBlock__ = block if block
         nil
@@ -1944,6 +2159,8 @@ module RubySketch
 
       # Defines keyReleased block.
       #
+      # @return [nil] nil
+      #
       def keyReleased(&block)
         @keyReleasedBlock__ = block if block
         nil
@@ -1951,6 +2168,8 @@ module RubySketch
 
       # Defines keyTyped block.
       #
+      # @return [nil] nil
+      #
       def keyTyped(&block)
         @keyTypedBlock__ = block if block
         nil
@@ -1967,6 +2186,8 @@ module RubySketch
 
       # Defines mouseReleased block.
       #
+      # @return [nil] nil
+      #
       def mouseReleased(&block)
         @mouseReleasedBlock__ = block if block
         nil
@@ -1974,6 +2195,8 @@ module RubySketch
 
       # Defines mouseMoved block.
       #
+      # @return [nil] nil
+      #
       def mouseMoved(&block)
         @mouseMovedBlock__ = block if block
         nil
@@ -1981,13 +2204,26 @@ module RubySketch
 
       # Defines mouseDragged block.
       #
+      # @return [nil] nil
+      #
       def mouseDragged(&block)
         @mouseDraggedBlock__ = block if block
         nil
       end
 
+      # Defines mouseClicked block.
+      #
+      # @return [nil] nil
+      #
+      def mouseClicked(&block)
+        @mouseClickedBlock__ = block if block
+        nil
+      end
+
       # Defines touchStarted block.
       #
+      # @return [nil] nil
+      #
       def touchStarted(&block)
         @touchStartedBlock__ = block if block
         nil
@@ -1995,6 +2231,8 @@ module RubySketch
 
       # Defines touchEnded block.
       #
+      # @return [nil] nil
+      #
       def touchEnded(&block)
         @touchEndedBlock__ = block if block
         nil
@@ -2002,6 +2240,8 @@ module RubySketch
 
       # Defines touchMoved block.
       #
+      # @return [nil] nil
+      #
       def touchMoved(&block)
         @touchMovedBlock__ = block if block
         nil
@@ -2009,6 +2249,8 @@ module RubySketch
 
       # Defines motion block.
       #
+      # @return [nil] nil
+      #
       def motion(&block)
         @motionBlock__ = block if block
         nil
@@ -2040,6 +2282,17 @@ module RubySketch
         nil
       end
 
+      # Changes title of window.
+      #
+      # @param title [String] new title
+      #
+      # @return [nil] nil
+      #
+      def setTitle(title)
+        @window__.title = title
+        nil
+      end
+
       # Changes and returns canvas pixel density.
       #
       # @param density [Numeric] new pixel density
@@ -2056,9 +2309,12 @@ module RubySketch
         raise '#{name}() must be called on startup or setup block' if @started__
 
         @painter__.__send__ :end_paint
-        @window__.__send__ :resize_canvas, width, height, pixelDensity
-        updateCanvas__ @window__.canvas_image, @window__.canvas_painter
-        @painter__.__send__ :begin_paint
+        begin
+          @window__.__send__ :resize_canvas, width, height, pixelDensity
+          updateCanvas__ @window__.canvas_image, @window__.canvas_painter
+        ensure
+          @painter__.__send__ :begin_paint
+        end
 
         @window__.auto_resize = false
       end
@@ -2124,7 +2380,7 @@ module RubySketch
       # @return [Numeric] horizontal position of mouse
       #
       def mouseX()
-        @pointerPos__[0]
+        @pointerPos__.x
       end
 
       # Returns mouse y position
@@ -2132,7 +2388,7 @@ module RubySketch
       # @return [Numeric] vertical position of mouse
       #
       def mouseY()
-        @pointerPos__[1]
+        @pointerPos__.y
       end
 
       # Returns mouse x position in previous frame
@@ -2140,7 +2396,7 @@ module RubySketch
       # @return [Numeric] horizontal position of mouse
       #
       def pmouseX()
-        @pointerPrevPos__[0]
+        @pointerPrevPos__.x
       end
 
       # Returns mouse y position in previous frame
@@ -2148,7 +2404,7 @@ module RubySketch
       # @return [Numeric] vertical position of mouse
       #
       def pmouseY()
-        @pointerPrevPos__[1]
+        @pointerPrevPos__.y
       end
 
       # Returns which mouse button was pressed
@@ -2568,6 +2824,23 @@ module RubySketch
         Vector.new(*args, context: self)
       end
 
+      # Creates a new image.
+      #
+      # @overload createImage(w, h)
+      # @overload createImage(w, h, format)
+      #
+      # @param w      [Numeric]   width of new image
+      # @param h      [Numeric]   height of new image
+      # @param format [RGB, RGBA] image format
+      #
+      # @return [Image] new image
+      #
+      def createImage(w, h, format = RGBA)
+        colorspace = {RGB => Rays::RGB, RGBA => Rays::RGBA}[format]
+        raise ArgumentError, "Unknown image format" unless colorspace
+        Image.new Rays::Image.new(w, h, colorspace).paint {background 0, 0}
+      end
+
       # Creates a camera object as a video input device.
       #
       # @return [Capture] camera object

data/lib/rubysketch/window.rb

@@ -3,6 +3,24 @@ module RubySketch
 
   class Window < Reflex::Window
 
+    class CanvasView < Reflex::View
+      def on_update(e)
+        window.on_canvas_update e
+      end
+
+      def on_draw(e)
+        window.on_canvas_draw e
+      end
+
+      def on_pointer(e)
+        window.on_canvas_pointer e
+      end
+
+      def on_resize(e)
+        window.on_canvas_resize e
+      end
+    end
+
     attr_accessor :setup, :update, :draw, :before_draw, :after_draw, :resize,
       :key_down, :key_up,
       :pointer_down, :pointer_up, :pointer_move, :pointer_drag,
@@ -24,12 +42,7 @@ module RubySketch
       painter.miter_limit = 10
       resize_canvas 1, 1
 
-      @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}
-        v.on(:resize)  {|e| on_canvas_resize e}
-      }
+      @canvas_view = add CanvasView.new name: :canvas
 
       super(*args, size: [width, height], **kwargs, &block)
     end
@@ -118,6 +131,7 @@ module RubySketch
         end
 
         resize_window width, height
+        GC.start
       end
 
       @canvas_painter

data/lib/rubysketch-glsl.rb

@@ -0,0 +1,11 @@
+require 'rubysketch'
+
+
+def (RubySketch::GLSL).run(
+    shader_source,
+    title: 'RubySketch',
+    width: 500, height: 500)
+  w = RubySketch::Window.new(title: title, w: width, h: height) {start}
+  RubySketch::GLSL::Context.new w, shader_source
+  at_exit {RubySketch::App.new {w.show}.start unless $!}
+end

data/lib/rubysketch-processing.rb

@@ -6,8 +6,8 @@ begin
   context = RubySketch::Processing::Context.new window
 
   (context.methods - Object.instance_methods).each do |method|
-    define_method method do |*args, &block|
-      context.__send__ method, *args, &block
+    define_method method do |*args, **kwargs, &block|
+      context.__send__ method, *args, **kwargs, &block
     end
   end
 
@@ -20,4 +20,6 @@ begin
     window.__send__ :end_draw
     RubySketch::App.new {window.show}.start unless $!
   end
+
+  RUBYSKETCH_WINDOW = window
 end

data/rubysketch.gemspec

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

data/src/RubySketch.h

@@ -0,0 +1,15 @@
+// -*- mode: objc -*-
+#import <Foundation/Foundation.h>
+
+
+@interface RubySketch : NSObject
+
+	+ (void) setup;
+
+	+ (void) start: (NSString*) path;
+
+	+ (void) setActiveReflexViewController: (id) reflexViewController;
+
+	+ (void) resetActiveReflexViewController;
+
+@end

data/src/RubySketch.mm

@@ -0,0 +1,55 @@
+#import <CRuby.h>
+#import "RubySketch.h"
+#include "../src/ios/view_controller.h"
+
+
+static ReflexViewController* active_reflex_view_controller = nil;
+
+static ReflexViewController*
+ReflexViewController_create()
+{
+	return active_reflex_view_controller;
+}
+
+static void
+ReflexViewController_show (UIViewController*, ReflexViewController*)
+{
+}
+
+
+@implementation RubySketch
+
+	+ (void) setup
+	{
+		static BOOL done = NO;
+		if (done) return;
+		done = YES;
+
+		[CRuby addLibrary:@"RubySketch" bundle:[NSBundle bundleForClass:RubySketch.class]];
+
+		ReflexViewController_set_create_fun(ReflexViewController_create);
+		ReflexViewController_set_show_fun(ReflexViewController_show);
+	}
+
+	+ (void) start: (NSString*) path
+	{
+		[CRuby evaluate:[NSString stringWithFormat:@
+			"raise 'already started' unless require 'rubysketch-processing'\n"
+			"load '%@'\n"
+			"RUBYSKETCH_WINDOW.__send__ :end_draw\n"
+			"RUBYSKETCH_WINDOW.show",
+			path
+		]];
+	}
+
+	+ (void) setActiveReflexViewController: (id) reflexViewController
+	{
+		active_reflex_view_controller = reflexViewController;
+	}
+
+	+ (void) resetActiveReflexViewController
+	{
+		active_reflex_view_controller = nil;
+	}
+
+@end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.21
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reflexion
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.24
+        version: 0.1.28
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Creative Coding Framework have API compatible to Processing API or p5.js.
 email: xordog@gmail.com
 executables: []
@@ -39,6 +53,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- RubySketch.podspec
 - VERSION
 - examples/breakout.rb
 - examples/camera.rb
@@ -48,6 +63,7 @@ files:
 - examples/hello.rb
 - examples/image.rb
 - examples/shapes.rb
+- lib/rubysketch-glsl.rb
 - lib/rubysketch-processing.rb
 - lib/rubysketch.rb
 - lib/rubysketch/app.rb
@@ -56,6 +72,8 @@ files:
 - lib/rubysketch/processing.rb
 - lib/rubysketch/window.rb
 - rubysketch.gemspec
+- src/RubySketch.h
+- src/RubySketch.mm
 - test/helper.rb
 - test/processing/test_utility.rb
 - test/processing/test_vector.rb
@@ -77,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Processing like Creative Coding Framework.