rubysketch 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeebec01d05ee86260f24da80e85d4ac04bb41029145d8d47e7acc800919e00d
-  data.tar.gz: d227536ed72e88ef159c347c8ace10ff20532d52cbeb4588956f0c6e794283d7
+  metadata.gz: 9068a9fe7e5239420f8e32fb2e30912748bf9c90c52f40516604997b1166830a
+  data.tar.gz: 2a75b3ec215aeb15bfba929f561abd2a4f94c4c8093b27bad4de1ee74dd15efa
 SHA512:
-  metadata.gz: 9e144994fd11251d589853d0c6439b2d9924a4e76751b6c6147ad1bc4ebb6081d720f1bca5a77b9c1e69228fb4ab87b4807d463db3ca565243a1261f098caed1
-  data.tar.gz: fd03275e8730519d1095d60f1dbbca5a33ddc93f2e412ff32548f22c678cbe614bdd42fd9166de7c8dac9370d698a95482c2f71575d8c6bdac581d57bd5722fb
+  metadata.gz: d7a6252c38ab1fdda0c761c390bb5d0bb3583e740d7beea5efe3c5939a1f52840aac93c41aee693870dde4539df3f69dba20476c34b85a2eb5791fb3bcd63498
+  data.tar.gz: ccd6c65ff6b5e0340e7a8e779c2d1da2f277294ae9e03386a7d1317568badade0d4fe51758559680ef22ccc080486a3d2df43dab0501c91c9a6da3cc7144eb1d

data/ChangeLog.md

@@ -0,0 +1,17 @@
+# RubySketch ChangeLog
+
+
+## [0.2.6] - 2020-04-17
+
+- push(), pushMatrix() and pushStyle() take block to automatic pop
+- add stroke_cap() and stroke_join()
+- refine startup process
+- add curve() and bezier()
+- add imageMode(), Image#resize(), Image#copy() and copy()
+- add loop(), noLoop() and redraw()
+
+
+## [0.2.5] - 2020-03-29
+
+- delete debug prints
+- show unsupported image type

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/examples/clock.rb

@@ -20,12 +20,10 @@ end
 draw do
   background 0
 
-  begin
-    pushMatrix
+  pushMatrix do
     translate width / 2, height / 2
 
-    begin
-      pushMatrix
+    pushMatrix do
       fill COLORS[0]
       ellipse 0, 0, 20, 20
       rotate (now - start) / 60.0 * 360
@@ -33,32 +31,25 @@ draw do
       strokeWeight 5
       line 0, 0, 200, 0
       fill 1
-      popMatrix
     end
 
-    begin
-      pushMatrix
+    pushMatrix do
       strokeWeight 3
       60.times do
         rotate 6
         stroke COLORS[1]
         line 200, 0, 210, 0
       end
-      popMatrix
     end
 
-    begin
-      pushMatrix
+    pushMatrix do
       strokeWeight 5
       12.times do
         rotate 30
         stroke COLORS[3]
         line 190, 0, 210, 0
       end
-      popMatrix
     end
-
-    popMatrix
   end
 
   textSize 20

data/lib/rubysketch-processing.rb

@@ -1,4 +1,33 @@
 require 'rubysketch'
 
 
-RubySketch.__send__ :start_on_object_at_exit, self, RubySketch::Processing.new
+begin
+  context = RubySketch::Processing.new
+  methods = context.class.instance_methods(false)
+    .reject {|name| name =~ /__$/}
+  consts  = context.class.constants
+    .reject {|name| name =~ /__$/}
+    .each_with_object({}) {|name, h| h[name] = context.class.const_get name}
+
+  self.class.class_eval do
+    methods.each do |name|
+      define_method name do |*args, &block|
+        context.__send__ name, *args, &block
+      end
+    end
+    consts.each do |(name, value)|
+      const_set name, value
+    end
+  end
+
+  window = RubySketch::Window.new do |_|
+    window.start
+  end
+  context.setup__ window
+
+  window.canvas_painter.__send__ :begin_paint
+  at_exit do
+    window.canvas_painter.__send__ :end_paint
+    Reflex.start {window.show}
+  end
+end

data/lib/rubysketch.rb

@@ -5,7 +5,6 @@ require 'open-uri'
 
 require 'reflex'
 require 'rubysketch/module'
-require 'rubysketch/starter'
 require 'rubysketch/window'
 require 'rubysketch/processing'
 require 'rubysketch/glsl'

