processing 0.5.34 → 1.0.1

data/lib/processing/shape.rb

@@ -9,9 +9,10 @@ module Processing
 
     # @private
     def initialize(polygon = nil, children = nil, context: nil)
-      @polygon, @children      = polygon, children
-      @context                 = context || Context.context__
-      @visible, @fill, @matrix = true, nil, nil
+      @polygon, @children = polygon, children
+      @context            = context || Context.context__
+      @visible            = true
+      @fill = @stroke = @strokeWeight = @strokeCap = @strokeJoin = @matrix = nil
       @type = @points = @curvePoints = @colors = @texcoords = @close = nil
       @contours = @contourPoints = @contourColors = @contourTexCoords = nil
     end
@@ -72,6 +73,7 @@ module Processing
     #
     def beginShape(type = nil)
       raise "beginShape() cannot be called twice" if drawingShape__
+      @fill = @stroke = @strokeWeight = @strokeCap = @strokeJoin = nil
       @type        = type
       @points    ||= []
       @curvePoints = []
@@ -91,7 +93,13 @@ module Processing
     #
     def endShape(close = nil)
       raise "endShape() must be called after beginShape()" unless drawingShape__
-      @close = close == GraphicsContext::CLOSE || @contours.size > 0
+      painter         = @context.getPainter__
+      @fill         ||= painter.fill
+      @stroke       ||= painter.stroke
+      @strokeWeight ||= painter.stroke_width
+      @strokeCap    ||= painter.stroke_cap
+      @strokeJoin   ||= painter.stroke_join
+      @close          = close == GraphicsContext::CLOSE || @contours.size > 0
       if @close && @curvePoints.size >= 8
         x, y = @curvePoints[0, 2]
         2.times {curveVertex x, y}
@@ -147,7 +155,7 @@ module Processing
       raise "Either 'u' or 'v' is missing" if (u == nil) != (v == nil)
       u   ||= x
       v   ||= y
-      color = @fill || @context.getFill__
+      color = @fill || @context.getPainter__.fill
       if drawingContour__
         @contourPoints    << x << y
         @contourColors    << color
@@ -250,7 +258,30 @@ module Processing
     # @see https://p5js.org/reference/#/p5/fill
     #
     def fill(*args)
-      @fill = @context.rawColor__(*args)
+      @fill = @context.toRawColor__(*args)
+      nil
+    end
+
+    # Sets stroke color.
+    #
+    # @overload stroke(gray)
+    # @overload stroke(gray, alpha)
+    # @overload stroke(r, g, b)
+    # @overload stroke(r, g, b, alpha)
+    #
+    # @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
+    #
+    # @see https://processing.org/reference/stroke_.html
+    # @see https://p5js.org/reference/#/p5/stroke
+    #
+    def stroke(*args)
+      @stroke = @context.toRawColor__(*args)
       nil
     end
 
@@ -300,12 +331,12 @@ module Processing
       @points.size / 2
     end
 
-    # Sets the fill color.
+    # Sets the fill color for all vertices.
     #
-    # @overload fill(gray)
-    # @overload fill(gray, alpha)
-    # @overload fill(r, g, b)
-    # @overload fill(r, g, b, alpha)
+    # @overload setFill(gray)
+    # @overload setFill(gray, alpha)
+    # @overload setFill(r, g, b)
+    # @overload setFill(r, g, b, alpha)
     #
     # @param gray  [Integer]  gray value (0..255)
     # @param r     [Integer]   red value (0..255)
@@ -318,26 +349,76 @@ module Processing
     # @see https://processing.org/reference/PShape_setFill_.html
     #
     def setFill(*args)
-      color = @context.rawColor__(*args)
+      fill(*args)
       count = getVertexCount
       if count > 0
         if @colors
-          @colors.fill color
+          @colors.fill @fill
         else
-          @colors = [color] * count
+          @colors = [@fill] * count
         end
         clearCache__
       elsif @polygon
         @polygon = @polygon.transform do |polylines|
-          polylines.map {|pl| pl.with colors: pl.points.map {color}}
+          polylines.map {|pl| pl.with colors: pl.points.map {@fill}}
         end
       end
       nil
     end
 
-    # @private
-    def setStroke__()
-      raise NotImplementedError
+    # Sets the stroke color.
+    #
+    # @overload setStroke(gray)
+    # @overload setStroke(gray, alpha)
+    # @overload setStroke(r, g, b)
+    # @overload setStroke(r, g, b, alpha)
+    #
+    # @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
+    #
+    # @see https://processing.org/reference/PShape_setStroke_.html
+    #
+    def setStroke(*args)
+      stroke(*args)
+      nil
+    end
+
+    # Sets the stroke weight.
+    #
+    # @param weight [Numeric] stroke weight
+    #
+    # @return [nil] nil
+    #
+    def setStrokeWeight(weight)
+      @strokeWeight = weight
+      nil
+    end
+
+    # Sets the stroke cap.
+    #
+    # @param cap [ROUND, SQUARE, PROJECT] stroke cap
+    #
+    # @return [nil] nil
+    #
+    def setStrokeCap(cap)
+      @strokeCap = cap
+      nil
+    end
+
+    # Sets the stroke join.
+    #
+    # @param join [MITER, BEVEL, ROUND] stroke join
+    #
+    # @return [nil] nil
+    #
+    def setStrokeJoin(join)
+      @strokeJoin = join
+      nil
     end
 
     # Adds a new child shape.
@@ -505,24 +586,36 @@ module Processing
 
     # @private
     def draw__(painter, x, y, w = nil, h = nil)
-      poly = getInternal__
+      p, poly = painter, getInternal__
 
-      backup = nil
+      matrix_ = nil
       if @matrix && (poly || @children)
-        backup = painter.matrix
-        painter.matrix = backup * @matrix
+        matrix_  = p.matrix
+        p.matrix = matrix_ * @matrix
       end
 
       if poly
+        f_ = s_ = sw_ = sc_ = sj_ = nil
+        f_,  p.fill         = p.fill,         '#fff'        if @fill
+        s_,  p.stroke       = p.stroke,       @stroke       if @stroke
+        sw_, p.stroke_width = p.stroke_width, @strokeWeight if @strokeWeight
+        sc_, p.stroke_cap   = p.stroke_cap,   @strokeCap    if @strokeCap
+        sj_, p.stroke_join  = p.stroke_join,  @strokeJoin   if @strokeJoin
         if w || h
-          painter.polygon poly, x, y, w,h
+          p.polygon poly, x, y, w,h
         else
-          painter.polygon poly, x, y
+          p.polygon poly, x, y
         end
+        p.fill         = f_  if f_
+        p.stroke       = s_  if s_
+        p.stroke_width = sw_ if sw_
+        p.stroke_cap   = sc_ if sc_
+        p.stroke_join  = sj_ if sj_
       end
-      @children&.each {|o| o.draw__ painter, x, y, w, h}
 
-      painter.matrix = backup if backup
+      @children&.each {|o| o.draw__ p, x, y, w, h}
+
+      p.matrix = matrix_ if matrix_
     end
 
     # @private

data/lib/processing/svg.rb

@@ -0,0 +1,248 @@
+module Processing
+
+
+  # @private
+  class SVGLoader
+
+    def initialize(context)
+      @c, @cc = context, context.class
+    end
+
+    def load(filename)
+      parse File.read(filename)
+    end
+
+    def parse(xml)
+      addGroup nil, REXML::Document.new(xml).elements.first
+    end
+
+    def addGroup(parent, e, **attribs)
+      group   = @c.createShape @cc::GROUP
+      attribs = getAttribs e, attribs
+      e.elements.each do |child|
+        case child.name.to_sym
+        when :g, :a    then addGroup    group, child,       **attribs
+        when :line     then addLine     group, child,       **attribs
+        when :rect     then addRect     group, child,       **attribs
+        when :circle   then addCircle   group, child,       **attribs
+        when :ellipse  then addEllipse  group, child,       **attribs
+        when :polyline then addPolyline group, child,       **attribs
+        when :polygon  then addPolyline group, child, true, **attribs
+        when :path     then addPath     group, child,       **attribs
+        end
+      end
+      parent.addChild group if parent
+      group
+    end
+
+    def addLine(parent, e, **attribs)
+      x1, y1 = float(e, :x1), float(e, :y1)
+      x2, y2 = float(e, :x2), float(e, :y2)
+      s = @c.createLineShape__ x1, y1, x2, y2
+      applyAttribs s, e, attribs
+      parent.addChild s
+    end
+
+    def addRect(parent, e, **attribs)
+      x,  y  = float(e, :x),     float(e, :y)
+      w,  h  = float(e, :width), float(e, :height)
+      rx, ry = float(e, :rx),    float(e, :ry)
+      s = @c.createRectShape__ x, y, w, h, (rx || ry), mode: @cc::CORNER
+      applyAttribs s, e, attribs
+      parent.addChild s
+    end
+
+    def addCircle(parent, e, **attribs)
+      cx, cy = float(e, :cx), float(e, :cy)
+      r      = float(e, :r)
+      s = @c.createEllipseShape__ cx, cy, r * 2, r * 2, mode: @cc::CENTER
+      applyAttribs s, e, attribs
+      parent.addChild s
+    end
+
+    def addEllipse(parent, e, **attribs)
+      cx, cy = float(e, :cx), float(e, :cy)
+      rx, ry = float(e, :rx), float(e, :ry)
+      s = @c.createEllipseShape__ cx, cy, rx * 2, ry * 2, mode: @cc::CENTER
+      applyAttribs s, e, attribs
+      parent.addChild s
+    end
+
+    def addPolyline(parent, e, close = false, **attribs)
+      points  = e[:points] or raise Error, "missing 'points'"
+      scanner = StringScanner.new points
+      child   = @c.createShape
+      child.beginShape
+
+      skipSpaces scanner
+      until scanner.eos?
+        child.vertex(*nextPos(scanner))
+        skipSpaces scanner
+      end
+
+      child.endShape close ? @cc::CLOSE : @cc::OPEN
+      applyAttribs child, e, attribs
+      parent.addChild child
+    end
+
+    def applyAttribs(shape, e, attribs)
+      a = getAttribs e, attribs
+      shape.setFill         a[:fill]         || :black
+      shape.setStroke       a[:stroke]       || :none
+      shape.setStrokeWeight a[:strokeWeight] || 1
+      shape.setStrokeCap    a[:strokeCap]    || @cc::SQUARE
+      shape.setStrokeJoin   a[:strokeJoin]   || @cc::MITER
+    end
+
+    def getAttribs(e, attribs)
+      @caps ||= {
+        'butt'   => @cc::SQUARE,
+        'round'  => @cc::ROUND,
+        'square' => @cc::PROJECT
+      }
+      @joins ||= {
+        'miter'      => @cc::MITER,
+        'miter-clip' => @cc::MITER,
+        'round'      => @cc::ROUND,
+        'bevel'      => @cc::BEVEL,
+        'arcs'       => @cc::MITER
+      }
+      attribs.merge({
+        fill:                e[:fill],
+        stroke:              e[:stroke],
+        strokeWeight:        e[:'stroke-width'],
+        strokeCap:    @caps[ e[:'stroke-linecap']],
+        strokeJoin:   @joins[e[:'stroke-linejoin']]
+      }.compact)
+    end
+
+    def int(e, key, defval = 0)
+      e[key]&.to_i || defval
+    end
+
+    def float(e, key, defval = 0)
+      e[key]&.to_f || defval
+    end
+
+    def addPath(parent, e, **attribs)
+      data    = e[:d] or raise Error, "missing 'd'"
+      scanner = StringScanner.new data
+      skipSpaces scanner
+
+      child      = nil
+      close      = false
+      beginChild = -> {
+        close = false
+        child = @c.createShape
+        child.beginShape
+      }
+      endChild   = -> {
+        if child# && child.getVertexCount >= 2
+          child.endShape close ? @cc::CLOSE : @cc::OPEN
+          applyAttribs child, e, attribs
+          parent.addChild child
+        end
+      }
+
+      lastCommand    = nil
+      lastX,  lastY  = 0, 0
+      lastCX, lastCY = 0, 0
+      until scanner.eos?
+        command = nextCommand scanner
+        if command =~ /^[Mm]$/
+          endChild.call
+          beginChild.call
+        end
+        raise Error, "no leading 'M' or 'm'" unless child
+
+        command ||= lastCommand
+        case command
+        when 'M', 'm'
+          lastX, lastY = nextPos scanner, lastX, lastY, command == 'm'
+          child.vertex lastX, lastY
+        when 'L', 'l'
+          lastX, lastY = nextPos scanner, lastX, lastY, command == 'l'
+          child.vertex lastX, lastY
+        when 'H', 'h'
+          lastX = nextNum scanner, lastX, command == 'h'
+          child.vertex lastX, lastY
+        when 'V', 'v'
+          lastY = nextNum scanner, lastY, command == 'v'
+          child.vertex lastX, lastY
+        when 'Q', 'q'
+          relative       = command == 'q'
+          lastCX, lastCY = nextPos scanner, lastX, lastY, relative
+          lastX,  lastY  = nextPos scanner, lastX, lastY, relative
+          child.quadraticVertex lastCX, lastCY, lastX, lastY
+        when 'T', 't'
+          lastCX, lastCY =
+            if lastCommand =~ /[QqTt]/
+              [lastX + (lastX - lastCX), lastY + (lastY - lastCY)]
+            else
+              [lastX, lastY]
+            end
+          lastX, lastY = nextPos scanner, lastX, lastY, command == 't'
+          child.quadraticVertex lastCX, lastCY, lastX, lastY
+        when 'C', 'c'
+          relative       = command == 'c'
+              cx,     cy = nextPos scanner, lastX, lastY, relative
+          lastCX, lastCY = nextPos scanner, lastX, lastY, relative
+          lastX,  lastY  = nextPos scanner, lastX, lastY, relative
+          child.bezierVertex cx, cy, lastCX, lastCY, lastX, lastY
+        when 'S', 's'
+          cx, cy =
+            if lastCommand =~ /[CcSs]/
+              [lastX + (lastX - lastCX), lastY + (lastY - lastCY)]
+            else
+              [lastX, lastY]
+            end
+          relative       = command == 's'
+          lastCX, lastCY = nextPos scanner, lastX, lastY, relative
+          lastX,  lastY  = nextPos scanner, lastX, lastY, relative
+          child.bezierVertex cx, cy, lastCX, lastCY, lastX, lastY
+        when 'A', 'a'
+          rx, ry       = nextPos scanner
+          a, b, c      = nextNum(scanner), nextNum(scanner), nextNum(scanner)
+          lastX, lastY = nextPos scanner, lastX, lastY, command == 'a'
+          child.vertex lastX, lastY
+        when 'Z', 'z'
+          v0           = child.getVertex 0
+          lastX, lastY = v0 ? [v0.x, v0.y] : [0, 0]
+          close = true
+        end
+        lastCommand = command
+      end
+      endChild.call
+    end
+
+    def nextCommand(scanner)
+      w = scanner.scan(/[[:alpha:]]/)
+      skipSpaces scanner
+      w
+    end
+
+    def nextNum(scanner, base = 0, relative = true)
+      n = scanner.scan(/(?:[\+\-]\s*)?\d*(?:\.\d+)?/)&.strip&.to_f
+      raise Error, 'invalid path' unless n
+      skipSpaces scanner
+      n + (relative ? base : 0)
+    end
+
+    def nextPos(scanner, baseX = 0, baseY = 0, relative = true)
+      [nextNum(scanner, baseX, relative), nextNum(scanner, baseY, relative)]
+    end
+
+    def skipSpaces(scanner)
+      scanner.scan(/\s*,?\s*/)
+    end
+
+    class Error < StandardError
+      def initialize(message = "error")
+        super "SVG: #{message}"
+      end
+    end# Error
+
+  end# SVG
+
+
+end# Processing

data/processing.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',       '~> 0.1.42'
-  s.add_runtime_dependency 'rucy',      '~> 0.1.44'
-  s.add_runtime_dependency 'rays',      '~> 0.1.49'
-  s.add_runtime_dependency 'reflexion', '~> 0.1.57'
+  s.add_runtime_dependency 'xot',       '~> 0.2'
+  s.add_runtime_dependency 'rucy',      '~> 0.2'
+  s.add_runtime_dependency 'rays',      '~> 0.2'
+  s.add_runtime_dependency 'reflexion', '~> 0.2'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}

data/test/{p5.rb → browser.rb}

@@ -13,6 +13,30 @@ def browser(width, height, headless: true)
   hash[key] ||= Ferrum::Browser.new headless: headless, window_size: [width, height]
 end
 
+def get_svg_html(width, height, svg_xml)
+  <<~END
+    <html>
+      <head>
+        <style type="text/css">
+          body {margin: 0;}
+        </style>
+        <script type="text/javascript">
+          window.onload = function() {
+            let e = document.createElement("span");
+            e.id = 'completed';
+            document.body.appendChild(e);
+          }
+        </script>
+      </head>
+      <body>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 #{width} #{height}">
+          #{svg_xml}
+        </svg>
+      </body>
+    </html>
+  END
+end
+
 def get_p5rb_html(width, height, draw_src, webgl: false)
   <<~END
     <html>
@@ -57,17 +81,17 @@ def sleep_until(try: 3, timeout: 10, &block)
       limit = now[timeout]
       try -= 1
       next if try > 0
-      raise 'Drawing timed out in p5.rb'
+      raise 'Drawing timed out in browser'
     end
     sleep 0.1
   end
 end
 
-def draw_p5rb(width, height, draw_src, path, headless: true, webgl: false)
+def draw_on_browser(width, height, path, html, headless: true)
   b = browser width, height, headless: headless
   unless File.exist? path
     b.reset
-    b.main_frame.content = get_p5rb_html width, height, draw_src, webgl: webgl
+    b.main_frame.content = html
     sleep_until do
       b.evaluate 'document.querySelector("#completed") != null'
     end
@@ -75,3 +99,13 @@ def draw_p5rb(width, height, draw_src, path, headless: true, webgl: false)
   end
   b.device_pixel_ratio
 end
+
+def draw_svg(width, height, svg_xml, path, headless: true)
+  html = get_svg_html width, height, svg_xml
+  draw_on_browser width, height, path, html, headless: headless
+end
+
+def draw_p5rb(width, height, draw_src, path, headless: true, webgl: false)
+  html = get_p5rb_html width, height, draw_src, webgl: webgl
+  draw_on_browser width, height, path, html, headless: headless
+end

data/test/helper.rb

@@ -20,9 +20,11 @@ DEFAULT_DRAW_HEADER = <<~END
   strokeWeight 50
 END
 
+THRESHOLD_TO_BE_FIXED = 0.0
 
-def test_with_p5?()
-  ENV['TEST_WITH_P5'] == '1'
+
+def test_with_browser?()
+  (ENV['TEST_WITH_BROWSER'] || '0') != '0'
 end
 
 def md5(s)
@@ -107,16 +109,47 @@ def assert_equal_draw(
   assert_equal_pixels e, a, threshold: threshold
 end
 
+def assert_svg_draw(
+  svg_xml,
+  width: 1000, height: 1000, threshold: 0.99, label: test_label, **kwargs)
+
+  source = <<~END
+    background 255
+    shape Processing::SVGLoader.new(self).parse <<~SVG
+      <?xml version="1.0" encoding="UTF-8"?>
+      <svg xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        viewBox="0 0 100 100">
+        #{svg_xml}
+      </svg>
+    SVG
+  END
+  assert_draw_on_browser(
+    source, width, height, threshold, label, **kwargs
+  ) do |path|
+    draw_svg width, height, svg_xml, path, **kwargs
+  end
+end
+
 def assert_p5_draw(
   *sources, default_header: DEFAULT_DRAW_HEADER,
   width: 1000, height: 1000, threshold: 0.99, label: test_label, **kwargs)
 
-  return unless test_with_p5?
-
   source = [default_header, *sources].compact.join("\n")
-  path   = draw_output_path "#{label}_expected", source
+  assert_draw_on_browser(
+    source, width, height, threshold, label, **kwargs
+  ) do |path|
+    draw_p5rb width, height, source, path, **kwargs
+  end
+end
 
-  pd     = draw_p5rb width, height, source, path, **kwargs
+def assert_draw_on_browser(
+  source, width, height, threshold, label, **kwargs, &draw_on_browser)
+
+  return unless test_with_browser?
+
+  path   = draw_output_path "#{label}_expected", source
+  pd     = draw_on_browser.call path
   actual = test_draw source, width: width, height: height, pixelDensity: pd
   actual.save path.sub('_expected', '_actual')
 
@@ -136,4 +169,4 @@ def assert_p5_fill_stroke(*sources, **kwargs)
 end
 
 
-require_relative 'p5' if test_with_p5?
+require_relative 'browser' if test_with_browser?