processing 0.5.30 → 0.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca6d65b8e9bd003c16fabbf550a70f20f0adf70ea623d1abe01ec1b967b88fa0
-  data.tar.gz: e4f689b826f7854a4da0bf9b52c6368c27ef02179ae98e15e0995b452eafc096
+  metadata.gz: f74daae97a7e307834facbc6eb147a08dbdc731afdb738674161db47eccd04ef
+  data.tar.gz: 41324b1b967f4e3e5c11392ecf1a36beb82f9bbd4a2bb97dbc6d297b572bbe16
 SHA512:
-  metadata.gz: f74584e4c313f4c95ce326ccadd8fa20e59dba80a2b4598f083c7dd5f2041950b8f3d69f0ca34c7fc3021d5b704f26170879587d19d375bb499e244577d529e3
-  data.tar.gz: a38786a6783135f58ffd9a81edf929f5ba8d020dbd12fc06faa85cc6d36dc95c682249cccea600a823faee81e03b86eb3ffff2ca766704a520f867294cf51ae8
+  metadata.gz: dace99fcdae4a94a38942d40327fe0e27251e4ea0cb5ba1c1b19683c45a92690124449b61fd47980389730350e8ccda180076e29cf99678a03a2a8408d0be03e
+  data.tar.gz: a60cd201501e210f71ef6c163e0493877e6aed90ecae82c344d6f3e62238fa6091e3d1a17755098a3b7722b56f812fa6aa4ca1aa78de02560264f2fa30c41003

data/.github/workflows/test-draw.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [master]
   pull_request:
-    branches: [master]
 
 jobs:
   test:

data/.github/workflows/test.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [master]
   pull_request:
-    branches: [master]
 
 jobs:
   test:

data/ChangeLog.md

@@ -1,6 +1,17 @@
 # processing ChangeLog
 
 
+## [v0.5.31] - 2023-12-09
+
+- Add Shape class
+- Add createShape(), shape(), shapeMode()
+- Add beginShape(), endShape(), and vertex(x, y)
+- Test with p5.rb
+- GraphicsContext#rotate() can take z parameter
+- Set default miter_limit to 10
+- Trigger github actions on all pull_request
+
+
 ## [v0.5.30] - 2023-11-09
 
 - Test drawing methods with p5.rb

data/Rakefile

@@ -14,12 +14,16 @@ require 'reflex/extension'
 require 'processing/extension'
 
 
-EXTENSIONS    = [Xot, Rucy, Rays, Reflex, Processing]
-DRAW_TESTS    = Dir.glob('test/draw/test_*.rb')
-TESTS_EXCLUDE = DRAW_TESTS
+def test_with_p5()
+  ENV['TEST_WITH_P5'] = '1'
+end
+
+EXTENSIONS = [Xot, Rucy, Rays, Reflex, Processing]
 
 ENV['RDOC'] = 'yardoc --no-private'
 
+#test_with_p5 if ci?
+
 default_tasks
 use_bundler
 test_ruby_extension
@@ -30,10 +34,14 @@ task :clean => 'test:clean'
 
 namespace :test do
   task :clean do
-    sh %( rm -rf test/draw/p5rb )
+    sh %( rm -rf test/.png/*.png )
+  end
+
+  task :with_p5 do
+    test_with_p5
   end
 
-  task :draw do
-    sh %( ruby #{DRAW_TESTS.join ' '} )
+  ::Rake::TestTask.new :draw do |t|
+    t.test_files = FileList['test/test_*.rb']
   end
 end

data/VERSION

@@ -1 +1 @@
-0.5.30
+0.5.31

data/lib/processing/all.rb

@@ -14,6 +14,7 @@ require 'processing/vector'
 require 'processing/image'
 require 'processing/font'
 require 'processing/touch'
+require 'processing/shape'
 require 'processing/shader'
 require 'processing/capture'
 require 'processing/graphics_context'

data/lib/processing/graphics_context.rb

@@ -45,15 +45,16 @@ module Processing
     #
     DEGREES = :degrees
 
-    # Mode for rectMode(), ellipseMode() and imageMode().
+    # Mode for rectMode(), ellipseMode(), imageMode(), and shapeMode().
     #
     CORNER  = :corner
 
-    # Mode for rectMode(), ellipseMode() and imageMode().
+    # Mode for rectMode(), ellipseMode(), imageMode(), and shapeMode().
     #
     CORNERS = :corners
 
-    # Mode for rectMode(), ellipseMode(), imageMode() and textAlign().
+    # Mode for rectMode(), ellipseMode(), imageMode(), shapeMode(),
+    # and textAlign().
     #
     CENTER  = :center
 
@@ -140,6 +141,57 @@ module Processing
     # Filter type for filter()
     BLUR      = :blur
 
+    # Shape mode for createShape()
+    LINE     = :line
+
+    # Shape mode for createShape()
+    RECT     = :rect
+
+    # Shape mode for createShape()
+    ELLIPSE  = :ellipse
+
+    # Shape mode for createShape()
+    ARC      = :arc
+
+    # Shape mode for createShape()
+    TRIANGLE = :triangle
+
+    # Shape mode for createShape()
+    QUAD     = :quad
+
+    # Shape mode for createShape()
+    GROUP    = :group
+
+    # Shape mode for beginShape()
+    POINTS         = :points
+
+    # Shape mode for beginShape()
+    LINES          = :lines
+
+    # Shape mode for beginShape()
+    TRIANGLES      = :triangles
+
+    # Shape mode for beginShape()
+    TRIANGLE_FAN   = :triangle_fan
+
+    # Shape mode for beginShape()
+    TRIANGLE_STRIP = :triangle_strip
+
+    # Shape mode for beginShape()
+    QUADS          = :quads
+
+    # Shape mode for beginShape()
+    QUAD_STRIP     = :quad_strip
+
+    # Shape mode for beginShape()
+    TESS           = :tess
+
+    # OPEN flag for endShape()
+    OPEN           = :open
+
+    # CLOSE flag for endShape()
+    CLOSE          = :close
+
     # Key codes.
     ENTER     = :enter
     SPACE     = :space
@@ -206,6 +258,7 @@ module Processing
       @rectMode__    = nil
       @ellipseMode__ = nil
       @imageMode__   = nil
+      @shapeMode__   = nil
       @blendMode__   = nil
       @textAlignH__  = nil
       @textAlignV__  = nil
@@ -222,6 +275,7 @@ module Processing
       rectMode    CORNER
       ellipseMode CENTER
       imageMode   CORNER
+      shapeMode   CORNER
       blendMode   BLEND
       strokeCap   ROUND
       strokeJoin  MITER
@@ -235,7 +289,9 @@ module Processing
 
     # @private
     def updateCanvas__(image, painter)
-      @image__, @painter__ = image, painter
+      @image__, @painter__     = image, painter
+      @painter__.miter_limit   = 10
+      @painter__.stroke_outset = 0.5
     end
 
     # @private
@@ -434,7 +490,7 @@ module Processing
     end
 
     # @private
-    def toAngle__(angle)
+    def toDegrees__(angle)
       angle * @angleScale__
     end
 
@@ -460,8 +516,8 @@ module Processing
     #
     # 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)
+    # CENTER  -> rect(centerX, centerY, width, height)
+    # RADIUS  -> rect(centerX, centerY, radiusH, radiusV)
     #
     # @param mode [CORNER, CORNERS, CENTER, RADIUS]
     #
@@ -475,8 +531,8 @@ module Processing
     #
     # 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)
+    # CENTER  -> ellipse(centerX, centerY, width, height)
+    # RADIUS  -> ellipse(centerX, centerY, radiusH, radiusV)
     #
     # @param mode [CORNER, CORNERS, CENTER, RADIUS]
     #
@@ -490,7 +546,7 @@ module Processing
     #
     # CORNER  -> image(img, left, top, width, height)
     # CORNERS -> image(img, left, top, right, bottom)
-    # CENTER  -> image(img, center_x, center_y, width, height)
+    # CENTER  -> image(img, centerX, centerY, width, height)
     #
     # @param mode [CORNER, CORNERS, CENTER]
     #
@@ -500,6 +556,20 @@ module Processing
       @imageMode__ = mode
     end
 
+    # Sets shape mode. Default is CORNER.
+    #
+    # CORNER  -> shape(shp, left, top, width, height)
+    # CORNERS -> shape(shp, left, top, right, bottom)
+    # CENTER  -> shape(shp, centerX, centerY, width, height)
+    #
+    # @param mode [CORNER, CORNERS, CENTER]
+    #
+    # @return [nil] nil
+    #
+    def shapeMode(mode)
+      @shapeMode__ = mode
+    end
+
     # @private
     private def toXYWH__(mode, a, b, c, d)
       case mode
@@ -924,9 +994,8 @@ module Processing
     def arc(a, b, c, d, start, stop)
       assertDrawing__
       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
+      from, to   = toDegrees__(-start), toDegrees__(-stop)
+      @painter__.ellipse x, y, w, h, from: from, to: to
       nil
     end
 
@@ -1094,6 +1163,98 @@ module Processing
 
     alias drawImage image
 
+    # Draws a shape.
+    #
+    # The parameters a, b, c, and d are determined by shapeMode().
+    #
+    # @overload shape(img, a, b)
+    # @overload shape(img, a, b, c, d)
+    #
+    # @param shp [Shape] shape to draw
+    # @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
+    #
+    # @return [nil] nil
+    #
+    def shape(shp, a = 0, b = 0, c = nil, d = nil)
+      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
+      end
+      nil
+    end
+
+    alias drawShape shape
+
+    # Begins drawing complex shapes.
+    #
+    # @param mode [POINTS, LINES, TRIANGLES, TRIANGLE_FAN, TRIANGLE_STRIP, QUADS, QUAD_STRIP, TESS]
+    #
+    # @return [nil] nil
+    #
+    # @example
+    #  # Draws polygon
+    #  beginShape
+    #  vertex 10, 10
+    #  vertex 10, 50
+    #  vertex 50, 50
+    #  vertex 90, 10
+    #  endShape CLOSE
+    #
+    #  # Draws triangles
+    #  beginShape TRIANGLES
+    #  vertex 10, 10
+    #  vertex 10, 50
+    #  vertex 50, 50
+    #  endShape
+    #
+    # @see https://processing.org/reference/beginShape_.html
+    #
+    def beginShape(mode = nil)
+      @shapeMode__, @shapePoints__ = mode, []
+      nil
+    end
+
+    # Ends drawing complex shapes.
+    #
+    # @overload endShape()
+    # @overload endShape(CLOSE)
+    #
+    # @param mode [CLOSE] Use CLOSE to create looped polygon
+    #
+    # @return [nil] nil
+    #
+    # @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
+      nil
+    end
+
+    # Append 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/vertex_.html
+    #
+    def vertex(x, y)
+      raise "vertex() must be called after beginShape()" unless @shapePoints__
+      @shapePoints__ << x << y
+    end
+
     # Copies image.
     #
     # @overload copy(sx, sy, sw, sh, dx, dy, dw, dh)
@@ -1181,9 +1342,9 @@ module Processing
     #
     # @return [nil] nil
     #
-    def scale(x, y)
+    def scale(x, y = nil, z = 1)
       assertDrawing__
-      @painter__.scale x, y
+      @painter__.scale x, (y || x), z
       nil
     end
 
@@ -1195,7 +1356,7 @@ module Processing
     #
     def rotate(angle)
       assertDrawing__
-      @painter__.rotate toAngle__ angle
+      @painter__.rotate toDegrees__ angle
       nil
     end
 
@@ -1254,6 +1415,7 @@ module Processing
         @rectMode__,
         @ellipseMode__,
         @imageMode__,
+        @shapeMode__,
         @textAlignH__,
         @textAlignV__,
         @tint__,
@@ -1285,6 +1447,7 @@ module Processing
       @rectMode__,
       @ellipseMode__,
       @imageMode__,
+      @shapeMode__,
       @textAlignH__,
       @textAlignV__,
       @tint__ = @styleStack__.pop
@@ -1732,6 +1895,67 @@ module Processing
       Image.new Rays::Image.new(w, h, colorspace).paint {background 0, 0}
     end
 
+    # Creates a new shape.
+    #
+    # @overload createShape()
+    # @overload createShape(LINE, x1, y1, x2, y2)
+    # @overload createShape(RECT, a, b, c, d)
+    # @overload createShape(ELLIPSE, a, b, c, d)
+    # @overload createShape(ARC, a, b, c, d, start, stop)
+    # @overload createShape(TRIANGLE, x1, y1, x2, y2, x3, y3)
+    # @overload createShape(QUAD, x1, y1, x2, y2, x3, y3, x4, y4)
+    # @overload createShape(GROUP)
+    #
+    # @param kind [LINE, RECT, ELLIPSE, ARC, TRIANGLE, QUAD, GROUP]
+    #
+    def createShape(kind = nil, *args)
+      case kind
+      when LINE     then createLineShape__(    *args)
+      when RECT     then createRectShape__(    *args)
+      when ELLIPSE  then createEllipseShape__( *args)
+      when ARC      then createArcShape__(     *args)
+      when TRIANGLE then createTriangleShape__(*args)
+      when QUAD     then createQuadShape__(    *args)
+      when GROUP    then Shape.new nil, [], context: self
+      when nil      then Shape.new context: self
+      else raise ArgumentError, "Unknown shape kind '#{kind}'"
+      end
+    end
+
+    # @private
+    private def createLineShape__(x1, y1, x2, y2)
+      Shape.new Rays::Polygon.lines(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
+    end
+
+    # @private
+    private def createEllipseShape__(a, b, c, d)
+      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
+      Shape.new Rays::Polygon.ellipse(x, y, w, h), context: self
+    end
+
+    # @private
+    private def createArcShape__(a, b, c, d, start, stop)
+      x, y, w, h = toXYWH__ @ellipseMode__, a, b, c, d
+      from, to   = toDegrees__(-start), toDegrees__(-stop)
+      Shape.new Rays::Polygon.ellipse(x, y, w, h, from: from, to: to), context: self
+    end
+
+    # @private
+    private def createTriangleShape__(x1, y1, x2, y2, x3, y3)
+      Shape.new Rays::Polygon.new(x1, y1, x2, y2, x3, y3, loop: true), context: self
+    end
+
+    # @private
+    private def createQuadShape__(x1, y1, x2, y2, x3, y3, x4, y4)
+      Shape.new Rays::Polygon.quads(x1, y1, x2, y2, x3, y3, x4, y4), context: self
+    end
+
     # Creates a new off-screen graphics context object.
     #
     # @param width        [Numeric] width of graphics image

data/lib/processing/shape.rb

@@ -0,0 +1,183 @@
+module Processing
+
+
+  # Shape object.
+  #
+  class Shape
+
+    # @private
+    def initialize(polygon = nil, children = nil, context: nil)
+      @polygon, @children = polygon, children
+      @context            = context || Context.context__
+      @visible, @matrix   = true, nil
+      @mode = @points = @closed = nil
+    end
+
+    # Gets width of shape.
+    #
+    # @return [Numeric] width of shape
+    #
+    def width()
+      polygon = getInternal__ or return 0
+      (@bounds ||= polygon.bounds).width
+    end
+
+    # Gets height of shape.
+    #
+    # @return [Numeric] height of shape
+    #
+    def height()
+      polygon = getInternal__ or return 0
+      (@bounds ||= polygon.bounds).height
+    end
+
+    alias w width
+    alias h height
+
+    # Returns whether the shape is visible or not.
+    #
+    # @return [Boolean] visible or not
+    #
+    def isVisible()
+      @visible
+    end
+
+    alias visible? isVisible
+
+    # Sets whether to display the shape or not.
+    #
+    # @return [nil] nil
+    #
+    def setVisible(visible)
+      @visible = !!visible
+      nil
+    end
+
+    def beginShape(mode = nil)
+      @mode     = mode
+      @points ||= []
+      @polygon  = nil# clear cache
+      nil
+    end
+
+    def endShape(close = nil)
+      raise "endShape() must be called after beginShape()" unless @points
+      @closed = close == GraphicsContext::CLOSE
+      nil
+    end
+
+    def vertex(x, y)
+      raise "vertex() must be called after beginShape()" unless @points
+      @points << x << y
+    end
+
+    def setVertex(index, point)
+      return nil unless @points && @points[index * 2, 2]&.size == 2
+      @points[index * 2, 2] = [point.x, point.y]
+    end
+
+    def getVertex(index)
+      return nil unless @points
+      point = @points[index * 2, 2]
+      return nil unless point&.size == 2
+      @context.createVector(*point)
+    end
+
+    def getVertexCount()
+      return 0 unless @points
+      @points.size / 2
+    end
+
+    def addChild(child)
+      return unless @children
+      @children.push child
+      nil
+    end
+
+    def getChild(index)
+      @children&.[](index)
+    end
+
+    def getChildCount()
+      @children&.size || 0
+    end
+
+    def translate(x, y, z = 0)
+      matrix__.translate x, y, z
+      nil
+    end
+
+    def rotate(angle)
+      matrix__.rotate @context.toDegrees__(angle)
+      nil
+    end
+
+    def scale(x, y, z = 1)
+      matrix__.scale x, y, z
+      nil
+    end
+
+    def resetMatrix()
+      @matrix = nil
+    end
+
+    def rotateX = nil
+    def rotateY = nil
+    def rotateZ = nil
+
+    # @private
+    def matrix__()
+      @matrix ||= Rays::Matrix.new
+    end
+
+    # @private
+    def getInternal__()
+      unless @polygon
+        return nil unless @points && @closed != nil
+        @polygon = self.class.createPolygon__ @mode, @points, @closed
+      end
+      @polygon
+    end
+
+    # @private
+    def draw__(painter, x, y, w = nil, h = nil)
+      poly = getInternal__
+
+      backup = nil
+      if @matrix && (poly || @children)
+        backup = painter.matrix
+        painter.matrix = backup * @matrix
+      end
+
+      if poly
+        if w || h
+          painter.polygon poly, x, y, w,h
+        else
+          painter.polygon poly, x, y
+        end
+      end
+      @children&.each {|o| o.draw__ painter, x, y, w, h}
+
+      painter.matrix = backup if backup
+    end
+
+    # @private
+    def self.createPolygon__(mode, points, close = false)
+      g = GraphicsContext
+      case mode
+      when g::POINTS         then Rays::Polygon.points(        *points)
+      when g::LINES          then Rays::Polygon.lines(         *points)
+      when g::TRIANGLES      then Rays::Polygon.triangles(     *points)
+      when g::TRIANGLE_FAN   then Rays::Polygon.triangle_fan(  *points)
+      when g::TRIANGLE_STRIP then Rays::Polygon.triangle_strip(*points)
+      when g::QUADS          then Rays::Polygon.quads(         *points)
+      when g::QUAD_STRIP     then Rays::Polygon.quad_strip(    *points)
+      when g::TESS, nil      then Rays::Polygon.new(*points, loop: close)
+      else raise ArgumentError, "invalid polygon mode '#{mode}'"
+      end
+    end
+
+  end# Shape
+
+
+end# Processing

data/lib/processing/vector.rb

@@ -463,9 +463,9 @@ module Processing
     # @return [Vector] rotated this object
     #
     def rotate(angle)
-      angle = @context ?
-        @context.toAngle__(angle) : angle * GraphicsContext::RAD2DEG__
-      @point.rotate! angle
+      deg = @context ?
+        @context.toDegrees__(angle) : angle * GraphicsContext::RAD2DEG__
+      @point.rotate! deg
       self
     end
 

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.40'
-  s.add_runtime_dependency 'rucy',      '~> 0.1.41'
-  s.add_runtime_dependency 'rays',      '~> 0.1.46'
-  s.add_runtime_dependency 'reflexion', '~> 0.1.54'
+  s.add_runtime_dependency 'xot',       '~> 0.1.41'
+  s.add_runtime_dependency 'rucy',      '~> 0.1.42'
+  s.add_runtime_dependency 'rays',      '~> 0.1.47'
+  s.add_runtime_dependency 'reflexion', '~> 0.1.55'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}