data/lib/rubysketch/glsl.rb

@@ -4,8 +4,6 @@ module RubySketch
   # @private
   class GLSL
 
-    extend Starter
-
     def initialize (glsl)
       @shader = Reflex::Shader.new glsl
     end

data/lib/rubysketch/processing.rb

@@ -7,8 +7,6 @@ module RubySketch
 
     include Math
 
-    extend Starter
-
     HALF_PI    = PI / 2
     QUARTER_PI = PI / 4
     TWO_PI     = PI * 2
@@ -43,6 +41,8 @@ module RubySketch
 
     # @private
     def initialize ()
+      @loop__         = true
+      @redraw__       = false
       @matrixStack__  = []
       @styleStack__   = []
       @frameCount__   = 0
@@ -59,18 +59,67 @@ module RubySketch
       angleMode   RADIANS
       rectMode    CORNER
       ellipseMode CENTER
+      imageMode   CORNER
     end
 
     # @private
-    def on_start__ (window)
+    def setup__ (window)
       @window__  = window
-      @painter__ = window.canvas_painter
+      @painter__ = window.canvas_painter.tap do |o|
+        o.miter_limit = 10
+      end
 
-      setupDrawBlock__
-      setupMousePressedBlock__
-      setupMouseReleasedBlock__
-      setupMouseMovedBlock__
-      setupMouseDraggedBlock__
+      drawFrame = -> event {
+        @painter__ = window.canvas_painter
+        @matrixStack__.clear
+        @styleStack__.clear
+        begin
+          push
+          @drawBlock__.call event if @drawBlock__
+        ensure
+          pop
+        end
+        @frameCount__ += 1
+      }
+
+      updateMouseState = -> x, y, pressed = nil {
+        @mouseX__       = x
+        @mouseY__       = y
+        @mousePressed__ = pressed if pressed != nil
+      }
+
+      updateMousePrevPos = -> {
+        @mousePrevX__ = @mouseX__
+        @mousePrevY__ = @mouseY__
+      }
+
+      @window__.draw = proc do |e|
+        if @loop__ || @redraw__
+          @redraw__ = false
+          drawFrame.call e
+        end
+        updateMousePrevPos.call
+      end
+
+      @window__.pointer_down = proc do |e|
+        updateMouseState.call e.x, e.y, true
+        @mousePressedBlock__.call e if @mousePressedBlock__
+      end
+
+      @window__.pointer_up = proc do |e|
+        updateMouseState.call e.x, e.y, false
+        @mouseReleasedBlock__.call e if @mouseReleasedBlock__
+      end
+
+      @window__.pointer_move = proc do |e|
+        updateMouseState.call e.x, e.y
+        @mouseMovedBlock__.call e if @mouseMovedBlock__
+      end
+
+      @window__.pointer_drag = proc do |e|
+        updateMouseState.call e.x, e.y
+        @mouseDraggedBlock__.call e if @mouseDraggedBlock__
+      end
     end
 
     # Returns the absolute number of the value.
@@ -293,23 +342,6 @@ module RubySketch
       nil
     end
 
-    # @private
-    private def setupDrawBlock__ ()
-      @window__.draw = proc do |e, painter|
-        @painter__ = painter
-        @matrixStack__.clear
-        @styleStack__.clear
-        begin
-          push
-          @drawBlock__.call e if @drawBlock__
-        ensure
-          pop
-        end
-        @frameCount__ += 1
-        updateMousePrevPos__
-      end
-    end
-
     # Define draw block.
     #
     def draw (&block)
@@ -322,71 +354,26 @@ module RubySketch
       nil
     end
 
-    # @private
-    private def setupMousePressedBlock__ ()
-      @window__.pointer_down = proc do |e|
-        updateMouseState__ e.x, e.y, true
-        @mousePressedBlock__.call e if @mousePressedBlock__
-      end
-    end
-
     def mousePressed (&block)
       @mousePressedBlock__ = block if block
       @mousePressed__
     end
 
-    # @private
-    private def setupMouseReleasedBlock__ ()
-      @window__.pointer_up = proc do |e|
-        updateMouseState__ e.x, e.y, false
-        @mouseReleasedBlock__.call e if @mouseReleasedBlock__
-      end
-    end
-
     def mouseReleased (&block)
       @mouseReleasedBlock__ = block if block
       nil
     end
 
