processing 0.5.31 → 0.5.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f74daae97a7e307834facbc6eb147a08dbdc731afdb738674161db47eccd04ef
-  data.tar.gz: 41324b1b967f4e3e5c11392ecf1a36beb82f9bbd4a2bb97dbc6d297b572bbe16
+  metadata.gz: f96427cef5e2add31fe4baa3c6055a94bdff9d126d1ae194cd937c24066d4af4
+  data.tar.gz: a4a797bb6246dbb1de3450d6a802ec273553cdf4d5c4b8b2a87e82160f8a22b4
 SHA512:
-  metadata.gz: dace99fcdae4a94a38942d40327fe0e27251e4ea0cb5ba1c1b19683c45a92690124449b61fd47980389730350e8ccda180076e29cf99678a03a2a8408d0be03e
-  data.tar.gz: a60cd201501e210f71ef6c163e0493877e6aed90ecae82c344d6f3e62238fa6091e3d1a17755098a3b7722b56f812fa6aa4ca1aa78de02560264f2fa30c41003
+  metadata.gz: 8d39fcf7857c9ad1b10597811adcb23b04f96f1f78e128ff089b2cd7cd1fe4b851ba0ff235813f8946853d940383ec82568300d9a9914ce028fc9d3622d58b4a
+  data.tar.gz: 226f9d830533ae9f5836ad447bd84de2bb8939d8a5718d1b43c4f66dc073b776c67c7b5c5ccfa421e9271707a9511568b626a9124b6cfaf65dd61ba95fd88af5

data/ChangeLog.md

@@ -1,6 +1,21 @@
 # processing ChangeLog
 
 
+## [v0.5.32] - 2024-01-08
+
+- Add requestImage()
+- Add texture(), textureMode(), and textureWrap()
+- Add loadPixels(), updatePixels(), and pixels()
+- Add curveVertex(), bezierVertex(), and quadraticVertex()
+- Add beginContour() and endContour()
+- Add createFont(), loadFont(), and Font.list()
+- Add Shape#setFill
+
+- vertex() can teke UV parameters
+- vertex() records the fill color
+- Drawing shapes with texture is affected by tin() instead of the fill()
+
+
 ## [v0.5.31] - 2023-12-09
 
 - Add Shape class

data/VERSION

@@ -1 +1 @@
-0.5.31
+0.5.32

data/lib/processing/font.rb

@@ -7,7 +7,8 @@ module Processing
 
     # @private
     def initialize(font)
-      @font = font
+      @font        = font or raise ArgumentError
+      @cachedSizes = {}
     end
 
     # Returns bounding box.
@@ -24,8 +25,8 @@ module Processing
     # @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
+      font = getInternal__ fontSize
+      TextBounds.new x, y, x + font.width(str), y + font.height
     end
 
     # Returns a string containing a human-readable representation of object.
@@ -36,6 +37,32 @@ module Processing
       "#<Processing::Font: name:'#{@font.name}' size:#{@font.size}>"
     end
 
+    # Returns available font names
+    #
+    # @return [String] font names
+    #
+    # @see https://processing.org/reference/PFont_list_.html
+    #
+    def self.list()
+      Rays::Font.families.values.flatten
+    end
+
+    # @private
+    def getInternal__(size = nil)
+      if size
+        @cachedSizes[size.to_f] ||= @font.dup.tap {|font| font.size = size}
+      else
+        @font
+      end
+    end
+
+    # @private
+    def setSize__(size)
+      return if size == @font.size
+      @cachedSizes[@font.size] = @font
+      @font = getInternal__ size
+    end
+
   end# Font
 
 

data/lib/processing/graphics.rb

@@ -38,17 +38,6 @@ module Processing
       endDraw__
     end
 
-    # Saves image to file.
-    #
-    # @param filename [String] file name to save image
-    #
-    # @return [nil] nil
-    #
-    def save(filename)
-      @image__.save filename
-      nil
-    end
-
   end# Graphics
 
 

data/lib/processing/graphics_context.rb

@@ -129,6 +129,18 @@ module Processing
     # Mode for textAlign().
     BASELINE = :baseline
 
+    # Mode for textureMode().
+    IMAGE  = :image
+
+    # Mode for textureMode().
+    NORMAL = :normal
+
+    # Mode for textureWrap().
+    CLAMP  = :clamp
+
+    # Mode for textureWrap().
+    REPEAT = :repeat
+
     # Filter type for filter()
     THRESHOLD = :threshold
 
@@ -247,6 +259,12 @@ module Processing
     # @private
     RAD2DEG__ = 180.0 / Math::PI
 
+    # @private
+    FONT_SIZE_DEFAULT__ = 12
+
+    # @private
+    FONT_SIZE_MAX__     = 256
+
     # @private
     def init__(image, painter)
       @drawing__     = false
@@ -262,11 +280,12 @@ module Processing
       @blendMode__   = nil
       @textAlignH__  = nil
       @textAlignV__  = nil
+      @textFont__    = nil
       @tint__        = nil
       @filter__      = nil
+      @pixels__      = nil
       @matrixStack__ = []
       @styleStack__  = []
-      @fontCache__   = {}
 
       updateCanvas__ image, painter
 
@@ -280,6 +299,9 @@ module Processing
       strokeCap   ROUND
       strokeJoin  MITER
       textAlign   LEFT
+      textFont    createFont(nil, nil)
+      textureMode IMAGE
+      textureWrap CLAMP
 
       fill 255
       stroke 0
@@ -313,7 +335,7 @@ module Processing
     # @return [Numeric] width
     #
     def width()
-      @image__.width
+      getInternal__.width
     end
 
     # Returns the height of the graphics object.
@@ -321,7 +343,7 @@ module Processing
     # @return [Numeric] height
     #
     def height()
-      @image__.height
+      getInternal__.height
     end
 
     # Returns the width of the graphics object in pixels.
@@ -443,17 +465,21 @@ module Processing
 
     # @private
     private def toRGBA__(*args)
-      a, b, c, d = args
+      a, b = args
       return parseColor__(a, b || alphaMax__) if a.kind_of?(String)
+      toRaysColor__(*args).to_a
+    end
 
+    # @private
+    def toRaysColor__(*args)
+      a, b, c, d = args
       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]}
-      color = @hsbColor__ ? Rays::Color.hsv(*rgba) : Rays::Color.new(*rgba)
-      color.to_a
+      rgba = rgba.map.with_index {|value, i| value / @colorMaxes__[i]}
+      @hsbColor__ ? Rays::Color.hsv(*rgba) : Rays::Color.new(*rgba)
     end
 
     # @private
@@ -618,6 +644,11 @@ module Processing
       nil
     end
 
+    # @private
+    def getFill__()
+      @painter__.fill
+    end
+
     # Disables filling.
     #
     # @return [nil] nil
@@ -723,6 +754,11 @@ module Processing
       @tint__ = nil
     end
 
+    # @private
+    def getTint__()
+      @tint__ ? toRGBA__(*@tint__) : 1
+    end
+
     # Limits the drawable rectangle.
     #
     # The parameters a, b, c, and d are determined by rectMode().
@@ -749,7 +785,9 @@ module Processing
       nil
     end
 
-    # Sets font.
+    # Sets text font.
+    #
+    # (Passing a font name as the first parameter is deprecated)
     #
     # @overload textFont(font)
     # @overload textFont(name)
@@ -760,11 +798,18 @@ module Processing
     # @param name [String]  font name
     # @param size [Numeric] font size (max 256)
     #
-    # @return [Font] current font
+    # @return [nil] nil
     #
-    def textFont(font = nil, size = nil)
-      setFont__ font, size if font || size
-      Font.new @painter__.font
+    def textFont(font, size = nil)
+      size = FONT_SIZE_MAX__ if size && size > FONT_SIZE_MAX__
+      if font.nil? || font.kind_of?(String)
+        font = createFont font, size
+      elsif size
+        font.setSize__ size
+      end
+      @textFont__     = font
+      @painter__.font = font.getInternal__
+      nil
     end
 
     # Sets text size.
@@ -774,8 +819,7 @@ module Processing
     # @return [nil] nil
     #
     def textSize(size)
-      setFont__ nil, size
-      nil
+      textFont @textFont__, size
     end
 
     def textWidth(str)
@@ -795,16 +839,46 @@ module Processing
       @textAlignV__ = vertical
     end
 
+    def texture(image)
+      @painter__.texture image&.getInternal__
+      nil
+    end
+
     # @private
-    def setFont__(fontOrName, size)
-      name = case fontOrName
-        when Font then fontOrName.name
-        else fontOrName || @painter__.font.name
-        end
-      size ||= @painter__.font.size
-      size = 256 if size > 256
-      font = @fontCache__[[name, size]] ||= Rays::Font.new name, size
-      @painter__.font = font
+    def drawWithTexture__(&block)
+      if @painter__.texture
+        @painter__.push fill: getTint__, &block
+      else
+        block.call
+      end
+    end
+
+    # Sets the coordinate space for texture mapping.
+    #
+    # @param mode [IMAGE, NORMAL] image coordinate, or normalized coordinate
+    #
+    # @return [nil] nil
+    #
+    # @see https://processing.org/reference/textureMode_.html
+    # @see https://p5js.org/reference/#/p5/textureMode
+    #
+    def textureMode(mode)
+      @painter__.texcoord_mode = mode
+      nil
+    end
+
+    # Sets the texture wrapping mode.
+    #
+    # @param wrap [CLAMP, REPEAT] how texutres behave when go outside of the range
+    #
+    # @return [nil] nil
+    #
+    # @see https://processing.org/reference/textureWrap_.html
+    # @see https://p5js.org/reference/#/p5/textureWrap
+    #
+    def textureWrap(wrap)
+      @painter__.texcoord_wrap = wrap
+      nil
     end
 
     # Sets shader.
@@ -1156,8 +1230,7 @@ module Processing
     def image(img, a, b, c = nil, d = nil)
       assertDrawing__
       x, y, w, h = toXYWH__ @imageMode__, a, b, c || img.width, d || img.height
-      tint       = @tint__ ? toRGBA__(*@tint__) : 1
-      img.drawImage__ @painter__, x, y, w, h, fill: tint, stroke: :none
+      img.drawImage__ @painter__, x, y, w, h, fill: getTint__, stroke: :none
       nil
     end
 
@@ -1182,11 +1255,13 @@ module Processing
       assertDrawing__
       return nil unless shp.isVisible
 
-      if c || d || @shapeMode__ != CORNER
-        x, y, w, h = toXYWH__ @shapeMode__, a, b, c || shp.width, d || shp.height
-        shp.draw__ @painter__, x, y, w, h
-      else
-        shp.draw__ @painter__, a, b
+      drawWithTexture__ do |_|
+        if c || d || @shapeMode__ != CORNER
+          x, y, w, h = toXYWH__ @shapeMode__, a, b, c || shp.width, d || shp.height
+          shp.draw__ @painter__, x, y, w, h
+        else
+          shp.draw__ @painter__, a, b
+        end
       end
       nil
     end
@@ -1195,7 +1270,7 @@ module Processing
 
     # Begins drawing complex shapes.
     #
-    # @param mode [POINTS, LINES, TRIANGLES, TRIANGLE_FAN, TRIANGLE_STRIP, QUADS, QUAD_STRIP, TESS]
+    # @param type [POINTS, LINES, TRIANGLES, TRIANGLE_FAN, TRIANGLE_STRIP, QUADS, QUAD_STRIP, TESS]
     #
     # @return [nil] nil
     #
@@ -1217,9 +1292,10 @@ module Processing
     #
     # @see https://processing.org/reference/beginShape_.html
     #
-    def beginShape(mode = nil)
-      @shapeMode__, @shapePoints__ = mode, []
-      nil
+    def beginShape(type = nil)
+      raise "beginShape() cannot be called twice" if @drawingShape__
+      @drawingShape__ = createShape
+      @drawingShape__.beginShape type
     end
 
     # Ends drawing complex shapes.
@@ -1234,25 +1310,114 @@ module Processing
     # @see https://processing.org/reference/endShape_.html
     #
     def endShape(mode = nil)
-      raise "endShape() must be called after beginShape()" unless @shapePoints__
-      polygon = Shape.createPolygon__ @shapeMode__, @shapePoints__, mode == CLOSE
-      @painter__.polygon polygon if polygon
-      @shapeMode__ = @shapePoints__ = nil
+      s = @drawingShape__ or raise "endShape() must be called after beginShape()"
+      s.endShape mode
+      shape s
+      @drawingShape__ = nil
       nil
     end
 
+    # Begins drawing a hole inside shape.
+    #
+    # @return [nil] nil
+    #
+    # @example
+    #  beginShape
+    #  vertex 10, 10
+    #  vertex 10, 50
+    #  vertex 50, 50
+    #  vertex 90, 10
+    #  beginContour
+    #  vertex 20, 20
+    #  vertex 30, 20
+    #  vertex 30, 30
+    #  vertex 20, 30
+    #  endContour
+    #  endShape CLOSE
+    #
+    # @see https://processing.org/reference/beginContour_.html
+    # @see https://p5js.org/reference/#/p5/beginContour
+    #
+    def beginContour()
+      (@drawingShape__ or raise "beginContour() must be called after beginShape()")
+        .beginContour
+    end
+
+    # Ends drawing a hole.
+    #
+    # @return [nil] nil
+    #
+    # @see https://processing.org/reference/endContour_.html
+    # @see https://p5js.org/reference/#/p5/endContour
+    #
+    def endContour()
+      (@drawingShape__ or raise "endContour() must be called after beginShape()")
+        .endContour
+    end
+
     # Append vertex for shape polygon.
     #
+    # @overload vertex(x, y)
+    # @overload vertex(x, y, u, v)
+    #
     # @param x [Numeric] x position of vertex
     # @param y [Numeric] y position of vertex
+    # @param u [Numeric] u texture coordinate of vertex
+    # @param v [Numeric] v texture coordinate of vertex
     #
     # @return [nil] nil
     #
     # @see https://processing.org/reference/vertex_.html
+    # @see https://p5js.org/reference/#/p5/vertex
+    #
+    def vertex(x, y, u = nil, v = nil)
+      (@drawingShape__ or raise "vertex() must be called after beginShape()")
+        .vertex x, y, u, v
+    end
+
+    # Append curve vertex for shape polygon.
+    #
+    # @param x [Numeric] x position of vertex
+    # @param y [Numeric] y position of vertex
+    #
+    # @return [nil] nil
+    #
+    # @see https://processing.org/reference/curveVertex_.html
+    # @see https://p5js.org/reference/#/p5/curveVertex
+    #
+    def curveVertex(x, y)
+      (@drawingShape__ or raise "curveVertex() must be called after beginShape()")
+        .curveVertex x, y
+    end
+
+    # Append bezier vertex for shape polygon.
+    #
+    # @param x [Numeric] x position of vertex
+    # @param y [Numeric] y position of vertex
     #
-    def vertex(x, y)
-      raise "vertex() must be called after beginShape()" unless @shapePoints__
-      @shapePoints__ << x << y
+    # @return [nil] nil
+    #
+    # @see https://processing.org/reference/bezierVertex_.html
+    # @see https://p5js.org/reference/#/p5/bezierVertex
+    #
+    def bezierVertex(x2, y2, x3, y3, x4, y4)
+      (@drawingShape__ or raise "bezierVertex() must be called after beginShape()")
+        .bezierVertex x2, y2, x3, y3, x4, y4
+    end
+
+    # Append quadratic vertex for shape polygon.
+    #
+    # @param x [Numeric] x position of vertex
+    # @param y [Numeric] y position of vertex
+    #
+    # @return [nil] nil
+    #
+    # @see https://processing.org/reference/quadraticVertex_.html
+    # @see https://p5js.org/reference/#/p5/quadraticVertex
+    #
+    def quadraticVertex(cx, cy, x3, y3)
+      (@drawingShape__ or raise "quadraticVertex() must be called after beginShape()")
+        .quadraticVertex cx, cy, x3, y3
     end
 
     # Copies image.
@@ -1296,11 +1461,34 @@ module Processing
     #
     def blend(img = nil, sx, sy, sw, sh, dx, dy, dw, dh, mode)
       assertDrawing__
-      tint  = @tint__ ? toRGBA__(*@tint__) : 1
-      img ||= self
-      img.drawImage__(
+      (img || self).drawImage__(
         @painter__, sx, sy, sw, sh, dx, dy, dw, dh,
-        fill: tint, stroke: :none, blend_mode: mode)
+        fill: getTint__, stroke: :none, blend_mode: mode)
+    end
+
+    # Loads all pixels to the 'pixels' array.
+    #
+    # @return [nil] nil
+    #
+    def loadPixels()
+      @pixels__ = getInternal__.pixels
+    end
+
+    # Update the image pixels with the 'pixels' array.
+    #
+    # @return [nil] nil
+    #
+    def updatePixels()
+      return unless @pixels__
+      getInternal__.pixels = @pixels__
+      @pixels__ = nil
+    end
+
+    # An array of all pixels.
+    # Call loadPixels() before accessing the array.
+    #
+    def pixels()
+      @pixels__
     end
 
     # Saves screen image to file.
@@ -1310,7 +1498,7 @@ module Processing
     # @return [nil] nil
     #
     def save(filename)
-      @window__.canvas_image.save filename
+      getInternal__.save filename
       nil
     end
 
@@ -1408,6 +1596,9 @@ module Processing
         @painter__.clip,
         @painter__.blend_mode,
         @painter__.font,
+        @painter__.texture,
+        @painter__.texcoord_mode,
+        @painter__.texcoord_wrap,
         @painter__.shader,
         @hsbColor__,
         @colorMaxes__,
@@ -1418,6 +1609,7 @@ module Processing
         @shapeMode__,
         @textAlignH__,
         @textAlignV__,
+        @textFont__,
         @tint__,
       ]
       block.call if block
@@ -1440,6 +1632,9 @@ module Processing
       @painter__.clip,
       @painter__.blend_mode,
       @painter__.font,
+      @painter__.texture,
+      @painter__.texcoord_mode,
+      @painter__.texcoord_wrap,
       @painter__.shader,
       @hsbColor__,
       @colorMaxes__,
@@ -1450,7 +1645,9 @@ module Processing
       @shapeMode__,
       @textAlignH__,
       @textAlignV__,
+      @textFont__,
       @tint__ = @styleStack__.pop
+      @textFont__.setSize__ @painter__.font.size
       nil
     end
 
@@ -1862,7 +2059,7 @@ module Processing
       rand (low || 0).to_f...(high || 1).to_f
     end
 
-    # Creates a new vector.
+    # Creates a new vector object.
     #
     # @overload createVector()
     # @overload createVector(x, y)
@@ -1878,7 +2075,17 @@ module Processing
       Vector.new(*args, context: self)
     end
 
-    # Creates a new image.
+    # Creates a new font object.
+    #
+    # @param name [String]  font name
+    # @param size [Numeric] font size (max 256)
+    #
+    def createFont(name, size)
+      size = FONT_SIZE_MAX__ if size && size > FONT_SIZE_MAX__
+      Font.new Rays::Font.new(name, size || FONT_SIZE_DEFAULT__)
+    end
+
+    # Creates a new image object.
     #
     # @overload createImage(w, h)
     # @overload createImage(w, h, format)
@@ -1895,7 +2102,7 @@ module Processing
       Image.new Rays::Image.new(w, h, colorspace).paint {background 0, 0}
     end
 
-    # Creates a new shape.
+    # Creates a new shape object.
     #
     # @overload createShape()
     # @overload createShape(LINE, x1, y1, x2, y2)
@@ -1924,7 +2131,7 @@ module Processing
 
     # @private
     private def createLineShape__(x1, y1, x2, y2)
-      Shape.new Rays::Polygon.lines(x1, y1, x2, y2), context: self
+      Shape.new Rays::Polygon.line(x1, y1, x2, y2), context: self
     end
 
     # @private
@@ -2014,6 +2221,23 @@ module Processing
       Capture.new(*args)
     end
 
+    # Loads font from file.
+    #
+    # @param filename  [String] file name to load font file
+    #
+    # @return [Font] loaded font object
+    #
+    # @see https://processing.org/reference/loadFont_.html
+    # @see https://p5js.org/reference/#/p5/loadFont
+    #
+    def loadFont(filename)
+      ext = File.extname filename
+      raise "unsupported font type -- '#{ext}'" unless ext =~ /^\.?(ttf|otf)$/i
+
+      filename = httpGet__ filename, ext if filename =~ %r|^https?://|
+      Font.new Rays::Font.load p filename
+    end
+
     # Loads image.
     #
     # @param filename  [String] file name to load image
@@ -2021,11 +2245,39 @@ module Processing
     #
     # @return [Image] loaded image object
     #
+    # @see https://processing.org/reference/loadImage_.html
+    # @see https://p5js.org/reference/#/p5/loadImage
+    #
     def loadImage(filename, extension = nil)
-      filename = getImage__ filename, extension if filename =~ %r|^https?://|
+      ext = extension || File.extname(filename)
+      raise "unsupported image type -- '#{ext}'" unless ext =~ /^\.?(png|jpg|gif)$/i
+
+      filename = httpGet__ filename, ext if filename =~ %r|^https?://|
       Image.new Rays::Image.load filename
     end
 
+    # Loads image on a new thread.
+    # When the image is loading, its width and height will be 0.
+    # If an error occurs while loading the image, its width and height wil be -1.
+    #
+    # @param filename  [String] file name to load image
+    # @param extension [String] type of image to load (ex. 'png')
+    #
+    # @return [Image] loading image object
+    #
+    # @see https://processing.org/reference/requestImage_.html
+    #
+    def requestImage(filename, extension = nil)
+      img = Image.new nil
+      Thread.new filename, extension do |fn, ext|
+        loaded = loadImage(fn, ext) or raise
+        img.setInternal__ loaded.getInternal__
+      rescue
+        img.setInternal__ nil, true
+      end
+      img
+    end
+
     # Loads shader file.
     #
     # @overload loadShader(fragPath)
@@ -2041,10 +2293,7 @@ module Processing
     end
 
     # @private
-    private def getImage__(uri, ext)
-      ext ||= File.extname uri
-      raise "unsupported image type -- #{ext}" unless ext =~ /^\.?(png|jpg|gif)$/i
-
+    private def httpGet__(uri, ext)
       tmpdir = tmpdir__
       path   = tmpdir + Digest::SHA1.hexdigest(uri)
       path   = path.sub_ext ext