rubysketch 0.1.3 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31a6c8685fd803f34636e81ee5098dfda6c2d82ab500952662e5b77c30601c09
-  data.tar.gz: e4f22f4dbf9d01a0cc4f5f084648698ae42c0a1eddf582c0848849b194ac5933
+  metadata.gz: cb7fa5f9cc69b67a9339f9f7170c8901999d0007e6b6e74de7d7b55b36bc09d3
+  data.tar.gz: c5158bda3a8ac90ec2255c3bfda5f8c3dbb8e9815bd74b9d5df0f8bfa601024e
 SHA512:
-  metadata.gz: 5df3c266fb39715d6c83cda24268e48f27e922292398cda0f3c84412089fe88bc0a08a6373cd4b97faf342b64a79b3c7d7343794081522c7ae4894e8d7cefdc9
-  data.tar.gz: 2c182badae8ae8f471647a2fc8289e7151730985de955b54d29f51c04ed8ee242ea89c274303e2f9d5b4d6189186b7ea635bc464d3ece7af5329124729f5c999
+  metadata.gz: b691e41b1e7ba08ad1a732f81333febe97cc68e30244ad7f8aea76b7660b7af5b47ae60542610f797340cc25bf9bc6f673dc893a19dd27e0b83583a19a8c99d8
+  data.tar.gz: 969de4e7e4f840c590c0758af55a53bb28838b05cf63a84d9c389bd99b5493df23cb06a5020f25c8531a906d67be4da014b5e888929e4734c83f18d6f47a87e0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.2

data/examples/clock.rb

@@ -0,0 +1,66 @@
+%w[xot rays reflex rubysketch]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'rubysketch-processing'
+
+COLORS = %w[ #F99292 #FFBC61 #FFC679 #FFF4E0 ]
+
+def now ()
+  Time.now.to_f
+end
+
+start = now
+
+setup do
+  colorMode RGB, 1
+  angleMode DEGREES
+end
+
+draw do
+  background 0
+
+  begin
+    pushMatrix
+    translate width / 2, height / 2
+
+    begin
+      pushMatrix
+      fill COLORS[0]
+      ellipse 0, 0, 20, 20
+      rotate (now - start) / 60.0 * 360
+      stroke COLORS[0]
+      strokeWeight 5
+      line 0, 0, 200, 0
+      fill 1
+      popMatrix
+    end
+
+    begin
+      pushMatrix
+      strokeWeight 3
+      60.times do
+        rotate 6
+        stroke COLORS[1]
+        line 200, 0, 210, 0
+      end
+      popMatrix
+    end
+
+    begin
+      pushMatrix
+      strokeWeight 5
+      12.times do
+        rotate 30
+        stroke COLORS[3]
+        line 190, 0, 210, 0
+      end
+      popMatrix
+    end
+
+    popMatrix
+  end
+
+  textSize 20
+  text "#{frameRate.to_i} FPS", 10, 10
+end

data/examples/hello.rb

@@ -6,6 +6,7 @@ require 'rubysketch-processing'
 
 
 draw do
+  background 0, 10
   textSize 50
-  text 'hello, world!', 10, 10
+  text 'hello, world!', mouseX, mouseY
 end

data/examples/image.rb

@@ -0,0 +1,13 @@
+%w[xot rays reflex rubysketch]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'rubysketch-processing'
+
+
+icon = loadImage 'https://xord.org/rubysketch/rubysketch.png'
+
+draw do
+  background 0, 10
+  image icon, mouseX, mouseY, icon.width / 10, icon.height / 10
+end

data/examples/shapes.rb

@@ -0,0 +1,121 @@
+%w[xot rays reflex rubysketch]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'rubysketch-processing'
+
+
+setup do
+  colorMode RGB, 1
+  angleMode DEGREES
+end
+
+draw do
+  background 0
+
+  fill 1
+  stroke 1, 0.5, 0.2
+
+  translate 10, 10
+
+  push
+
+  text 'point', 0, 0
+  point 0, 30
+
+  translate 0, 100
+
+  text 'point with strokeWeight', 0, 0
+  strokeWeight 10
+  point 0, 30
+  strokeWeight 0
+
+  translate 0, 100
+
+  text 'line', 0, 0
+  line 0, 30, 100, 50
+
+  translate 0, 100
+
+  text 'line with strokeWeight (very slow)', 0, 0
+  strokeWeight 10
+  line 0, 30, 100, 50
+  strokeWeight 1
+
+  translate 0, 100
+
+  text 'rect with rectMode(CORNER)', 0, 0
+  rectMode CORNER
+  rect 20, 30, 100, 50
+
+  translate 0, 100
+
+  text 'rect with rectMode(CORNERS)', 0, 0
+  rectMode CORNERS
+  rect 20, 30, 120, 80
+
+  translate 0, 100
+
+  text 'rect with rectMode(CENTER)', 0, 0
+  rectMode CENTER
+  rect 70, 55, 100, 50
+
+  translate 0, 100
+
+  text 'rect with rectMode(RADIUS)', 0, 0
+  rectMode RADIUS
+  rect 70, 55, 50, 25
+
+  pop
+  translate 200, 0
+  push
+
+  text 'circle', 0, 0
+  circle 70, 55, 25
+
+  translate 0, 100
+
+  text 'arc', 0, 0
+  arc 70, 55, 100, 50, 45, 270
+
+  translate 0, 100
+
+  text 'square', 0, 0
+  square 20, 30, 50
+
+  translate 0, 100
+
+  text 'triangle', 0, 0
+  triangle 70, 30, 120, 80, 20, 80
+
+  translate 0, 100
+
+  text 'quad', 0, 0
+  quad 20, 30, 120, 30, 150, 80, 50, 80
+
+  translate 0, 100
+
+  text 'ellipse with ellipseMode(CORNER)', 0, 0
+  ellipseMode CORNER
+  ellipse 20, 30, 100, 50
+
+  translate 0, 100
+
+  text 'ellipse with ellipseMode(CORNERS)', 0, 0
+  ellipseMode CORNERS
+  ellipse 20, 30, 120, 80
+
+  translate 0, 100
+
+  text 'ellipse with ellipseMode(CENTER)', 0, 0
+  ellipseMode CENTER
+  ellipse 70, 55, 100, 50
+
+  translate 0, 100
+
+  text 'ellipse with ellipseMode(RADIUS)', 0, 0
+  ellipseMode RADIUS
+  ellipse 70, 55, 50, 25
+
+  pop
+end

data/lib/rubysketch.rb

@@ -1,3 +1,8 @@
+require 'digest/sha1'
+require 'pathname'
+require 'tmpdir'
+require 'open-uri'
+
 require 'reflex'
 require 'rubysketch/module'
 require 'rubysketch/starter'

data/lib/rubysketch/glsl.rb

@@ -2,7 +2,7 @@ module RubySketch
 
 
   # @private
-  class GLSL1
+  class GLSL
 
     extend Starter
 
@@ -27,10 +27,7 @@ module RubySketch
       end
     end
 
-  end# GLSL1
-
-
-  GLSL = GLSL1
+  end# GLSL
 
 
 end# RubySketch

data/lib/rubysketch/processing.rb

@@ -1,9 +1,9 @@
 module RubySketch
 
 
-  # Processing compatible API v1
+  # Processing compatible API
   #
-  class Processing1
+  class Processing
 
     include Math
 
@@ -30,6 +30,11 @@ module RubySketch
     #
     DEGREES = :DEGREES
 
+    CORNER  = :CORNER
+    CORNERS = :CORNERS
+    CENTER  = :CENTER
+    RADIUS  = :RADIUS
+
     # @private
     DEG2RAD__ = PI / 180.0
 
@@ -38,6 +43,8 @@ module RubySketch
 
     # @private
     def initialize ()
+      @matrixStack__  = []
+      @styleStack__   = []
       @frameCount__   = 0
       @hsbColor__     = false
       @colorMaxes__   = [1.0] * 4
@@ -48,8 +55,10 @@ module RubySketch
       @mousePrevY__   = 0
       @mousePressed__ = false
 
-      colorMode RGB, 255
-      angleMode RADIANS
+      colorMode   RGB, 255
+      angleMode   RADIANS
+      rectMode    CORNER
+      ellipseMode CENTER
     end
 
     # @private
@@ -277,21 +286,32 @@ module RubySketch
       radian * RAD2DEG__
     end
 
+    # Define setup block.
+    #
     def setup (&block)
       @window__.setup = block
       nil
     end
 
     # @private
-    def setupDrawBlock__ ()
+    private def setupDrawBlock__ ()
       @window__.draw = proc do |e, painter|
         @painter__ = painter
-        @drawBlock__.call e if @drawBlock__
+        @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)
       @drawBlock__ = block if block
       nil
@@ -303,7 +323,7 @@ module RubySketch
     end
 
     # @private
-    def setupMousePressedBlock__ ()
+    private def setupMousePressedBlock__ ()
       @window__.pointer_down = proc do |e|
         updateMouseState__ e.x, e.y, true
         @mousePressedBlock__.call e if @mousePressedBlock__
@@ -316,7 +336,7 @@ module RubySketch
     end
 
     # @private
-    def setupMouseReleasedBlock__ ()
+    private def setupMouseReleasedBlock__ ()
       @window__.pointer_up = proc do |e|
         updateMouseState__ e.x, e.y, false
         @mouseReleasedBlock__.call e if @mouseReleasedBlock__
@@ -329,7 +349,7 @@ module RubySketch
     end
 
     # @private
-    def setupMouseMovedBlock__ ()
+    private def setupMouseMovedBlock__ ()
       @window__.pointer_move = proc do |e|
         updateMouseState__ e.x, e.y
         @mouseMovedBlock__.call e if @mouseMovedBlock__
@@ -342,7 +362,7 @@ module RubySketch
     end
 
     # @private
-    def setupMouseDraggedBlock__ ()
+    private def setupMouseDraggedBlock__ ()
       @window__.pointer_drag = proc do |e|
         updateMouseState__ e.x, e.y
         @mouseDraggedBlock__.call e if @mouseDraggedBlock__
@@ -355,20 +375,20 @@ module RubySketch
     end
 
     # @private
-    def updateMouseState__ (x, y, pressed = nil)
+    private def updateMouseState__ (x, y, pressed = nil)
       @mouseX__       = x
       @mouseY__       = y
       @mousePressed__ = pressed if pressed != nil
     end
 
     # @private
-    def updateMousePrevPos__ ()
+    private def updateMousePrevPos__ ()
       @mousePrevX__ = @mouseX__
       @mousePrevY__ = @mouseY__
     end
 
     # @private
-    def size__ (width, height)
+    private def size__ (width, height)
       raise 'size() must be called on startup or setup block' if @started__
 
       @painter__.send :end_paint
@@ -467,7 +487,7 @@ module RubySketch
     # @return [nil] nil
     #
     def colorMode (mode, *maxes)
-      raise ArgumentError, "Invalid color mode: #{mode}" unless [RGB, HSB].include?(mode)
+      raise ArgumentError, "invalid color mode: #{mode}" unless [RGB, HSB].include?(mode)
       raise ArgumentError unless [0, 1, 3, 4].include?(maxes.size)
 
       @hsbColor__ = mode.upcase == HSB
@@ -479,11 +499,11 @@ module RubySketch
     end
 
     # @private
-    def to_rgba__ (*args)
+    private def toRGBA__ (*args)
       a, b, c, d = args
-      return parse_color__(a, b || alphaMax__) if a.kind_of?(String)
+      return parseColor__(a, b || alphaMax__) if a.kind_of?(String)
 
-      rgba  = case args.size
+      rgba = case args.size
         when 1, 2 then [a, a, a, b || alphaMax__]
         when 3, 4 then [a, b, c, d || alphaMax__]
         else raise ArgumentError
@@ -494,16 +514,16 @@ module RubySketch
     end
 
     # @private
-    def parse_color__ (str, alpha)
+    private def parseColor__ (str, alpha)
       result = str.match /^\s*##{'([0-9a-f]{2})' * 3}\s*$/i
-      raise ArgumentError, "Invalid color code: '#{str}'" unless result
+      raise ArgumentError, "invalid color code: '#{str}'" unless result
 
       rgb = result[1..3].map.with_index {|hex, i| hex.to_i(16) / 255.0}
       return *rgb, (alpha / alphaMax__)
     end
 
     # @private
-    def alphaMax__ ()
+    private def alphaMax__ ()
       @colorMaxes__[3]
     end
 
@@ -517,15 +537,57 @@ module RubySketch
       @angleScale__ = case mode
         when RADIANS then RAD2DEG__
         when DEGREES then 1.0
-        else raise ArgumentError, "Invalid angle mode: #{mode}"
+        else raise ArgumentError, "invalid angle mode: #{mode}"
       end
+      nil
     end
 
     # @private
-    def to_angle__ (angle)
+    private def toAngle__ (angle)
       angle * @angleScale__
     end
 
+    # Sets rect mode. Default is CORNER.
+    #
+    # CORNER  -> rect(left, top, width, height)
+    # CORNERS -> rect(left, top, right, bottom)
+    # CENTER  -> rect(center_x, center_y, width, height)
+    # RADIUS  -> rect(center_x, center_y, radius_h, radius_v)
+    #
+    # @param mode [CORNER, CORNERS, CENTER, RADIUS]
+    #
+    # @return [nil] nil
+    #
+    def rectMode (mode)
+      @rectMode__ = mode
+    end
+
+    # Sets ellipse mode. Default is CENTER.
+    #
+    # CORNER  -> ellipse(left, top, width, height)
+    # CORNERS -> ellipse(left, top, right, bottom)
+    # CENTER  -> ellipse(center_x, center_y, width, height)
+    # RADIUS  -> ellipse(center_x, center_y, radius_h, radius_v)
+    #
+    # @param mode [CORNER, CORNERS, CENTER, RADIUS]
+    #
+    # @return [nil] nil
+    #
+    def ellipseMode (mode)
+      @ellipseMode__ = mode
+    end
+
+    # @private
+    private def toXYWH__ (mode, a, b, c, d)
+      case mode
+      when CORNER  then [a,           b,           c,     d]
+      when CORNERS then [a,           b,           c - a, d - b]
+      when CENTER  then [a - c / 2.0, b - d / 2.0, c,     d]
+      when RADIUS  then [a - c,       b - d,       c * 2, d * 2]
+      else raise ArgumentError # ToDo: refine error message
+      end
+    end
+
     # Clears screen.
     #
     # @overload background(str)
@@ -545,7 +607,14 @@ module RubySketch
     # @return [nil] nil
     #
     def background (*args)
-      @painter__.background(*to_rgba__(*args))
+      rgba = toRGBA__ *args
+      if rgba[3] == 1
+        @painter__.background *rgba
+      else
+        @painter__.push fill: rgba, stroke: nil do |_|
+          @painter__.rect 0, 0, width, height
+        end
+      end
       nil
     end
 
@@ -568,7 +637,7 @@ module RubySketch
     # @return [nil] nil
     #
     def fill (*args)
-      @painter__.fill(*to_rgba__(*args))
+      @painter__.fill(*toRGBA__(*args))
       nil
     end
 
@@ -591,7 +660,7 @@ module RubySketch
     # @return [nil] nil
     #
     def stroke (*args)
-      @painter__.stroke(*to_rgba__(*args))
+      @painter__.stroke(*toRGBA__(*args))
       nil
     end
 
@@ -647,6 +716,20 @@ module RubySketch
       nil
     end
 
+    # Draws a point.
+    #
+    # @param x [Numeric] horizontal position
+    # @param y [Numeric] vertical position
+    #
+    # @return [nil] nil
+    #
+    def point (x, y)
+      w = @painter__.stroke_width
+      w = 1 if w == 0
+      @painter__.ellipse x - (w / 2.0), y - (w / 2.0), w, w
+      nil
+    end
+
     # Draws a line.
     #
     # @param x1 [Numeric] horizontal position for first point
@@ -663,14 +746,14 @@ module RubySketch
 
     # Draws a rectangle.
     #
-    # @overload rect(x, y, w, h)
-    # @overload rect(x, y, w, h, r)
-    # @overload rect(x, y, w, h, tl, tr, br, bl)
+    # @overload rect(a, b, c, d)
+    # @overload rect(a, b, c, d, r)
+    # @overload rect(a, b, c, d, tl, tr, br, bl)
     #
-    # @param x  [Numeric] horizontal position
-    # @param y  [Numeric] vertical position
-    # @param w  [Numeric] width of the shape
-    # @param h  [Numeric] height of the shape
+    # @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
@@ -679,7 +762,8 @@ module RubySketch
     #
     # @return [nil] nil
     #
-    def rect (x, y, w, h, *args)
+    def rect (a, b, c, d, *args)
+      x, y, w, h = toXYWH__ @rectMode__, a, b, c, d
       case args.size
         when 0 then @painter__.rect x, y, w, h
         when 1 then @painter__.rect x, y, w, h, round: args[0]
@@ -689,24 +773,25 @@ module RubySketch
       nil
     end
 
-    # Draws a ellipse.
+    # Draws an ellipse.
     #
-    # @param x [Numeric] horizontal position
-    # @param y [Numeric] vertical position
-    # @param w [Numeric] width of the shape
-    # @param h [Numeric] height of the shape
+    # @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
     #
     # @return [nil] nil
     #
-    def ellipse (x, y, w, h = w)
-      @painter__.ellipse (x - w / 2.0), (y - h / 2.0), w, h
+    def ellipse (a, b, c, d)
+      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
+      @painter__.ellipse x, y, w, h
       nil
     end
 
     # Draws a circle.
     #
-    # @param x      [Numeric] horizontal position
-    # @param y      [Numeric] vertical position
+    # @param x      [Numeric] horizontal position of the shape
+    # @param y      [Numeric] vertical position of the shape
     # @param extent [Numeric] width and height of the shape
     #
     # @return [nil] nil
@@ -717,31 +802,66 @@ module RubySketch
 
     # Draws an arc.
     #
-    # @param x     [Numeric] horizontal position
-    # @param y     [Numeric] vertical position
-    # @param w     [Numeric] width of the shape
-    # @param h     [Numeric] height of the shape
+    # @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
     # @param start [Numeric] angle to start the arc
     # @param stop  [Numeric] angle to stop the arc
     #
     # @return [nil] nil
     #
-    def arc (x, y, w, h, start, stop)
-      start = to_angle__ start
-      stop  = to_angle__ stop
-      @painter__.ellipse x - w / 2, y - h / 2, w, h, from: start, to: stop
+    def arc (a, b, c, d, start, stop)
+      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
+      start      = toAngle__ start
+      stop       = toAngle__ stop
+      @painter__.ellipse x, y, w, h, from: start, to: stop
       nil
     end
 
-    # Draws a point.
+    # Draws a square.
     #
-    # @param x [Numeric] horizontal position
-    # @param y [Numeric] vertical position
+    # @param x      [Numeric] horizontal position of the shape
+    # @param y      [Numeric] vertical position of the shape
+    # @param extent [Numeric] width and height of the shape
     #
     # @return [nil] nil
     #
-    def point (x, y)
-      @painter__.rect x - 0.5, y - 0.5, 1, 1
+    def square (x, y, extent)
+      rect x, y, extent, extent
+    end
+
+    # Draws a triangle.
+    #
+    # @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 x3 [Numeric] horizontal position of third point
+    # @param y3 [Numeric] vertical position of third point
+    #
+    # @return [nil] nil
+    #
+    def triangle (x1, y1, x2, y2, x3, y3)
+      @painter__.line x1, y1, x2, y2, x3, y3, loop: true
+      nil
+    end
+
+    # Draws a quad.
+    #
+    # @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 x3 [Numeric] horizontal position of third point
+    # @param y3 [Numeric] vertical position of third point
+    # @param x4 [Numeric] horizontal position of fourth point
+    # @param y4 [Numeric] vertical position of fourth point
+    #
+    # @return [nil] nil
+    #
+    def quad (x1, y1, x2, y2, x3, y3, x4, y4)
+      @painter__.line x1, y1, x2, y2, x3, y3, x4, y4, loop: true
       nil
     end
 