-    # @private
-    private def setupMouseMovedBlock__ ()
-      @window__.pointer_move = proc do |e|
-        updateMouseState__ e.x, e.y
-        @mouseMovedBlock__.call e if @mouseMovedBlock__
-      end
-    end
-
     def mouseMoved (&block)
       @mouseMovedBlock__ = block if block
       nil
     end
 
-    # @private
-    private def setupMouseDraggedBlock__ ()
-      @window__.pointer_drag = proc do |e|
-        updateMouseState__ e.x, e.y
-        @mouseDraggedBlock__.call e if @mouseDraggedBlock__
-      end
-    end
-
     def mouseDragged (&block)
       @mouseDraggedBlock__ = block if block
       nil
     end
 
-    # @private
-    private def updateMouseState__ (x, y, pressed = nil)
-      @mouseX__       = x
-      @mouseY__       = y
-      @mousePressed__ = pressed if pressed != nil
-    end
-
-    # @private
-    private def updateMousePrevPos__ ()
-      @mousePrevX__ = @mouseX__
-      @mousePrevY__ = @mouseY__
-    end
-
     # @private
     private def size__ (width, height)
       raise 'size() must be called on startup or setup block' if @started__
@@ -577,6 +564,20 @@ module RubySketch
       @ellipseMode__ = mode
     end
 
+    # Sets image mode. Default is CORNER.
+    #
+    # CORNER  -> image(img, left, top, width, height)
+    # CORNERS -> image(img, left, top, right, bottom)
+    # CENTER  -> image(img, center_x, center_y, width, height)
+    #
+    # @param mode [CORNER, CORNERS, CENTER]
+    #
+    # @return [nil] nil
+    #
+    def imageMode (mode)
+      @imageMode__ = mode
+    end
+
     # @private
     private def toXYWH__ (mode, a, b, c, d)
       case mode
@@ -588,6 +589,30 @@ module RubySketch
       end
     end
 
+    # Enables calling draw block on every frame.
+    #
+    # @return [nil] nil
+    #
+    def loop ()
+      @loop__ = true
+    end
+
+    # Disables calling draw block on every frame.
+    #
+    # @return [nil] nil
+    #
+    def noLoop ()
+      @loop__ = false
+    end
+
+    # Calls draw block to redraw frame.
+    #
+    # @return [nil] nil
+    #
+    def redraw ()
+      @redraw__ = true
+    end
+
     # Clears screen.
     #
     # @overload background(str)
@@ -732,10 +757,10 @@ module RubySketch
 
     # Draws a line.
     #
-    # @param x1 [Numeric] horizontal position for first point
-    # @param y1 [Numeric] vertical position for first point
-    # @param x2 [Numeric] horizontal position for second point
-    # @param y2 [Numeric] vertical position for second point
+    # @param x1 [Numeric] horizontal position of first point
+    # @param y1 [Numeric] vertical position of first point
+    # @param x2 [Numeric] horizontal position of second point
+    # @param y2 [Numeric] vertical position of second point
     #
     # @return [nil] nil
     #
@@ -865,6 +890,42 @@ module RubySketch
       nil
     end
 
+    # Draws a Catmull-Rom spline curve.
+    #
+    # @param cx1 [Numeric] horizontal position of beginning control point
+    # @param cy1 [Numeric] vertical position of beginning control point
+    # @param x1  [Numeric] horizontal position of first point
+    # @param y1  [Numeric] vertical position of first point
+    # @param x2  [Numeric] horizontal position of second point
+    # @param y2  [Numeric] vertical position of second point
+    # @param cx2 [Numeric] horizontal position of ending control point
+    # @param cy2 [Numeric] vertical position of ending control point
+    #
+    # @return [nil] nil
+    #
+    def curve (cx1, cy1, x1, y1, x2, y2, cx2, cy2)
+      @painter__.curve cx1, cy1, x1, y1, x2, y2, cx2, cy2
+      nil
+    end
+
+    # Draws a Bezier spline curve.
+    #
+    # @param x1  [Numeric] horizontal position of first point
+    # @param y1  [Numeric] vertical position of first point
+    # @param cx1 [Numeric] horizontal position of first control point
+    # @param cy1 [Numeric] vertical position of first control point
+    # @param cx2 [Numeric] horizontal position of second control point
+    # @param cy2 [Numeric] vertical position of second control point
+    # @param x2  [Numeric] horizontal position of second point
+    # @param y2  [Numeric] vertical position of second point
+    #
+    # @return [nil] nil
+    #
+    def bezier (x1, y1, cx1, cy1, cx2, cy2, x2, y2)
+      @painter__.bezier x1, y1, cx1, cy1, cx2, cy2, x2, y2
+      nil
+    end
+
     # Draws a text.
     #
     # @overload text(str)
@@ -883,24 +944,45 @@ module RubySketch
 
     # Draws an image.
     #
-    # @overload image(img, x, y)
-    # @overload image(img, x, y, w, h)
+    # @overload image(img, a, b)
+    # @overload image(img, a, b, c, d)
     #
     # @param img [Image] image to draw
-    # @param x   [Numeric] horizontal position of the image
-    # @param y   [Numeric] vertical position of the image
-    # @param w   [Numeric] width of the image
-    # @param h   [Numeric] height of the image
+    # @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
     #
     # @return [nil] nil
     #
-    def image (img, x, y, w = nil, h = nil)
-      w ||= img.width
-      h ||= img.height
-      @painter__.image img.internal, x, y, w, h
+    def image (img, a, b, c = nil, d = nil)
+      x, y, w, h = toXYWH__ @imageMode__, a, b, c || img.width, d || img.height
+      @painter__.image img.to_internal__, x, y, w, h
       nil
     end
 
+    # Copies image.
+    #
+    # @overload copy(sx, sy, sw, sh, dx, dy, dw, dh)
+    # @overload copy(img, sx, sy, sw, sh, dx, dy, dw, dh)
+    #
+    # @param img [Image]   image for copy 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
+    #
+    # @return [nil] nil
+    #
+    def copy (img = nil, sx, sy, sw, sh, dx, dy, dw, dh)
+      src = img&.to_internal__ || @window__.canvas
+      @painter__.image src, sx, sy, sw, sh, dx, dy, dw, dh
+    end
+
     # Applies translation matrix to current transformation matrix.
     #
     # @param x [Numeric] horizontal transformation
@@ -944,8 +1026,12 @@ module RubySketch
     #
     # @return [nil] nil
     #
-    def pushMatrix ()
+    def pushMatrix (&block)
       @matrixStack__.push @painter__.matrix
+      if block
+        block.call
+        popMatrix
+      end
       nil
     end
 
@@ -972,18 +1058,25 @@ module RubySketch
     #
     # @return [nil] nil
     #
-    def pushStyle ()
+    def pushStyle (&block)
       @styleStack__.push [
         @painter__.fill,
         @painter__.stroke,
         @painter__.stroke_width,
+        @painter__.stroke_cap,
+        @painter__.stroke_join,
         @painter__.font,
         @hsbColor__,
         @colorMaxes__,
         @angleScale__,
         @rectMode__,
-        @ellipseMode__
+        @ellipseMode__,
+        @imageMode__
       ]
+      if block
+        block.call
+        popStyle
+      end
       nil
     end
 
@@ -996,12 +1089,15 @@ module RubySketch
       @painter__.fill,
       @painter__.stroke,
       @painter__.stroke_width,
+      @painter__.stroke_cap,
+      @painter__.stroke_join,
       @painter__.font,
       @hsbColor__,
       @colorMaxes__,
       @angleScale__,
       @rectMode__,
-      @ellipseMode__ = @styleStack__.pop
+      @ellipseMode__,
+      @imageMode__ = @styleStack__.pop
       nil
     end
 
@@ -1009,9 +1105,13 @@ module RubySketch
     #
     # @return [nil] nil
     #
-    def push ()
+    def push (&block)
       pushMatrix
       pushStyle
+      if block
+        block.call
+        pop
+      end
     end
 
     # Restore styles and transformations from stack.
@@ -1080,8 +1180,7 @@ module RubySketch
   #
   class Processing::Image
 
-    # Initialize image.
-    #
+    # @private
     def initialize (image)
       @image = image
     end
@@ -1102,6 +1201,44 @@ module RubySketch
       @image.height
     end
 
+    # Resizes image.
+    #
+    # @param width  [Numeric] width for resized image
+    # @param height [Numeric] height for resized image
+    #
+    # @return [nil] nil
+    #
+    def resize (width, height)
+      @image = Rays::Image.new(width, height).paint do |painter|
+        painter.image @image, 0, 0, width, height
+      end
+      nil
+    end
+
+    # Copies image.
+    #
+    # @overload copy(sx, sy, sw, sh, dx, dy, dw, dh)
+    # @overload copy(img, sx, sy, sw, sh, dx, dy, dw, dh)
+    #
+    # @param img [Image]   image for copy 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
+    #
+    # @return [nil] nil
+    #
+    def copy (img = nil, sx, sy, sw, sh, dx, dy, dw, dh)
+      img ||= self
+      @image.paint do |painter|
+        painter.image img.to_internal__, sx, sy, sw, sh, dx, dy, dw, dh
+      end
+    end
+
     # Saves image to file.
     #
     # @param filename [String] file name to save image
@@ -1111,7 +1248,7 @@ module RubySketch
     end
 
     # @private
-    def internal ()
+    def to_internal__ ()
       @image
     end
 
@@ -1122,10 +1259,7 @@ module RubySketch
   #
   class Processing::Font
 
-    # Initialize font.
-    #
     # @private
-    #
     def initialize (font)
       @font = font
     end
@@ -1171,13 +1305,7 @@ module RubySketch
     #
     attr_reader :h
 
-    # Initialize bouding box.
-    #
-    # @param x [Numeric] horizontal position
-    # @param y [Numeric] vertical position
-    # @param w [Numeric] width of bounding box
-    # @param h [Numeric] height of bounding box
-    #
+    # @private
     def initialize (x, y, w, h)
       @x, @y, @w, @h = x, y, w, h
     end

data/lib/rubysketch/window.rb

@@ -17,9 +17,7 @@ module RubySketch
 
       reset_canvas 1, 1
 
-      super *args, size: [width, height] do |_|
-        start &block if block
-      end
+      super *args, size: [width, height], &block
     end
 
     def start (&block)
@@ -43,8 +41,8 @@ module RubySketch
     end
 
     def on_draw (e)
-      @canvas_painter.paint do |painter|
-        call_block @draw, e, painter
+      @canvas_painter.paint do |_|
+        call_block @draw, e
       end
       e.painter.image @canvas
     end
@@ -80,7 +78,7 @@ module RubySketch
       old_canvas  = @canvas
       old_painter = @canvas_painter
 
-      cs              = old_canvas&.color_space || Rays::ColorSpace::RGBA
+      cs              = old_canvas&.color_space || Rays::RGBA
       @canvas         = Rays::Image.new width, height, cs, painter.pixel_density
       @canvas_painter = @canvas.painter
 
@@ -94,6 +92,9 @@ module RubySketch
       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
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".yardopts"
+- ChangeLog.md
 - LICENSE
 - README.md
 - Rakefile
@@ -117,7 +118,6 @@ files:
 - lib/rubysketch/glsl.rb
 - lib/rubysketch/module.rb
 - lib/rubysketch/processing.rb
-- lib/rubysketch/starter.rb
 - lib/rubysketch/window.rb
 - rubysketch.gemspec
 homepage: https://github.com/xord/rubysketch

data/lib/rubysketch/starter.rb

@@ -1,67 +0,0 @@
-module RubySketch
-
-
-  extend module Functions
-
-    def start (context, start_at_exit: false, &block)
-      window = Window.new do
-        context.instance_eval &block if block
-      end
-
-      context.on_start__ window
-
-      start = proc do
-        Reflex.start {window.show}
-      end
-
-      if start_at_exit
-        at_exit {start.call unless $!}
-      else
-        start.call
-      end
-
-      window
-    end
-
-    private
-
-    def start_on_object_at_exit (object, context)
-      klass   = context.class
-      methods = klass.instance_methods(false)
-        .reject {|name| name =~ /__$/}
-      consts  = klass.constants
-        .reject {|name| name =~ /__$/}
-        .each_with_object({}) {|name, h| h[name] = klass.const_get name}
-
-      object.class.class_eval do
-        methods.each do |name|
-          define_method name do |*args, &block|
-            context.__send__ name, *args, &block
-          end
-        end
-        consts.each do |(name, value)|
-          const_set name, value
-        end
-      end
-
-      window = start context, start_at_exit: true
-
-      window.canvas_painter.__send__ :begin_paint
-      at_exit {window.canvas_painter.__send__ :end_paint}
-    end
-
-    self
-
-  end# Functions
-
-
-  module Starter
-
-    def start (*args, &block)
-      RubySketch.start self.new(*args), start_at_exit: true, &block
-    end
-
-  end# Starter
-
-
-end# RubySketch