rays 0.1.13 → 0.1.18

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_font.rb

@@ -25,4 +25,9 @@ class TestFont < Test::Unit::TestCase
     assert_equal w * 2, font.width('XX')
   end
 
+  def test_height ()
+    f = font
+    assert_equal f.height, f.ascent + f.descent + f.leading
+  end
+
 end# TestFont

data/test/test_painter.rb

@@ -28,7 +28,7 @@ class TestPainter < Test::Unit::TestCase
     assert_equal   color(1, 1, 1, 1), pa.background
     pa.background = 0
     assert_equal   color(0, 0, 0, 1), pa.background
-    pa.background 1
+    pa.background   1
     assert_equal   color(1, 1, 1, 1), pa.background
     pa.push background: 0 do |_|
       assert_equal color(0, 0, 0, 1), pa.background
@@ -42,7 +42,7 @@ class TestPainter < Test::Unit::TestCase
     assert_equal   color(1, 1, 1, 1), pa.fill
     pa.fill = 0
     assert_equal   color(0, 0, 0, 1), pa.fill
-    pa.fill 1
+    pa.fill   1
     assert_equal   color(1, 1, 1, 1), pa.fill
     pa.push fill: 0 do |_|
       assert_equal color(0, 0, 0, 1), pa.fill
@@ -56,7 +56,7 @@ class TestPainter < Test::Unit::TestCase
     assert_equal   color(1, 1, 1, 1), pa.stroke
     pa.stroke = 0
     assert_equal   color(0, 0, 0, 1), pa.stroke
-    pa.stroke 1
+    pa.stroke   1
     assert_equal   color(1, 1, 1, 1), pa.stroke
     pa.push stroke: 0 do |_|
       assert_equal color(0, 0, 0, 1), pa.stroke
@@ -64,13 +64,73 @@ class TestPainter < Test::Unit::TestCase
     assert_equal   color(1, 1, 1, 1), pa.stroke
   end
 
+  def test_stroke_width_accessor ()
+    pa = painter
+    assert_equal          0, pa.stroke_width
+    pa.stroke_width =     1
+    assert_equal          1, pa.stroke_width
+    pa.stroke_width =     0
+    assert_equal          0, pa.stroke_width
+    pa.stroke_width       2
+    assert_equal          2, pa.stroke_width
+    pa.push stroke_width: 3 do |_|
+      assert_equal        3, pa.stroke_width
+    end
+    assert_equal          2, pa.stroke_width
+  end
+
+  def test_stroke_cap_accessor ()
+    pa = painter
+    assert_equal        :butt,   pa.stroke_cap
+    pa.stroke_cap =     :round
+    assert_equal        :round,  pa.stroke_cap
+    pa.stroke_cap       :square
+    assert_equal        :square, pa.stroke_cap
+    pa.push stroke_cap: :butt do |_|
+      assert_equal      :butt,   pa.stroke_cap
+    end
+    assert_equal        :square, pa.stroke_cap
+    assert_raise(ArgumentError) {pa.stroke_cap :foo}
+    assert_raise(ArgumentError) {pa.stroke_cap :BUTT}
+    assert_raise(ArgumentError) {pa.stroke_cap Rays::CAP_BUTT}# ToDo: accept this
+  end
+
+  def test_stroke_join_accessor ()
+    pa = painter
+    assert_equal         :miter,  pa.stroke_join
+    pa.stroke_join =     :round
+    assert_equal         :round,  pa.stroke_join
+    pa.stroke_join       :square
+    assert_equal         :square, pa.stroke_join
+    pa.push stroke_join: :miter do |_|
+      assert_equal       :miter,  pa.stroke_join
+    end
+    assert_equal         :square, pa.stroke_join
+    assert_raise(ArgumentError) {pa.stroke_join :foo}
+    assert_raise(ArgumentError) {pa.stroke_join :MITER}
+    assert_raise(ArgumentError) {pa.stroke_join Rays::JOIN_MITER}# ToDo: accept this
+  end
+
+  def test_miter_limit_accessor ()
+    pa = painter
+    assert_equal         2, pa.miter_limit
+    pa.miter_limit =     3
+    assert_equal         3, pa.miter_limit
+    pa.miter_limit       4
+    assert_equal         4, pa.miter_limit
+    pa.push miter_limit: 9 do |_|
+      assert_equal       9, pa.miter_limit
+    end
+    assert_equal         4, pa.miter_limit
+  end
+
   def test_clip_accessor ()
     pa = painter
     pa.clip = [1, 2, 3, 4]
     assert_equal [1, 2, 3, 4], pa.clip.to_a
     pa.clip = [5, 6, 7, 8]
     assert_equal [5, 6, 7, 8], pa.clip.to_a
-    pa.clip 1, 2, 3, 4
+    pa.clip    1, 2, 3, 4
     assert_equal [1, 2, 3, 4], pa.clip.to_a
     pa.push clip: [5, 6, 7, 8] do |_|
       assert_equal [5, 6, 7, 8], pa.clip.to_a
@@ -85,7 +145,7 @@ class TestPainter < Test::Unit::TestCase
     assert_equal f10, pa.font
     pa.font = f20
     assert_equal f20, pa.font
-    pa.font f10
+    pa.font   f10
     assert_equal f10, pa.font
     pa.push font: f20 do |_|
       assert_equal f20, pa.font

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

data/test/test_point.rb