@@ -751,16 +871,36 @@ module RubySketch
     # @overload text(str, x, y)
     #
     # @param str [String]  text to draw
-    # @param x   [Numeric] horizontal position
-    # @param y   [Numeric] vertical position
+    # @param x   [Numeric] horizontal position of the text
+    # @param y   [Numeric] vertical position of the text
     #
     # @return [nil] nil
     #
-    def text (str, x = 0, y = 0)
+    def text (str, x, y)
       @painter__.text str, x, y
       nil
     end
 
+    # Draws an image.
+    #
+    # @overload image(img, x, y)
+    # @overload image(img, x, y, w, h)
+    #
+    # @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
+    #
+    # @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
+      nil
+    end
+
     # Applies translation matrix to current transformation matrix.
     #
     # @param x [Numeric] horizontal transformation
@@ -796,7 +936,7 @@ module RubySketch
     # @return [nil] nil
     #
     def rotate (angle)
-      @painter__.rotate to_angle__ angle
+      @painter__.rotate toAngle__ angle
       nil
     end
 
@@ -805,7 +945,7 @@ module RubySketch
     # @return [nil] nil
     #
     def pushMatrix ()
-      @painter__.push_matrix
+      @matrixStack__.push @painter__.matrix
       nil
     end
 
@@ -814,7 +954,8 @@ module RubySketch
     # @return [nil] nil
     #
     def popMatrix ()
-      @painter__.pop_matrix
+      raise "matrix stack underflow" if @matrixStack__.empty?
+      @painter__.matrix = @matrixStack__.pop
       nil
     end
 
@@ -827,6 +968,61 @@ module RubySketch
       nil
     end
 
+    # Save current style values to the style stack.
+    #
+    # @return [nil] nil
+    #
+    def pushStyle ()
+      @styleStack__.push [
+        @painter__.fill,
+        @painter__.stroke,
+        @painter__.stroke_width,
+        @painter__.font,
+        @hsbColor__,
+        @colorMaxes__,
+        @angleScale__,
+        @rectMode__,
+        @ellipseMode__
+      ]
+      nil
+    end
+
+    # Restore style values from the style stack.
+    #
+    # @return [nil] nil
+    #
+    def popStyle ()
+      raise "style stack underflow" if @styleStack__.empty?
+      @painter__.fill,
+      @painter__.stroke,
+      @painter__.stroke_width,
+      @painter__.font,
+      @hsbColor__,
+      @colorMaxes__,
+      @angleScale__,
+      @rectMode__,
+      @ellipseMode__ = @styleStack__.pop
+      nil
+    end
+
+    # Save current styles and transformations to stack.
+    #
+    # @return [nil] nil
+    #
+    def push ()
+      pushMatrix
+      pushStyle
+    end
+
+    # Restore styles and transformations from stack.
+    #
+    # @return [nil] nil
+    #
+    def pop ()
+      popMatrix
+      popStyle
+    end
+
     # Returns the perlin noise value.
     #
     # @overload noise(x)
@@ -841,75 +1037,146 @@ module RubySketch
       Rays.perlin(x, y) / 2.0 + 1.0
     end
 
-    # Font object.
+    # Loads image.
     #
-    class Font
+    # @param filename  [String] file name to load image
+    # @param extension [String] type of image to load (ex. 'png')
+    #
+    def loadImage (filename, extension = nil)
+      filename = getImage__ filename, extension if filename =~ %r|^https?://|
+      Image.new Rays::Image.load filename
+    end
 
-      # Initialize font.
-      #
-      # @private
-      #
-      def initialize (font)
-        @font = font
+    # @private
+    private def getImage__ (uri, ext)
+      ext ||= File.extname uri
+      raise "unsupported image type" unless ext =~ /^\.?(png)$/i
+
+      tmpdir = Pathname(Dir.tmpdir) + Digest::SHA1.hexdigest(self.class.name)
+      path   = tmpdir + Digest::SHA1.hexdigest(uri)
+      path   = path.sub_ext ext
+
+      URI.open uri do |input|
+        tmpdir.mkdir unless tmpdir.directory?
+        path.open('w') do |output|
+          while buf = input.read(2 ** 16)
+            output.write buf
+          end
+        end
       end
+      path.to_s
+    end
 
-      # Returns bounding box.
-      #
-      # @overload textBounds(str)
-      # @overload textBounds(str, x, y)
-      # @overload textBounds(str, x, y, fontSize)
-      #
-      # @param str      [String]  text to calculate bounding box
-      # @param x        [Numeric] horizontal position of bounding box
-      # @param y        [Numeric] vertical position of bounding box
-      # @param fontSize [Numeric] font size
-      #
-      # @return [TextBounds] bounding box for text
-      #
-      def textBounds (str, x = 0, y = 0, fontSize = nil)
-        f = fontSize ? Rays::Font.new(@font.name, fontSize) : @font
-        TextBounds.new x, y, x + f.width(str), y + f.height
-      end
+  end# Processing
 
-      # Bounding box for text.
-      #
-      class TextBounds
-
-        # Horizontal position
-        #
-        attr_reader :x
-
-        # Vertical position
-        #
-        attr_reader :y
-
-        # Width of bounding box
-        #
-        attr_reader :w
-
-        # Height of bounding box
-        #
-        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
-        #
-        def initialize (x, y, w, h)
-          @x, @y, @w, @h = x, y, w, h
-        end
 
-      end# TextBounds
+  # Image object.
+  #
+  class Processing::Image
+
+    # Initialize image.
+    #
+    def initialize (image)
+      @image = image
+    end
+
+    # Gets width of image.
+    #
+    # @return [Numeric] width of image
+    #
+    def width ()
+      @image.width
+    end
+
+    # Gets height of image.
+    #
+    # @return [Numeric] height of image
+    #
+    def height ()
+      @image.height
+    end
+
+    # Saves image to file.
+    #
+    # @param filename [String] file name to save image
+    #
+    def save (filename)
+      @image.save filename
+    end
+
+    # @private
+    def internal ()
+      @image
+    end
+
+  end# Processing::Image
+
+
+  # Font object.
+  #
+  class Processing::Font
+
+    # Initialize font.
+    #
+    # @private
+    #
+    def initialize (font)
+      @font = font
+    end
+
+    # Returns bounding box.
+    #
+    # @overload textBounds(str)
+    # @overload textBounds(str, x, y)
+    # @overload textBounds(str, x, y, fontSize)
+    #
+    # @param str      [String]  text to calculate bounding box
+    # @param x        [Numeric] horizontal position of bounding box
+    # @param y        [Numeric] vertical position of bounding box
+    # @param fontSize [Numeric] font size
+    #
+    # @return [TextBounds] bounding box for text
+    #
+    def textBounds (str, x = 0, y = 0, fontSize = nil)
+      f = fontSize ? Rays::Font.new(@font.name, fontSize) : @font
+      TextBounds.new x, y, x + f.width(str), y + f.height
+    end
+
+  end# Processing::Font
+
+
+  # Bounding box for text.
+  #
+  class Processing::TextBounds
+
+    # Horizontal position
+    #
+    attr_reader :x
 
-    end# Font
+    # Vertical position
+    #
+    attr_reader :y
 
-  end# Processing1
+    # Width of bounding box
+    #
+    attr_reader :w
 
+    # Height of bounding box
+    #
+    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
+    #
+    def initialize (x, y, w, h)
+      @x, @y, @w, @h = x, y, w, h
+    end
 
-  Processing = Processing1
+  end# Processing::TextBounds
 
 
 end# RubySketch

data/lib/rubysketch/window.rb

@@ -100,7 +100,7 @@ module RubySketch
     def call_block (block, event, *args)
       @events.push event
       block.call event, *args if block && !@error
-    rescue => e
+    rescue Exception => e
       @error = e
       $stderr.puts e.full_message
     ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.2
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -107,8 +107,11 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- examples/clock.rb
 - examples/glsl.rb
 - examples/hello.rb
+- examples/image.rb
+- examples/shapes.rb
 - lib/rubysketch-processing.rb
 - lib/rubysketch.rb
 - lib/rubysketch/glsl.rb