rays 0.1.14 → 0.1.15

data/src/polyline.cpp

@@ -89,9 +89,11 @@ namespace Rays
 	}
 
 	bool
-	Polyline::expand (Polygon* result, coord width) const
+	Polyline::expand (
+		Polygon* result,
+		coord width, CapType cap, JoinType join, coord miter_limit) const
 	{
-		return Polyline_expand(result, *this, width);
+		return Polyline_expand(result, *this, width, cap, join, miter_limit);
 	}
 
 	Bounds

data/src/polyline.h

@@ -58,7 +58,9 @@ namespace Rays
 		ClipperLib::Path* path, const Polyline& polyline,
 		bool reverse = false);
 
-	bool Polyline_expand (Polygon* result, const Polyline& polyline, coord width);
+	bool Polyline_expand (
+		Polygon* result, const Polyline& polyline,
+		coord width, CapType cap, JoinType join, coord miter_limit);
 
 
 }// Rays

data/test/test_painter_shape.rb

@@ -11,7 +11,7 @@ class TestPainterShape < Test::Unit::TestCase
   end
 
   def image (fill = 1, stroke = 0, pixel_density = 1, &block)
-    Rays::Image.new(100, 100, Rays::ColorSpace::RGBA, pixel_density).paint {|p|
+    Rays::Image.new(100, 100, Rays::RGBA, pixel_density).paint {|p|
       p.fill   fill   > 0 ? color(fill)   : nil
       p.stroke stroke > 0 ? color(stroke) : nil
       p.instance_eval &block if block
@@ -22,11 +22,56 @@ class TestPainterShape < Test::Unit::TestCase
     img = image(0, 1) {line 1, 1, 98, 98}
     assert_equal 0, img[ 0,  0].a
     assert_equal 1, img[ 1,  1].a
-    assert_equal 1, img[97, 97].a
-    #assert_equal 1, img[98, 98].a
+    assert_equal 1, img[97, 97].a #img[98, 98].a
     assert_equal 0, img[99, 99].a
   end
 
+  def test_curve ()
+=begin
+    img = image(0, 1) {curve 1, 1, 98, 1, 98, 98, 1, 98}
+    assert_equal 0, img[ 0,  0].a
+    assert_equal 1, img[ 1,  1].a
+    assert_equal 0, img[98,  1].a
+    assert_equal 0, img[98, 50].a
+    assert_equal 0, img[98, 98].a
+    assert_equal 1, img[ 1, 97].a #img[ 1, 98].a
+    assert_equal 0, img[99, 99].a
+=end
+    assert_raise(ArgumentError) {image {curve}}
+    assert_raise(ArgumentError) {image {curve 0}}
+    assert_raise(ArgumentError) {image {curve 0, 1}}
+    assert_raise(ArgumentError) {image {curve 0, 1, 2}}
+    assert_raise(ArgumentError) {image {curve 0, 1, 2, 3}}
+    assert_raise(ArgumentError) {image {curve 0, 1, 2, 3, 4}}
+    assert_raise(ArgumentError) {image {curve 0, 1, 2, 3, 4, 5}}
+    assert_raise(ArgumentError) {image {curve 0, 1, 2, 3, 4, 5, 6}}
+    assert_nothing_raised       {image {curve 0, 1, 2, 3, 4, 5, 6, 7}}
+    assert_raise(ArgumentError) {image {curve 0, 1, 2, 3, 4, 5, 6, 7, 8}}
+  end
+
+  def test_bezier ()
+=begin
+    img = image(0, 1) {bezier 1, 1, 98, 1, 98, 98, 1, 98}
+    assert_equal 0, img[ 0,  0].a
+    assert_equal 1, img[ 1,  1].a
+    assert_equal 0, img[98,  1].a
+    assert_equal 0, img[98, 50].a
+    assert_equal 0, img[98, 98].a
+    assert_equal 1, img[ 1, 97].a #img[ 1, 98].a
+    assert_equal 0, img[99, 99].a
+=end
+    assert_raise(ArgumentError) {image {bezier}}
+    assert_raise(ArgumentError) {image {bezier 0}}
+    assert_raise(ArgumentError) {image {bezier 0, 1}}
+    assert_raise(ArgumentError) {image {bezier 0, 1, 2}}
+    assert_raise(ArgumentError) {image {bezier 0, 1, 2, 3}}
+    assert_raise(ArgumentError) {image {bezier 0, 1, 2, 3, 4}}
+    assert_raise(ArgumentError) {image {bezier 0, 1, 2, 3, 4, 5}}
+    assert_raise(ArgumentError) {image {bezier 0, 1, 2, 3, 4, 5, 6}}
+    assert_nothing_raised       {image {bezier 0, 1, 2, 3, 4, 5, 6, 7}}
+    assert_raise(ArgumentError) {image {bezier 0, 1, 2, 3, 4, 5, 6, 7, 8}}
+  end
+
   def test_rect ()
     img = image {rect 1, 1, 98, 98}
     assert_equal 0, img[ 0,  0].a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - xordog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot