processing 0.5.34 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54026be3e0523b71c57d18c46525a46dd0291fea20c916c9a77d06398735e15
-  data.tar.gz: 7c38db77660d2ddddaba759396e54ea6245b1bca132684292e25d306273e433e
+  metadata.gz: d7ebe70f2fc384d5892bfc8bf33773451585c82aecc01e36f594803cbd3cbe4c
+  data.tar.gz: fccd650cf7fa9e38f499c7d279624c5a30aa5eb40bde70d9a3c6c5c4ce8805f9
 SHA512:
-  metadata.gz: 7d2f9f2a261da953754a3476140069d6493b17d1d476bdc7907e35662ce1f9e7633339995f2613871fa3a0f3053cc1397300d1827382270e0783dad80b5f8640
-  data.tar.gz: 97c6eeff19b69a6874db4f1672bd0d140081fda349ca64850f5c10b7ecf343517e3a87e60bb5b5c5a2b005d89103a8ca1308ce460d55736507c33cb206c9a50f
+  metadata.gz: 875bdd9a5bdce3f8aa0b9490e7dd8fa526859999dbef0ac6fe7dcb4984f6c1f76435b550dfbf249ff817fb7e5b07dabea543e9d70c99887baebb0a7c0ecc5c23
+  data.tar.gz: 1f7348aaa12c5fc0893e9a6ca6c177daa2efc1c98934ebb5d50fb714638da2a7fd09c563c51c4fdd00ea2f9e634e460d3e5a6ad5ba3e68e9ca09f02c004d28b0

data/ChangeLog.md

@@ -1,6 +1,24 @@
 # processing ChangeLog
 
 
+## [v1.0.1] - 2024-03-14
+
+- Add 'rexml' to Gemfile
+
+
+## [v1.0] - 2024-03-14
+
+- Add stroke(), setStroke(), and setStrokeWeight() to Shape class
+- Add setStrokeCap() and setStrokeJoin() to Shape class
+- Add join type 'miter-clip' and 'arcs'
+- Add color codes
+- Add loadShape()
+
+- Rename the join type 'SQUARE' to 'BEVEL'
+
+- Fix that <circle> and <ellipse> had half diameters
+
+
 ## [v0.5.34] - 2024-02-16
 
 - Add '@see' links to documents

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'rexml'
 gem 'rake'
 gem 'test-unit'
 gem 'yard'

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
     power_assert (2.0.3)
     public_suffix (5.0.3)
     rake (13.1.0)
+    rexml (3.2.6)
     test-unit (3.6.1)
       power_assert
     webrick (1.7.0)
@@ -28,6 +29,7 @@ PLATFORMS
 DEPENDENCIES
   ferrum
   rake
+  rexml
   test-unit
   yard
 

data/Rakefile

@@ -14,15 +14,15 @@ require 'reflex/extension'
 require 'processing/extension'
 
 
-def test_with_p5()
-  ENV['TEST_WITH_P5'] = '1'
+def test_with_browser()
+  ENV['TEST_WITH_BROWSER'] = '1'
 end
 
 EXTENSIONS = [Xot, Rucy, Rays, Reflex, Processing]
 
 ENV['RDOC'] = 'yardoc --no-private'
 
-#test_with_p5 if ci?
+#test_with_browser if ci?
 
 default_tasks
 use_bundler
@@ -37,8 +37,8 @@ namespace :test do
     sh %( rm -rf test/.png/*.png )
   end
 
-  task :with_p5 do
-    test_with_p5
+  task :with_browser do
+    test_with_browser
   end
 
   ::Rake::TestTask.new :draw do |t|

data/VERSION

@@ -1 +1 @@
-0.5.34
+1.0.1

data/lib/processing/all.rb

@@ -1,9 +1,11 @@
 require 'set'
+require 'strscan'
 require 'digest/sha1'
 require 'pathname'
 require 'tmpdir'
-require 'net/http'
 require 'uri'
+require 'rexml'
+require 'net/http'
 require 'xot/inspectable'
 require 'reflex'
 
@@ -16,6 +18,7 @@ require 'processing/image'
 require 'processing/font'
 require 'processing/touch'
 require 'processing/shape'
+require 'processing/svg'
 require 'processing/shader'
 require 'processing/capture'
 require 'processing/graphics_context'

data/lib/processing/context.rb

@@ -593,7 +593,6 @@ module Processing
     #
     # @return [nil] nil
     #
-    #
     def windowOrientation(*orientations)
       @window__.orientations = orientations.flatten.uniq
     end

data/lib/processing/graphics_context.rb

@@ -70,6 +70,14 @@ module Processing
     #
     RADIUS  = :radius
 
+    # Mode for strokeCap() and strokeJoin().
+    #
+    ROUND   = :round
+
+    # Mode for strokeCap().
+    #
+    SQUARE  = :butt
+
     # Mode for strokeCap().
     #
     PROJECT = :square
@@ -80,11 +88,7 @@ module Processing
 
     # Mode for strokeCap() and strokeJoin().
     #
-    ROUND   = :round
-
-    # Mode for strokeCap() and strokeJoin().
-    #
-    SQUARE  = :butt
+    BEVEL   = :square
 
     # Mode for blendMode().
     #
@@ -292,6 +296,158 @@ module Processing
     UP        = :up
     DOWN      = :down
 
+    COLOR_CODES = {
+      aliceblue:            '#f0f8ff',
+      antiquewhite:         '#faebd7',
+      aqua:                 '#00ffff',
+      aquamarine:           '#7fffd4',
+      azure:                '#f0ffff',
+      beige:                '#f5f5dc',
+      bisque:               '#ffe4c4',
+      black:                '#000000',
+      blanchedalmond:       '#ffebcd',
+      blue:                 '#0000ff',
+      blueviolet:           '#8a2be2',
+      brown:                '#a52a2a',
+      burlywood:            '#deb887',
+      cadetblue:            '#5f9ea0',
+      chartreuse:           '#7fff00',
+      chocolate:            '#d2691e',
+      coral:                '#ff7f50',
+      cornflowerblue:       '#6495ed',
+      cornsilk:             '#fff8dc',
+      crimson:              '#dc143c',
+      cyan:                 '#00ffff',
+      darkblue:             '#00008b',
+      darkcyan:             '#008b8b',
+      darkgoldenrod:        '#b8860b',
+      darkgray:             '#a9a9a9',
+      darkgreen:            '#006400',
+      darkgrey:             '#a9a9a9',
+      darkkhaki:            '#bdb76b',
+      darkmagenta:          '#8b008b',
+      darkolivegreen:       '#556b2f',
+      darkorange:           '#ff8c00',
+      darkorchid:           '#9932cc',
+      darkred:              '#8b0000',
+      darksalmon:           '#e9967a',
+      darkseagreen:         '#8fbc8f',
+      darkslateblue:        '#483d8b',
+      darkslategray:        '#2f4f4f',
+      darkslategrey:        '#2f4f4f',
+      darkturquoise:        '#00ced1',
+      darkviolet:           '#9400d3',
+      deeppink:             '#ff1493',
+      deepskyblue:          '#00bfff',
+      dimgray:              '#696969',
+      dimgrey:              '#696969',
+      dodgerblue:           '#1e90ff',
+      firebrick:            '#b22222',
+      floralwhite:          '#fffaf0',
+      forestgreen:          '#228b22',
+      fuchsia:              '#ff00ff',
+      gainsboro:            '#dcdcdc',
+      ghostwhite:           '#f8f8ff',
+      goldenrod:            '#daa520',
+      gold:                 '#ffd700',
+      gray:                 '#808080',
+      green:                '#008000',
+      greenyellow:          '#adff2f',
+      grey:                 '#808080',
+      honeydew:             '#f0fff0',
+      hotpink:              '#ff69b4',
+      indianred:            '#cd5c5c',
+      indigo:               '#4b0082',
+      ivory:                '#fffff0',
+      khaki:                '#f0e68c',
+      lavenderblush:        '#fff0f5',
+      lavender:             '#e6e6fa',
+      lawngreen:            '#7cfc00',
+      lemonchiffon:         '#fffacd',
+      lightblue:            '#add8e6',
+      lightcoral:           '#f08080',
+      lightcyan:            '#e0ffff',
+      lightgoldenrodyellow: '#fafad2',
+      lightgray:            '#d3d3d3',
+      lightgreen:           '#90ee90',
+      lightgrey:            '#d3d3d3',
+      lightpink:            '#ffb6c1',
+      lightsalmon:          '#ffa07a',
+      lightseagreen:        '#20b2aa',
+      lightskyblue:         '#87cefa',
+      lightslategray:       '#778899',
+      lightslategrey:       '#778899',
+      lightsteelblue:       '#b0c4de',
+      lightyellow:          '#ffffe0',
+      lime:                 '#00ff00',
+      limegreen:            '#32cd32',
+      linen:                '#faf0e6',
+      magenta:              '#ff00ff',
+      maroon:               '#800000',
+      mediumaquamarine:     '#66cdaa',
+      mediumblue:           '#0000cd',
+      mediumorchid:         '#ba55d3',
+      mediumpurple:         '#9370db',
+      mediumseagreen:       '#3cb371',
+      mediumslateblue:      '#7b68ee',
+      mediumspringgreen:    '#00fa9a',
+      mediumturquoise:      '#48d1cc',
+      mediumvioletred:      '#c71585',
+      midnightblue:         '#191970',
+      mintcream:            '#f5fffa',
+      mistyrose:            '#ffe4e1',
+      moccasin:             '#ffe4b5',
+      navajowhite:          '#ffdead',
+      navy:                 '#000080',
+      oldlace:              '#fdf5e6',
+      olive:                '#808000',
+      olivedrab:            '#6b8e23',
+      orange:               '#ffa500',
+      orangered:            '#ff4500',
+      orchid:               '#da70d6',
+      palegoldenrod:        '#eee8aa',
+      palegreen:            '#98fb98',
+      paleturquoise:        '#afeeee',
+      palevioletred:        '#db7093',
+      papayawhip:           '#ffefd5',
+      peachpuff:            '#ffdab9',
+      peru:                 '#cd853f',
+      pink:                 '#ffc0cb',
+      plum:                 '#dda0dd',
+      powderblue:           '#b0e0e6',
+      purple:               '#800080',
+      rebeccapurple:        '#663399',
+      red:                  '#ff0000',
+      rosybrown:            '#bc8f8f',
+      royalblue:            '#4169e1',
+      saddlebrown:          '#8b4513',
+      salmon:               '#fa8072',
+      sandybrown:           '#f4a460',
+      seagreen:             '#2e8b57',
+      seashell:             '#fff5ee',
+      sienna:               '#a0522d',
+      silver:               '#c0c0c0',
+      skyblue:              '#87ceeb',
+      slateblue:            '#6a5acd',
+      slategray:            '#708090',
+      slategrey:            '#708090',
+      snow:                 '#fffafa',
+      springgreen:          '#00ff7f',
+      steelblue:            '#4682b4',
+      tan:                  '#d2b48c',
+      teal:                 '#008080',
+      thistle:              '#d8bfd8',
+      tomato:               '#ff6347',
+      turquoise:            '#40e0d0',
+      violet:               '#ee82ee',
+      wheat:                '#f5deb3',
+      white:                '#ffffff',
+      whitesmoke:           '#f5f5f5',
+      yellow:               '#ffff00',
+      yellowgreen:          '#9acd32',
+      none:                 '#00000000',
+    }
+
     # @private
     DEG2RAD__ = Math::PI / 180.0
 
@@ -535,6 +691,15 @@ module Processing
         .then {|r, g, b, a| Image.toColor__ r, g, b, a}
     end
 
+    # @private
+    private def color2raw__(color)
+      Rays::Color.new(
+        ((color >> 16) & 0xff) / 255.0,
+        ((color >> 8)  & 0xff) / 255.0,
+        ( color        & 0xff) / 255.0,
+        ((color >> 24) & 0xff) / 255.0)
+    end
+
     # Returns the red value of the color.
     #
     # @param color [Numeric] color value
@@ -597,7 +762,7 @@ module Processing
     # @see https://p5js.org/reference/#/p5/hue
     #
     def hue(color)
-      h, = toRawColor__(color).to_hsv
+      h, = color2raw__(color).to_hsv
       h * (@hsbColor__ ? @colorMaxes__[0] : 1)
     end
 
@@ -611,7 +776,7 @@ module Processing
     # @see https://p5js.org/reference/#/p5/saturation
     #
     def saturation(color)
-      _, s, = toRawColor__(color).to_hsv
+      _, s, = color2raw__(color).to_hsv
       s * (@hsbColor__ ? @colorMaxes__[1] : 1)
     end
 
@@ -625,36 +790,42 @@ module Processing
     # @see https://p5js.org/reference/#/p5/brightness
     #
     def brightness(color)
-      _, _, b = toRawColor__(color).to_hsv
+      _, _, b = color2raw__(color).to_hsv
       b * (@hsbColor__ ? @colorMaxes__[2] : 1)
     end
 
     # @private
     private def toRGBA__(*args)
-      a, b = args
-      return parseColor__(a, b || alphaMax__) if a.kind_of?(String)
-      rawColor__(*args).to_a
+      toRawColor__(*args).to_a
     end
 
     # @private
-    def rawColor__(*args)
+    def toRawColor__(*args)
       a, b, c, d = args
-      rgba = case args.size
+      return parseColor__(a, b || alphaMax__) if a.is_a?(String) || a.is_a?(Symbol)
+      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
         end
-      rgba = rgba.map.with_index {|value, i| value / @colorMaxes__[i]}
+      rgba = rgba.map.with_index {|n, i| n / @colorMaxes__[i]}
       @hsbColor__ ? Rays::Color.hsv(*rgba) : Rays::Color.new(*rgba)
     end
 
     # @private
     private def parseColor__(str, alpha)
-      result = str.match(/^\s*##{'([0-9a-f]{2})' * 3}\s*$/i)
-      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__)
+      str        = COLOR_CODES[str.downcase.to_sym] || str if str !~ /^\s*#\d+/
+      r, g, b, a =
+        case str
+        when /^\s*##{'([0-9a-f]{2})' * 3}([0-9a-f]{2})?\s*$/i
+          $~[1..4].map {|n| n.to_i(16) / 255.0 if n}
+        when /^\s*##{'([0-9a-f]{1})' * 3}([0-9a-f]{1})?\s*$/i
+          $~[1..4].map {|n| n.to_i(16) / 15.0  if n}
+        else
+          raise ArgumentError, "invalid color code: '#{str}'"
+        end
+      Rays::Color.new(r, g, b, a || (alpha / alphaMax__))
     end
 
     # @private
@@ -662,15 +833,6 @@ module Processing
       @colorMaxes__[3]
     end
 
-    # @private
-    private def toRawColor__(color)
-      Rays::Color.new(
-        ((color >> 16) & 0xff) / 255.0,
-        ((color >> 8)  & 0xff) / 255.0,
-        ( color        & 0xff) / 255.0,
-        ((color >> 24) & 0xff) / 255.0)
-    end
-
     # Sets angle mode.
     #
     # @param mode [RADIANS, DEGREES] RADIANS or DEGREES
@@ -835,11 +997,6 @@ module Processing
       nil
     end
 
-    # @private
-    def getFill__()
-      @painter__.fill
-    end
-
     # Disables filling.
     #
     # @return [nil] nil
@@ -905,8 +1062,9 @@ module Processing
     end
 
     # Sets stroke cap mode.
+    # The default cap if ROUND.
     #
-    # @param cap [BUTT, ROUND, SQUARE]
+    # @param cap [ROUND, SQUARE, PROJECT]
     #
     # @return [nil] nil
     #
@@ -919,8 +1077,9 @@ module Processing
     end
 
     # Sets stroke join mode.
+    # The default join is MITER.
     #
-    # @param join [MITER, ROUND, SQUARE]
+    # @param join [MITER, BEVEL, ROUND]
     #
     # @return [nil] nil
     #
@@ -2288,6 +2447,11 @@ module Processing
       popStyle
     end
 
+    # @private
+    def getPainter__()
+      @painter__
+    end
+
     # @private
     def getInternal__()
       @image__
@@ -3021,19 +3185,19 @@ module Processing
     end
 
     # @private
-    private def createLineShape__(x1, y1, x2, y2)
+    def createLineShape__(x1, y1, x2, y2)
       Shape.new Rays::Polygon.line(x1, y1, x2, y2), context: self
     end
 
     # @private
-    private def createRectShape__(a, b, c, d)
-      x, y, w, h = toXYWH__ @rectMode__, a, b, c, d
-      Shape.new Rays::Polygon.rect(x, y, w, h), context: self
+    def createRectShape__(a, b, c, d, *args, mode: @rectMode__)
+      x, y, w, h = toXYWH__ mode, a, b, c, d
+      Shape.new Rays::Polygon.rect(x, y, w, h, *args), context: self
     end
 
     # @private
-    private def createEllipseShape__(a, b, c, d)
-      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
+    def createEllipseShape__(a, b, c, d, mode: @ellipseMode__)
+      x, y, w, h = toXYWH__ mode, a, b, c, d
       Shape.new Rays::Polygon.ellipse(x, y, w, h), context: self
     end
 
@@ -3174,6 +3338,10 @@ module Processing
       img
     end
 
+    def loadShape(filename)
+      Processing::SVGLoader.new(self).load filename
+    end
+
     # Loads shader file.
     #
     # @overload loadShader(fragPath)

data/lib/processing/image.rb

@@ -214,11 +214,6 @@ module Processing
       raise NotImplementedError
     end
 
-    # @private
-    def setFrame__()
-      raise NotImplementedError
-    end
-
     # @private
     def getCurrentFrame__()
       raise NotImplementedError