@@ -179,4 +179,12 @@ class TestPoint < Test::Unit::TestCase
     assert_equal "#<Rays::Point 1.0, 2.0, 3.0>", point(1, 2, 3).inspect
   end
 
+  def test_dot ()
+    assert_equal 1*4 + 2*5 + 3*6, Rays::Point::dot(point(1, 2, 3), point(4, 5, 6))
+  end
+
+  def test_cross ()
+    assert_equal point(0, 0, 1), Rays::Point::cross(point(1, 0, 0), point(0, 1, 0))
+  end
+
 end# TestPoint

data/test/test_polyline.rb

@@ -68,6 +68,32 @@ class TestPolyline < Test::Unit::TestCase
     }
   end
 
+  def test_expand_with_cap ()
+    def pl; polyline [10,10], [20,20]; end
+    assert_nothing_raised       {pl.expand 1, Rays::CAP_ROUND}
+    assert_nothing_raised       {pl.expand 1, 'ROUND'}
+    assert_nothing_raised       {pl.expand 1, :ROUND}
+    assert_nothing_raised       {pl.expand 1, :round}
+    assert_nothing_raised       {pl.expand 1, 1}
+    assert_raise(ArgumentError) {pl.expand 1, -1}
+    assert_raise(ArgumentError) {pl.expand 1, 99}
+    assert_raise(ArgumentError) {pl.expand 1, 'hoge'}
+    assert_raise(ArgumentError) {pl.expand 1, :hoge}
+  end
+
+  def test_expand_with_join ()
+    def pl; polyline [10,10], [20,20]; end
+    assert_nothing_raised       {pl.expand 1, Rays::JOIN_ROUND}
+    assert_nothing_raised       {pl.expand 1, 'ROUND'}
+    assert_nothing_raised       {pl.expand 1, :ROUND}
+    assert_nothing_raised       {pl.expand 1, :round}
+    assert_nothing_raised       {pl.expand 1, 1}
+    assert_raise(ArgumentError) {pl.expand 1, 'hoge'}
+    assert_raise(ArgumentError) {pl.expand 1, :hoge}
+    assert_raise(ArgumentError) {pl.expand 1, -1}
+    assert_raise(ArgumentError) {pl.expand 1, 99}
+  end
+
   def test_transform_with_materix ()
     m = Rays::Matrix.translate 100, 200
     polyline([10,10], [20,20]).transform(m).tap {|o|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rays
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.18
 platform: ruby
 authors:
 - xordog
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.16
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.18
 description: This library helps you to develop graphics application with OpenGL.
 email: xordog@gmail.com
 executables: []
@@ -47,6 +47,7 @@ extra_rdoc_files:
 - ".doc/ext/rays/defs.cpp"
 - ".doc/ext/rays/image.cpp"
 - ".doc/ext/rays/bitmap.cpp"
+- ".doc/ext/rays/camera.cpp"
 - ".doc/ext/rays/rays.cpp"
 - ".doc/ext/rays/font.cpp"
 - ".doc/ext/rays/color_space.cpp"
@@ -64,6 +65,7 @@ extra_rdoc_files:
 files:
 - ".doc/ext/rays/bitmap.cpp"
 - ".doc/ext/rays/bounds.cpp"
+- ".doc/ext/rays/camera.cpp"
 - ".doc/ext/rays/color.cpp"
 - ".doc/ext/rays/color_space.cpp"
 - ".doc/ext/rays/defs.cpp"
@@ -79,11 +81,13 @@ files:
 - ".doc/ext/rays/polyline.cpp"
 - ".doc/ext/rays/rays.cpp"
 - ".doc/ext/rays/shader.cpp"
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
 - ext/rays/bitmap.cpp
 - ext/rays/bounds.cpp
+- ext/rays/camera.cpp
 - ext/rays/color.cpp
 - ext/rays/color_space.cpp
 - ext/rays/defs.cpp
@@ -104,6 +108,7 @@ files:
 - include/rays.h
 - include/rays/bitmap.h
 - include/rays/bounds.h
+- include/rays/camera.h
 - include/rays/color.h
 - include/rays/color_space.h
 - include/rays/coord.h
@@ -123,6 +128,7 @@ files:
 - include/rays/ruby.h
 - include/rays/ruby/bitmap.h
 - include/rays/ruby/bounds.h
+- include/rays/ruby/camera.h
 - include/rays/ruby/color.h
 - include/rays/ruby/color_space.h
 - include/rays/ruby/font.h
@@ -139,6 +145,7 @@ files:
 - lib/rays/autoinit.rb
 - lib/rays/bitmap.rb
 - lib/rays/bounds.rb
+- lib/rays/camera.rb
 - lib/rays/color.rb
 - lib/rays/color_space.rb
 - lib/rays/ext.rb
@@ -167,7 +174,9 @@ files:
 - src/frame_buffer.h
 - src/image.cpp
 - src/image.h
+- src/ios/bitmap.h
 - src/ios/bitmap.mm
+- src/ios/camera.mm
 - src/ios/font.mm
 - src/ios/helper.h
 - src/ios/helper.mm
@@ -178,7 +187,9 @@ files:
 - src/noise.cpp
 - src/opengl.cpp
 - src/opengl.h
+- src/osx/bitmap.h
 - src/osx/bitmap.mm
+- src/osx/camera.mm
 - src/osx/font.mm
 - src/osx/helper.h
 - src/osx/helper.mm
@@ -226,7 +237,7 @@ files:
 homepage: https://github.com/xord/rays
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -242,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A Drawing Engine using OpenGL.
 test_files: