processing 0.5.30 → 0.5.31

data/test/test_shape.rb

@@ -0,0 +1,387 @@
+require_relative 'helper'
+
+
+class TestShape < Test::Unit::TestCase
+
+  P = Processing
+  G = P::GraphicsContext
+
+  def createShape(kind = nil, *args, g: graphics)
+    g.createShape kind, *args
+  end
+
+  def vec(*args)
+    P::Vector.new(*args)
+  end
+
+  def test_size()
+    assert_equal [0,  0],  createShape                         .then {|s| [s.w, s.h]}
+    assert_equal [30, 50], createShape(G::RECT, 10, 20, 30, 50).then {|s| [s.w, s.h]}
+    assert_equal [20, 30], createShape(G::LINE, 10, 20, 30, 50).then {|s| [s.w, s.h]}
+  end
+
+  def test_visibility()
+    gfx = graphics 100, 100 do |g|
+      g.background 0
+    end
+    assert_equal 1, get_pixels(gfx).uniq.size
+
+    gfx = graphics 100, 100 do |g|
+      s = createShape G::RECT, 10, 20, 30, 40, g: g
+      assert_true s.isVisible
+      assert_true s.visible?
+
+      g.background 0
+      g.fill 255
+      g.noStroke
+      g.shape s
+    end
+    assert_equal 2, get_pixels(gfx).uniq.size
+
+    gfx = graphics 100, 100 do |g|
+      s = createShape G::RECT, 10, 20, 30, 40, g: g
+      s.setVisible false
+      assert_false s.isVisible
+      assert_false s.visible?
+
+      g.background 0
+      g.fill 255
+      g.noStroke
+      g.shape s
+    end
+    assert_equal 1, get_pixels(gfx).uniq.size
+  end
+
+  def test_beginShape_points()
+    assert_equal_draw_vertices 'strokeWeight 200', <<~END
+      s.beginShape POINTS
+      s.vertex 200, 300
+      s.vertex 500, 600
+      s.endShape
+    END
+  end
+
+  def test_beginShape_lines()
+    assert_equal_draw_vertices 'strokeWeight 200', <<~END
+      s.beginShape LINES
+      s.vertex 100, 200
+      s.vertex 300, 400
+      s.vertex 500, 600
+      s.vertex 700, 800
+      s.endShape
+    END
+  end
+
+  def test_beginShape_triangles()
+    assert_equal_draw_vertices <<~END
+      s.beginShape TRIANGLES
+      s.vertex 100, 100
+      s.vertex 100, 500
+      s.vertex 400, 200
+      s.vertex 500, 100
+      s.vertex 500, 500
+      s.vertex 900, 200
+      s.endShape
+    END
+  end
+
+  def test_beginShape_triangle_fan()
+    assert_equal_draw_vertices <<~END
+      s.beginShape TRIANGLE_FAN
+      s.vertex 100, 100
+      s.vertex 100, 500
+      s.vertex 200, 600
+      s.vertex 300, 500
+      s.vertex 400, 600
+      s.vertex 500, 200
+      s.vertex 400, 100
+      s.endShape
+    END
+  end
+
+  def test_beginShape_triangle_strip()
+    assert_equal_draw_vertices <<~END
+      s.beginShape TRIANGLE_STRIP
+      s.vertex 100, 100
+      s.vertex 100, 900
+      s.vertex 500, 200
+      s.vertex 500, 800
+      s.vertex 900, 100
+      s.vertex 900, 900
+      s.endShape
+    END
+  end
+
+  def test_beginShape_quads()
+    assert_equal_draw_vertices <<~END
+      s.beginShape QUADS
+      s.vertex 100, 100
+      s.vertex 200, 500
+      s.vertex 300, 400
+      s.vertex 400, 200
+      s.vertex 500, 100
+      s.vertex 600, 500
+      s.vertex 700, 400
+      s.vertex 800, 200
+      s.endShape
+    END
+  end
+
+  def test_beginShape_quad_strip()
+    assert_equal_draw_vertices <<~END
+      s.beginShape QUAD_STRIP
+      s.vertex 100, 100
+      s.vertex 100, 500
+      s.vertex 500, 200
+      s.vertex 500, 400
+      s.vertex 900, 100
+      s.vertex 900, 500
+      s.endShape
+    END
+  end
+
+  def test_beginShape_tess()
+    assert_equal_draw_vertices <<~END
+      s.beginShape TESS
+      s.vertex 100, 100
+      s.vertex 100, 500
+      s.vertex 500, 500
+      s.vertex 500, 400
+      s.vertex 300, 400
+      s.vertex 300, 300
+      s.vertex 500, 300
+      s.vertex 500, 100
+      s.endShape
+    END
+  end
+
+  def test_beginShape_polygon()
+    assert_equal_draw_vertices <<~END
+      s.beginShape
+      s.vertex 100, 100
+      s.vertex 100, 500
+      s.vertex 500, 500
+      s.vertex 500, 400
+      s.vertex 300, 400
+      s.vertex 300, 300
+      s.vertex 500, 300
+      s.vertex 500, 100
+      s.endShape
+    END
+  end
+
+  def test_beginShape_twice()
+    first, second = <<~FIRST, <<~SECOND
+      s.vertex 100, 100
+      s.vertex 100, 500
+      s.vertex 400, 500
+      s.vertex 400, 300
+    FIRST
+      s.vertex 500, 300
+      s.vertex 500, 500
+      s.vertex 800, 500
+      s.vertex 800, 100
+    SECOND
+
+    assert_equal_draw <<~EXPECTED, <<~ACTUAL
+      s = self
+      s.beginShape
+      #{first}
+      #{second}
+      s.endShape
+    EXPECTED
+      s = createShape
+      s.beginShape
+      #{first}
+      s.endShape
+      s.beginShape
+      #{second}
+      s.endShape
+      shape s
+    ACTUAL
+
+    assert_equal_draw <<~EXPECTED, <<~ACTUAL
+      s = self
+      s.beginShape
+      #{first}
+      #{second}
+      s.endShape CLOSE
+    EXPECTED
+      s = createShape
+      s.beginShape
+      #{first}
+      s.endShape
+      s.beginShape
+      #{second}
+      s.endShape CLOSE
+      shape s
+    ACTUAL
+
+    assert_equal_draw <<~EXPECTED, <<~ACTUAL
+      s = self
+      s.beginShape
+      #{first}
+      #{second}
+      s.endShape
+    EXPECTED
+      s = createShape
+      s.beginShape TRIANGLES
+      #{first}
+      s.endShape
+      s.beginShape
+      #{second}
+      s.endShape
+      shape s
+    ACTUAL
+  end
+
+  def test_getVertex()
+    s = createShape
+    s.beginShape
+    s.vertex 1, 2
+    s.vertex 3, 4
+    s.vertex 5, 6
+    s.endShape
+
+    assert_equal vec(1, 2), s.getVertex(0)
+    assert_equal vec(3, 4), s.getVertex(1)
+    assert_equal vec(5, 6), s.getVertex(-1)
+    assert_equal vec(3, 4), s.getVertex(-2)
+  end
+
+  def test_setVertex()
+    s = createShape
+    s.beginShape
+    s.vertex 1, 2
+    s.vertex 3, 4
+    s.vertex 5, 6
+    s.endShape
+
+    points = -> do
+      s.getVertexCount.times.map {|i|
+        s.getVertex(i).then {|v| [v.x, v.y]}
+      }.flatten
+    end
+
+    s.setVertex(0, vec(7, 8))
+    assert_equal [7, 8, 3, 4, 5, 6],  points.call
+
+    s.setVertex(-1, vec(9, 10))
+    assert_equal [7, 8, 3, 4, 9, 10], points.call
+  end
+
+  def test_getVertexCount()
+    s = createShape
+    s.beginShape G::TRIANGLES
+    assert_equal 0, s.getVertexCount
+
+    s.vertex 1, 2
+    assert_equal 1, s.getVertexCount
+
+    s.vertex 3, 4
+    assert_equal 2, s.getVertexCount
+
+    s.vertex 5, 6
+    assert_equal 3, s.getVertexCount
+
+    s.endShape
+    assert_equal 3, s.getVertexCount
+  end
+
+  def test_addChild()
+    group = createShape G::GROUP
+    assert_nil group.getChild(0)
+
+    rect = createShape G::RECT, 100, 100, 200, 300
+    group.addChild rect
+    assert_equal 1,    group.getChildCount
+    assert_equal rect, group.getChild(0)
+  end
+
+  def test_addChild_to_non_group_shape()
+    s = createShape
+    assert_equal 0, s.getChildCount
+
+    assert_nothing_raised {
+      s.addChild createShape(G::RECT, 100, 100, 200, 300)
+    }
+    assert_equal 0, s.getChildCount
+  end
+
+  def test_getChildCount()
+    s = createShape G::GROUP
+    assert_equal 0, s.getChildCount
+
+    s.addChild createShape
+    assert_equal 1, s.getChildCount
+
+    s.addChild createShape
+    assert_equal 2, s.getChildCount
+  end
+
+  def test_translate()
+    assert_equal_draw <<~EXPECTED, <<~ACTUAL
+      translate 100, 200
+      rect 0, 0, 300, 400
+    EXPECTED
+      s = createShape RECT, 0, 0, 300, 400
+      s.translate 100, 200
+      shape s
+    ACTUAL
+  end
+
+  def test_rotate()
+    assert_equal_draw <<~EXPECTED, <<~ACTUAL
+      rotate PI / 10
+      rect 100, 200, 300, 400
+    EXPECTED
+      s = createShape RECT, 100, 200, 300, 400
+      s.rotate PI / 10
+      shape s
+    ACTUAL
+  end
+
+  def test_scale()
+    assert_equal_draw <<~EXPECTED, <<~ACTUAL
+      scale 0.5, 0.6
+      rect 100, 200, 300, 400
+    EXPECTED
+      s = createShape RECT, 100, 200, 300, 400
+      s.scale 0.5, 0.6
+      shape s
+    ACTUAL
+  end
+
+  def test_sequential_transformation()
+    assert_equal_draw <<~EXPECTED, <<~ACTUAL
+      translate 100, 200
+      rotate PI / 4
+      scale 0.5, 0.6
+      translate 100, 200
+      rotate(-PI / 4)
+      scale 2, 3
+      rect 0, 0, 300, 400
+    EXPECTED
+      s = createShape RECT, 0, 0, 300, 400
+      s.translate 100, 200
+      s.rotate PI / 4
+      s.scale 0.5, 0.6
+      s.translate 100, 200
+      s.rotate(-PI / 4)
+      s.scale 2, 3
+      shape s
+    ACTUAL
+  end
+
+  def assert_equal_draw_vertices(*shared_header, source)
+    assert_equal_draw(*shared_header, <<~EXPECTED, <<~ACTUAL, label: test_label)
+      s = self
+      #{source}
+    EXPECTED
+      s = createShape
+      #{source}
+      shape s
+    ACTUAL
+  end
+
+end# TestShape

data/test/test_vector.rb

@@ -325,7 +325,7 @@ class TestVector < Test::Unit::TestCase
   def test_rotate()
     angle   = PI * 2 * 0.1
     context = Object.new.tap {|o|
-      def o.toAngle__(a)
+      def o.toDegrees__(a)
         a * 2 * P::GraphicsContext::RAD2DEG__
       end
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: processing
 version: !ruby/object:Gem::Version
-  version: 0.5.30
+  version: 0.5.31
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.40
+        version: 0.1.41
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.41
+        version: 0.1.42
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.46
+        version: 0.1.47
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.46
+        version: 0.1.47
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.54
+        version: 0.1.55
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.54
+        version: 0.1.55
 description: Creative Coding Framework has API compatible to Processing or p5.js.
 email: xordog@gmail.com
 executables: []
@@ -106,20 +106,20 @@ files:
 - lib/processing/graphics_context.rb
 - lib/processing/image.rb
 - lib/processing/shader.rb
+- lib/processing/shape.rb
 - lib/processing/touch.rb
 - lib/processing/vector.rb
 - lib/processing/window.rb
 - processing.gemspec
-- test/draw/helper.rb
-- test/draw/p5.rb
-- test/draw/test_draw.rb
 - test/helper.rb
+- test/p5.rb
 - test/test_capture.rb
 - test/test_font.rb
 - test/test_graphics.rb
 - test/test_graphics_context.rb
 - test/test_image.rb
 - test/test_shader.rb
+- test/test_shape.rb
 - test/test_text_bounds.rb
 - test/test_touch.rb
 - test/test_utility.rb
@@ -148,16 +148,15 @@ signing_key:
 specification_version: 4
 summary: Processing compatible Creative Coding Framework.
 test_files:
-- test/draw/helper.rb
-- test/draw/p5.rb
-- test/draw/test_draw.rb
 - test/helper.rb
+- test/p5.rb
 - test/test_capture.rb
 - test/test_font.rb
 - test/test_graphics.rb
 - test/test_graphics_context.rb
 - test/test_image.rb
 - test/test_shader.rb
+- test/test_shape.rb
 - test/test_text_bounds.rb
 - test/test_touch.rb
 - test/test_utility.rb

data/test/draw/helper.rb

@@ -1,31 +0,0 @@
-require 'digest/md5'
-require 'fileutils'
-
-require_relative '../helper'
-require_relative 'p5'
-
-
-def md5(s)
-  Digest::MD5.hexdigest s
-end
-
-def mkdir(dir: nil, filename: nil)
-  path = dir || File.dirname(filename)
-  FileUtils.mkdir_p path unless File.exist? path
-end
-
-def assert_draw(width = 100, height = 100, draw_src, threshold: 1.0)
-  path    = File.join __dir__, "p5rb", "#{md5(draw_src)}.png"
-  mkdir filename: path
-  density = draw_p5rb width, height, draw_src, path, headless: false
-  gfx     = graphics(width, height, density).tap do |g|
-    g.beginDraw do
-      g.background 0
-      g.fill 255, 0, 0
-      g.noStroke
-      g.instance_eval draw_src
-    end
-  end
-  gfx.save path.sub(/\.png$/, '.actual.png')
-  assert_equal_pixels gfx.loadImage(path), gfx, threshold: threshold
-end

data/test/draw/test_draw.rb

@@ -1,22 +0,0 @@
-require_relative 'helper'
-
-
-class TestDraw < Test::Unit::TestCase
-
-  def test_rect()
-    assert_draw                   'rect 10, 20, 30, 40'
-    assert_draw 'rectMode CORNER;  rect 10, 20, 30, 40'
-    assert_draw 'rectMode CORNERS; rect 10, 20, 30, 50'
-    assert_draw 'rectMode CENTER;  rect 40, 50, 30, 40'
-    assert_draw 'rectMode RADIUS;  rect 40, 50, 30, 40'
-  end
-
-  def test_ellipse()
-    assert_draw                      'ellipse 40, 50, 30, 40', threshold: 0.98
-    assert_draw 'ellipseMode CORNER;  ellipse 10, 20, 30, 40', threshold: 0.98
-    assert_draw 'ellipseMode CORNERS; ellipse 10, 20, 30, 50', threshold: 0.98
-    assert_draw 'ellipseMode CENTER;  ellipse 40, 50, 30, 40', threshold: 0.98
-    assert_draw 'ellipseMode RADIUS;  ellipse 40, 50, 30, 40', threshold: 0.98
-  end
-
-end# TestDraw