rubysketch 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7c911427a4145fa18e7395c65f49ed58077c6d294f93ee9d24a840f621bcfeb
-  data.tar.gz: e5ecc52cb87042b8e59fd64f48c358f19638a3a4f35a696072b3f49d95998eba
+  metadata.gz: '0394813335c89ce937297ef2c62819dc3c11f70dbbf74efd320eaf0a72f8b386'
+  data.tar.gz: 9acea3187bd120239a7c387fa272e252593dc7ce0afa73425f39f65fe0b2d6bb
 SHA512:
-  metadata.gz: ce775dec5c87470a3c3aa88e37fae94ecfaab96616c381bf71cbab5c17325ec0b93ab6640be326185de6f4b5e44b6aec9438418f1e57a00a9955ac5e148d20e1
-  data.tar.gz: 433efaf677bb1538096b1453591e5d28608fc20793bbcdd9e648f54e286eff7d63923496375520e5c560904883eb9385ac2837f67e4aabe7988f7d1d0fa4f23a
+  metadata.gz: 7d1824db8f17db944d6b1a2d6069b1acfcc4dafdf3d52facc2e5cdf0281108b825e89150e509c7e58ad8e2c7641d3ee9e6612f8486ebf9190ccd30cc48dbd1ae
+  data.tar.gz: bdefffaabba512793dddc3204d749a22968096f464a9107214630012585f40f2aedd294216af321c4ae83f4fd5eb11e24d2eaab4fd1486cb39c3ecb50714c00f

data/.github/workflows/release.yml

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

data/.github/workflows/test.yml

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

data/ChangeLog.md

@@ -5,6 +5,7 @@
 
 - add key, keyCode and keyPressed system values
 - add keyPressed(), keyReleased() and keyTyped() functions
+- add motionGravity value and motion() function
 
 
 ## [0.3.15] - 2020-12-12

data/VERSION

@@ -1 +1 @@
-0.3.16
+0.3.17

data/lib/rubysketch/processing.rb

@@ -708,6 +708,10 @@ module RubySketch
     #
     class Touch
 
+      # Identifier of each touch
+      #
+      attr_reader :id
+
       # Horizontal position of touch
       #
       attr_reader :x
@@ -717,12 +721,8 @@ module RubySketch
       attr_reader :y
 
       # @private
-      def initialize(x, y)
-        @x, @y = x, y
-      end
-
-      def id()
-        raise NotImplementedError
+      def initialize(id, x, y)
+        @id, @x, @y = id, x, y
       end
 
     end# Touch
@@ -1591,7 +1591,7 @@ module RubySketch
       #
       def copy(img = nil, sx, sy, sw, sh, dx, dy, dw, dh)
         assertDrawing__
-        src = img&.getInternal__ || @window__.canvas
+        src = img&.getInternal__ || @window__.canvas_image
         @painter__.image src, sx, sy, sw, sh, dx, dy, dw, dh
       end
 
@@ -1817,7 +1817,9 @@ module RubySketch
         tmpdir__.tap {|dir| FileUtils.rm_r dir.to_s if dir.directory?}
 
         @window__ = window
-        init__ @window__.canvas, @window__.canvas_painter.paint {background 0.8}
+        init__(
+          @window__.canvas_image,
+          @window__.canvas_painter.paint {background 0.8})
 
         @loop__            = true
         @redraw__          = false
@@ -1829,12 +1831,13 @@ module RubySketch
         @pointerPrevPos__  = [0, 0]
         @pointersPressed__ = Set.new
         @touches__         = []
+        @motionGravity__   = createVector 0, 0
 
         @window__.before_draw = proc {beginDraw__}
         @window__.after_draw  = proc {endDraw__}
 
         drawFrame = -> {
-          updateCanvas__ @window__.canvas, @window__.canvas_painter
+          updateCanvas__ @window__.canvas_image, @window__.canvas_painter
           begin
             push
             @drawBlock__.call if @drawBlock__
@@ -1863,9 +1866,9 @@ module RubySketch
 
         updatePointerStates = -> event, pressed = nil {
           @pointerPos__ = event.pos.to_a
-          @touches__    = event.positions.map {|pos| Touch.new(*pos.to_a)}
+          @touches__    = event.pointers.map {|p| Touch.new(p.id, *p.pos.to_a)}
           if pressed != nil
-            set, type = @pointersPressed__, event.pointer_type
+            set, type = @pointersPressed__, event.type
             pressed ? set.add(type) : set.delete(type)
           end
         }
@@ -1873,7 +1876,7 @@ module RubySketch
         @window__.key_down = proc do |e|
           updateKeyStates.call e, true
           @keyPressedBlock__&.call
-          @keyTypedBlock__&.call unless @key__.empty?
+          @keyTypedBlock__&.call if @key__ && !@key__.empty?
         end
 
         @window__.key_up = proc do |e|
@@ -2045,7 +2048,7 @@ module RubySketch
 
         @painter__.__send__ :end_paint
         @window__.__send__ :resize_canvas, width, height, pixelDensity
-        updateCanvas__ @window__.canvas, @window__.canvas_painter
+        updateCanvas__ @window__.canvas_image, @window__.canvas_painter
         @painter__.__send__ :begin_paint
 
         @window__.auto_resize = false

data/lib/rubysketch/window.rb

@@ -10,12 +10,12 @@ module RubySketch
 
     attr_accessor :auto_resize
 
-    attr_reader :canvas, :canvas_painter
+    attr_reader :canvas_image, :canvas_painter
 
     def initialize(width = 500, height = 500, *args, **kwargs, &block)
       RubySketch.instance_variable_set :@window, self
 
-      @canvas         =
+      @canvas_image   =
       @canvas_painter = nil
       @events         = []
       @auto_resize    = true
@@ -24,9 +24,12 @@ module RubySketch
       painter.miter_limit = 10
       resize_canvas 1, 1
 
-      root.on(:update)  {|e| on_canvas_update e}
-      root.on(:draw)    {|e| on_canvas_draw e}
-      root.on(:pointer) {|e| on_canvas_pointer e}
+      @canvas_view = add Reflex::View.new {|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}
+      }
 
       super(*args, size: [width, height], **kwargs, &block)
     end
@@ -46,13 +49,12 @@ module RubySketch
       call_block @setup, nil
     end
 
-    def on_draw(e)
-      update_canvas_view
+    def on_resize(e)
+      on_canvas_resize e
     end
 
-    def on_resize(e)
-      resize_canvas e.width, e.height if @auto_resize
-      draw_canvas {call_block @resize, e} if @resize
+    def on_draw(e)
+      update_canvas_view
     end
 
     def on_key(e)
@@ -69,16 +71,16 @@ module RubySketch
 
     def on_canvas_update(e)
       call_block @update, e
-      redraw
+      @canvas_view.redraw
     end
 
     def on_canvas_draw(e)
       draw_canvas {call_block @draw, e} if @draw
-      e.painter.image @canvas
+      e.painter.image @canvas_image
     end
 
     def on_canvas_pointer(e)
-      block = case e.type
+      block = case e.action
         when :down then @pointer_down
         when :up   then @pointer_up
         when :move then e.drag? ? @pointer_drag : @pointer_move
@@ -86,27 +88,32 @@ module RubySketch
       draw_canvas {call_block block, e} if block
     end
 
+    def on_canvas_resize(e)
+      resize_canvas e.width, e.height if @auto_resize
+      draw_canvas {call_block @resize, e} if @resize
+    end
+
     private
 
     def resize_canvas(width, height, pixel_density = nil)
       return nil if width * height == 0
 
-      unless width    == @canvas&.width  &&
-        height        == @canvas&.height &&
+      unless width    == @canvas_image&.width  &&
+        height        == @canvas_image&.height &&
         pixel_density == @canvas_painter&.pixel_density
 
-        old_canvas  = @canvas
+        old_image   = @canvas_image
         old_painter = @canvas_painter
-        cs          = old_canvas&.color_space || Rays::RGBA
+        cs          = old_image&.color_space || Rays::RGBA
         pd          =  pixel_density ||
           old_painter&.pixel_density ||
           painter     .pixel_density
 
-        @canvas         = Rays::Image.new width, height, cs, pd
-        @canvas_painter = @canvas.painter
+        @canvas_image   = Rays::Image.new width, height, cs, pd
+        @canvas_painter = @canvas_image.painter
 
-        if old_canvas
-          @canvas_painter.paint {image old_canvas}
+        if old_image
+          @canvas_painter.paint {image old_image}
           copy_painter_attributes old_painter, @canvas_painter
         end
 
@@ -132,13 +139,13 @@ module RubySketch
 
     def update_canvas_view()
       scrollx, scrolly, zoom = get_scroll_and_zoom
-      root.scroll_to scrollx, scrolly
-      root.zoom zoom
+      @canvas_view.scroll_to scrollx, scrolly
+      @canvas_view.zoom zoom
     end
 
     def get_scroll_and_zoom()
-      ww, wh =         width.to_f,         height.to_f
-      cw, ch = @canvas.width.to_f, @canvas.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

data/rubysketch.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/xord/rubysketch"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '~> 2'
+  s.required_ruby_version = '>= 2.6.0'
 
   s.add_runtime_dependency 'reflexion', '~> 0.1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reflexion
@@ -68,16 +68,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Processing like Creative Coding Framework.