rubysketch 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a044fb62451ebcd69c89a5a9cb2781c747d4298142a9e6828f71cdbc63da999
-  data.tar.gz: 6dade74829619df93d947160f930fdc19563cc9042b826ef7b8b4bd6015cfb00
+  metadata.gz: 1f63f771b469d060307fa88a2992cc373c2439cec8facf531984533303f0a023
+  data.tar.gz: 5787db4cf63408b746fb538a6a612c2b90f440e08c1ded38b382b69200d372c9
 SHA512:
-  metadata.gz: 7801ba15e151b5c519047b2145b71e820428b2b9601c9fccaffd1eb6d6b67ff344b6aa7b0cd12c9151d431df01d201c5cc63e3a8ffa92d854b5934a2357fb8ec
-  data.tar.gz: 44f7ad0c273aa88974356dfcc3fbc7d080d8bccb023ab4137db23f2d7b85b0fa2b06b590a97b487f803575d903a87a8747f26ff3e0518b5c76623f26dcafd35d
+  metadata.gz: 1bcb9bfe5d0f1732c7e44a509d8c5e83b5b84f28bb988fe3e4d9083cb342b6fc4cb44df48c0f176a18599cfd334583e808db41dadb377ac5c78436ed55533c29
+  data.tar.gz: ac78631d29b3843a32f376b7330011477523e33f40b1adb5d40dc1a66335bc294fdf91720146194b016497e4444b9531dbdc9529723c936c939c518df343c671

data/ChangeLog.md

@@ -1,6 +1,18 @@
 # RubySketch ChangeLog
 
 
+## [0.3.1] - 2020-07-17
+
+- add touchStarted(), touchEnded(), touchMoved() and touches()
+- make all event handler drawable
+- limit font max size to 256
+
+
+## [0.3.0] - 2020-05-21
+
+- add createGraphics()
+
+
 ## [0.2.7] - 2020-04-17
 
 - add strokeCap() and strokeJoin()

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rubysketch/processing.rb

@@ -143,6 +143,30 @@ module RubySketch
     end# TextBounds
 
 
+    # Touch object.
+    #
+    class Touch
+
+      # Horizontal position of touch
+      #
+      attr_reader :x
+
+      # Vertical position of touch
+      #
+      attr_reader :y
+
+      # @private
+      def initialize (x, y)
+        @x, @y = x, y
+      end
+
+      def id ()
+        raise NotImplementedError
+      end
+
+    end# Touch
+
+
     # Drawing context
     #
     module GraphicsContext
@@ -479,26 +503,32 @@ module RubySketch
       # Sets font.
       #
       # @param name [String]  font name
-      # @param size [Numeric] font size
+      # @param size [Numeric] font size (max 256)
       #
       # @return [Font] current font
       #
       def textFont (name = nil, size = nil)
-        @painter__.font name, size if name || size
+        setFont__ name, size if name || size
         Font.new @painter__.font
       end
 
       # Sets text size.
       #
-      # @param size [Numeric] font size
+      # @param size [Numeric] font size (max 256)
       #
       # @return [nil] nil
       #
       def textSize (size)
-        @painter__.font @painter__.font.name, size
+        setFont__ @painter__.font.name, size
         nil
       end
 
+      # @private
+      def setFont__ (name, size)
+        size = 256 if size && size > 256
+        @painter__.font name, size
+      end
+
       # Clears screen.
       #
       # @overload background(str)
@@ -1262,11 +1292,10 @@ module RubySketch
         @loop__         = true
         @redraw__       = false
         @frameCount__   = 0
-        @mouseX__       =
-        @mouseY__       =
-        @mousePrevX__   =
-        @mousePrevY__   = 0
+        @mousePos__     =
+        @mousePrevPos__ = Rays::Point.new 0
         @mousePressed__ = false
+        @touches__      = []
 
         @window__  = window
         @image__   = @window__.canvas
@@ -1274,58 +1303,53 @@ module RubySketch
 
         @painter__.miter_limit = 10
 
-        drawFrame = -> event {
+        @window__.before_draw = proc {beginDraw}
+        @window__.after_draw  = proc {endDraw}
+
+        drawFrame = -> {
           @image__   = @window__.canvas
           @painter__ = @window__.canvas_painter
           begin
             push
-            @drawBlock__.call event if @drawBlock__
+            @drawBlock__.call if @drawBlock__
           ensure
             pop
             @frameCount__ += 1
           end
         }
 
-        updateMouseState = -> x, y, pressed = nil {
-          @mouseX__       = x
-          @mouseY__       = y
-          @mousePressed__ = pressed if pressed != nil
-        }
-
-        updateMousePrevPos = -> {
-          @mousePrevX__ = @mouseX__
-          @mousePrevY__ = @mouseY__
-        }
-
-        @window__.before_draw = proc {beginDraw}
-        @window__.after_draw  = proc {endDraw}
-
         @window__.draw = proc do |e|
           if @loop__ || @redraw__
             @redraw__ = false
-            drawFrame.call e
+            drawFrame.call
           end
-          updateMousePrevPos.call
+          @mousePrevPos__ = @mousePos__
         end
 
+        updatePointerStates = -> event, pressed = nil {
+          @mousePos__     = event.pos
+          @mousePressed__ = pressed if pressed != nil
+          @touches__      = event.positions.map {|pos| Touch.new pos.x, pos.y}
+        }
+
         @window__.pointer_down = proc do |e|
-          updateMouseState.call e.x, e.y, true
-          @mousePressedBlock__.call e if @mousePressedBlock__
+          updatePointerStates.call e, true
+          (@touchStartedBlock__ || @mousePressedBlock__)&.call
         end
 
         @window__.pointer_up = proc do |e|
-          updateMouseState.call e.x, e.y, false
-          @mouseReleasedBlock__.call e if @mouseReleasedBlock__
+          updatePointerStates.call e, false
+          (@touchEndedBlock__ || @mouseReleasedBlock__)&.call
         end
 
         @window__.pointer_move = proc do |e|
-          updateMouseState.call e.x, e.y
-          @mouseMovedBlock__.call e if @mouseMovedBlock__
+          updatePointerStates.call e
+          (@touchMovedBlock__ || @mouseMovedBlock__)&.call
         end
 
         @window__.pointer_drag = proc do |e|
-          updateMouseState.call e.x, e.y
-          @mouseDraggedBlock__.call e if @mouseDraggedBlock__
+          updatePointerStates.call e
+          (@touchMovedBlock__ || @mouseDraggedBlock__)&.call
         end
       end
 
@@ -1368,6 +1392,21 @@ module RubySketch
         nil
       end
 
+      def touchStarted (&block)
+        @touchStartedBlock__ = block if block
+        nil
+      end
+
+      def touchEnded (&block)
+        @touchEndedBlock__ = block if block
+        nil
+      end
+
+      def touchMoved (&block)
+        @touchMovedBlock__ = block if block
+        nil
+      end
+
       # @private
       private def size__ (width, height)
         raise 'size() must be called on startup or setup block' if @started__
@@ -1416,7 +1455,7 @@ module RubySketch
       # @return [Numeric] horizontal position of mouse
       #
       def mouseX ()
-        @mouseX__
+        @mousePos__.x
       end
 
       # Returns mouse y position
@@ -1424,7 +1463,7 @@ module RubySketch
       # @return [Numeric] vertical position of mouse
       #
       def mouseY ()
-        @mouseY__
+        @mousePos__.y
       end
 
       # Returns mouse x position in previous frame
@@ -1432,7 +1471,7 @@ module RubySketch
       # @return [Numeric] horizontal position of mouse
       #
       def pmouseX ()
-        @mousePrevX__
+        @mousePrevPos__.x
       end
 
       # Returns mouse y position in previous frame
@@ -1440,7 +1479,15 @@ module RubySketch
       # @return [Numeric] vertical position of mouse
       #
       def pmouseY ()
-        @mousePrevY__
+        @mousePrevPos__.y
+      end
+
+      # Returns array of touches
+      #
+      # @return [Array] Touch objects
+      #
+      def touches ()
+        @touches__
       end
 
       # Enables calling draw block on every frame.

data/lib/rubysketch/window.rb

@@ -42,12 +42,12 @@ module RubySketch
     end
 
     def on_draw (e)
-      draw_canvas {call_block @draw, e}
+      draw_canvas {call_block @draw, e} if @draw
       e.painter.image @canvas
     end
 
     def on_key (e)
-      call_block @key, e
+      draw_canvas {call_block @key, e} if @key
     end
 
     def on_pointer (e)
@@ -56,16 +56,16 @@ module RubySketch
         when :up   then @pointer_up
         when :move then e.drag? ? @pointer_drag : @pointer_move
       end
-      call_block block, e if block
+      draw_canvas {call_block block, e} if block
     end
 
     def on_motion (e)
-      call_block @motion, e
+      draw_canvas {call_block @motion, e} if @motion
     end
 
     def on_resize (e)
       reset_canvas e.width, e.height if @auto_resize
-      call_block @resize, e
+      draw_canvas {call_block @resize, e} if @resize
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard