rays 0.1.17 → 0.1.22

data/lib/rays/point.rb

@@ -12,23 +12,23 @@ module Rays
     include Comparable
     include Enumerable
 
-    def move_to (*args)
-      dup.move_to! *args
+    def move_to(*args)
+      dup.move_to!(*args)
     end
 
-    def move_by (*args)
-      dup.move_by! *args
+    def move_by(*args)
+      dup.move_by!(*args)
     end
 
-    def zero? ()
+    def zero?()
       length == 0
     end
 
-    def each (&block)
-      to_a.each &block
+    def each(&block)
+      to_a.each(&block)
     end
 
-    def to_a (dimension = 2)
+    def to_a(dimension = 2)
       case dimension
       when 1 then [x]
       when 2 then [x, y]
@@ -37,17 +37,17 @@ module Rays
       end
     end
 
-    def to_s (dimension = 2)
+    def to_s(dimension = 2)
       to_a(dimension).to_s
     end
 
-    def <=> (o)
+    def <=>(o)
       ret = x <=> o.x; return ret if ret != 0
       ret = y <=> o.y; return ret if ret != 0
             z <=> o.z
     end
 
-    def inspect ()
+    def inspect()
       "#<Rays::Point #{to_a(3).join ', '}>"
     end
 

data/lib/rays/polygon.rb

@@ -12,43 +12,43 @@ module Rays
 
     include Enumerable
 
-    def initialize (*args, loop: true)
+    def initialize(*args, loop: true)
       setup args, loop
     end
 
-    def transform (matrix = nil, &block)
+    def transform(matrix = nil, &block)
       lines = to_a
       lines = lines.map {|line| line.transform matrix} if matrix
       lines = block.call lines if block
-      self.class.new *lines
+      self.class.new(*lines)
     end
 
-    def intersects (obj)
+    def intersects(obj)
       !(self & obj).empty?
     end
 
-    def self.line (*args, loop: false)
-      new *args, loop: loop
+    def self.line(*args, loop: false)
+      new(*args, loop: loop)
     end
 
-    def self.rect (
+    def self.rect(
       *args, round: nil, lt: nil, rt: nil, lb: nil, rb: nil, nsegment: nil)
 
       create_rect args, round, lt, rt, lb, rb, nsegment
     end
 
-    def self.ellipse (
+    def self.ellipse(
       *args, center: nil, radius: nil, hole: nil, from: nil, to: nil,
       nsegment: nil)
 
       create_ellipse args, center, radius, hole, from, to, nsegment
     end
 
-    def self.curve (*args, loop: false)
+    def self.curve(*args, loop: false)
       create_curve args, loop
     end
 
-    def self.bezier (*args, loop: false)
+    def self.bezier(*args, loop: false)
       create_bezier args, loop
     end
 

data/lib/rays/polygon_line.rb

@@ -12,18 +12,18 @@ module Rays
 
     class Line < Polyline
 
-      def initialize (*points, loop: true, hole: false)
+      def initialize(*points, loop: true, hole: false)
         setup points, loop, hole
       end
 
-      def transform (matrix = nil, loop: loop?, hole: hole?, &block)
+      def transform(matrix = nil, loop: loop?, hole: hole?, &block)
         points = to_a
         points = points.map {|point| matrix * point} if matrix
         points = block.call points if block
-        self.class.new *points, loop: loop, hole: hole
+        self.class.new(*points, loop: loop, hole: hole)
       end
 
-      def inspect ()
+      def inspect()
         "#<Rays::Polygon::Line #{to_a.join ', '}, loop: #{loop?}, hole: #{hole?}>"
       end
 

data/lib/rays/polyline.rb

@@ -11,18 +11,18 @@ module Rays
 
     include Enumerable
 
-    def initialize (*points, loop: false)
+    def initialize(*points, loop: false)
       setup points, loop
     end
 
-    def transform (matrix = nil, loop: loop?, &block)
+    def transform(matrix = nil, loop: loop?, &block)
       points = to_a
       points = points.map {|point| matrix * point} if matrix
       points = block.call points if block
-      self.class.new *points, loop: loop
+      self.class.new(*points, loop: loop)
     end
 
-    def inspect ()
+    def inspect()
       "#<Rays::Polyline #{to_a.join ', '}, loop: #{loop?}>"
     end
 

data/lib/rays/shader.rb

@@ -10,16 +10,16 @@ module Rays
 
   class Shader
 
-    def initialize (source = nil, **uniforms, &block)
+    def initialize(source = nil, **uniforms, &block)
       if source
         setup source
-        uniform **uniforms unless uniforms.empty?
+        uniform(**uniforms) unless uniforms.empty?
       end
 
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 
-    def uniform (name = nil, *args, **uniforms)
+    def uniform(name = nil, *args, **uniforms)
       set_uniform name, *args if name
       uniforms.each do |key, value|
         set_uniform key, value

data/rays.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '~> 2'
 
-  s.add_runtime_dependency 'xot',  '~> 0.1.16'
-  s.add_runtime_dependency 'rucy', '~> 0.1.16'
+  s.add_runtime_dependency 'xot',  '~> 0.1.22'
+  s.add_runtime_dependency 'rucy', '~> 0.1.22'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/ios/camera.mm

@@ -116,9 +116,9 @@ static int video_input_queue_index = 0;
 		return YES;
 	}
 
-	- (void) updateCaptureOrientation
+	- (void) updateOrientation
 	{
-		assert(Thread.isMainThread);
+		assert(NSThread.isMainThread);
 
 		switch (UIApplication.sharedApplication.statusBarOrientation)
 		{
@@ -126,11 +126,11 @@ static int video_input_queue_index = 0;
 				orientation = AVCaptureVideoOrientationPortraitUpsideDown;
 				break;
 
-			case UIInterfaceOrientationPortraitLandscapeLeft:
+			case UIInterfaceOrientationLandscapeLeft:
 				orientation = AVCaptureVideoOrientationLandscapeLeft;
 				break;
 
-			case UIInterfaceOrientationPortraitLandscapeRight:
+			case UIInterfaceOrientationLandscapeRight:
 				orientation = AVCaptureVideoOrientationLandscapeRight;
 				break;
 
@@ -326,7 +326,7 @@ namespace Rays
 				*draw_x       = min_width / 2 - *draw_width / 2;
 				*bitmap_width = min_width;
 			}
-			else if (crop && min_height > 0)
+			if (crop && min_height > 0)
 			{
 				*draw_y        = min_height / 2 - *draw_height / 2;
 				*bitmap_height = min_height;
@@ -343,7 +343,13 @@ namespace Rays
 		AVCaptureDeviceDiscoverySession* discoverySession =
 			[AVCaptureDeviceDiscoverySession
 				discoverySessionWithDeviceTypes: @[
-					AVCaptureDeviceTypeBuiltInWideAngleCamera]
+					AVCaptureDeviceTypeBuiltInTripleCamera,
+					AVCaptureDeviceTypeBuiltInDualWideCamera,
+					AVCaptureDeviceTypeBuiltInDualCamera,
+					AVCaptureDeviceTypeBuiltInUltraWideCamera,
+					AVCaptureDeviceTypeBuiltInTelephotoCamera,
+					AVCaptureDeviceTypeBuiltInWideAngleCamera
+				]
 				mediaType: AVMediaTypeVideo
 				position: AVCaptureDevicePositionUnspecified];
 		NSArray<AVCaptureDevice*>* devices = discoverySession.devices;
@@ -414,7 +420,6 @@ namespace Rays
 	Camera::~Camera ()
 	{
 		stop();
-		if (self->video_input) [self->video_input release];
 	}
 
 	bool
@@ -432,6 +437,8 @@ namespace Rays
 		if (!self->video_input) return;
 
 		[self->video_input stop];
+		[self->video_input release];
+		self->video_input = nil;
 	}
 
 	bool

data/src/osx/camera.mm

@@ -280,7 +280,7 @@ namespace Rays
 				*draw_x       = min_width / 2 - *draw_width / 2;
 				*bitmap_width = min_width;
 			}
-			else if (crop && min_height > 0)
+			if (crop && min_height > 0)
 			{
 				*draw_y        = min_height / 2 - *draw_height / 2;
 				*bitmap_height = min_height;
@@ -355,7 +355,6 @@ namespace Rays
 	Camera::~Camera ()
 	{
 		stop();
-		if (self->video_input) [self->video_input release];
 	}
 
 	bool
@@ -373,6 +372,8 @@ namespace Rays
 		if (!self->video_input) return;
 
 		[self->video_input stop];
+		[self->video_input release];
+		self->video_input = nil;
 	}
 
 	bool

data/test/helper.rb

@@ -12,6 +12,6 @@ require 'rays'
 include Xot::Test
 
 
-unless $RAYS_NOAUTOINIT
-  def Rays.fin! () end
+unless defined?($RAYS_NOAUTOINIT) && $RAYS_NOAUTOINIT
+  def Rays.fin!() end
 end

data/test/test_bitmap.rb

@@ -9,20 +9,20 @@ class TestBitmap < Test::Unit::TestCase
   W = 32
   H = 16
 
-  def bitmap (w = W, h = H)
+  def bitmap(w = W, h = H)
     Rays::Bitmap.new w, h
   end
 
-  def color (*args)
-    Rays::Color.new *args
+  def color(*args)
+    Rays::Color.new(*args)
   end
 
-  def test_initialize ()
+  def test_initialize()
     assert_equal W, bitmap.width
     assert_equal H, bitmap.height
   end
 
-  def test_dup ()
+  def test_dup()
     o          = bitmap
     assert_equal color(0, 0, 0, 0), o[0, 0]
     o[0, 0]    = color(1, 0, 0, 0)
@@ -34,14 +34,14 @@ class TestBitmap < Test::Unit::TestCase
     assert_equal color(1, 0, 0, 0), o[0, 0]
   end
 
-  def test_at ()
+  def test_at()
     o       = bitmap
     assert_equal color(0, 0, 0, 0), o[0, 0]
     o[0, 0] = 1
     assert_equal color(1, 1, 1, 1), o[0, 0]
   end
 
-  def test_to_a ()
+  def test_to_a()
     colors = %w[#f00 #0f0 #00f #ff0].map {|s| color s}
     bmp = bitmap 2, 2
     bmp[0, 0], bmp[1, 0], bmp[0, 1], bmp[1, 1] = colors

data/test/test_bounds.rb

@@ -6,15 +6,15 @@ require_relative 'helper'
 
 class TestBounds < Test::Unit::TestCase
 
-  def bounds (*args)
-    Rays::Bounds.new *args
+  def bounds(*args)
+    Rays::Bounds.new(*args)
   end
 
-  def point (*args)
-    Rays::Point.new *args
+  def point(*args)
+    Rays::Point.new(*args)
   end
 
-  def test_initialize ()
+  def test_initialize()
     assert_equal bounds(0, 0, 0, 0, 0, 0), bounds()
     assert_equal bounds(0, 0, 0, 1, 1, 0), bounds(1)
     assert_equal bounds(0, 0, 0, 1, 2, 0), bounds(1, 2)
@@ -25,7 +25,7 @@ class TestBounds < Test::Unit::TestCase
     assert_raise(ArgumentError) {bounds(1, 2, 3, 4, 5, 6, 7)}
   end
 
-  def test_dup ()
+  def test_dup()
     o   = bounds
     assert_equal bounds(0, 0, 0, 0, 0, 0), o
     o.x = 1
@@ -37,17 +37,17 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds(1, 0, 0, 0, 0, 0), o
   end
 
-  def test_intersect? ()
+  def test_intersect?()
     assert     bounds(10, 20, 30, 100, 100, 100).intersect?(bounds 50, 60, 70, 100, 100, 100)
     assert_not bounds(10, 20, 30,  10,  10,  10).intersect?(bounds 50, 60, 70, 100, 100, 100)
   end
 
-  def test_include? ()
+  def test_include?()
     assert     bounds(10, 20, 30, 100, 100, 100).include?(point 50, 60)
     assert_not bounds(10, 20, 30,  10,  10,  10).include?(point 50, 60)
   end
 
-  def test_valid? ()
+  def test_valid?()
     assert     bounds(0, 0, 0,  0,  0,  0).valid?
     assert     bounds(0, 0, 0,  1,  0,  0).valid?
     assert     bounds(0, 0, 0,  0,  1,  0).valid?
@@ -57,7 +57,7 @@ class TestBounds < Test::Unit::TestCase
     assert_not bounds(0, 0, 0,  0,  0, -1).valid?
   end
 
-  def test_get_xyzwhd ()
+  def test_get_xyzwhd()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal 1, o.x
     assert_equal 2, o.y
@@ -70,7 +70,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal 6, o.depth
   end
 
-  def test_set_xyzwhd ()
+  def test_set_xyzwhd()
     o = bounds
     o.x = 1
     assert_equal [1, 0, 0, 0, 0, 0], o.to_a(3)
@@ -92,7 +92,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal [1, 2, 3, 7, 8, 9], o.to_a(3)
   end
 
-  def test_get_ltbrbf ()
+  def test_get_ltbrbf()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal 1, o.left
     assert_equal 2, o.top
@@ -106,7 +106,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal [4, 6], o.rb.to_a
   end
 
-  def test_set_ltbrbf ()
+  def test_set_ltbrbf()
     assert_equal [1, 0, 0, -1,  0,  0], bounds.tap {|o| o.left   = 1}.to_a(3)
     assert_equal [0, 2, 0,  0, -2,  0], bounds.tap {|o| o.top    = 2}.to_a(3)
     assert_equal [0, 0, 3,  0,  0, -3], bounds.tap {|o| o.back   = 3}.to_a(3)
@@ -132,7 +132,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal [10, 20, 0, 40, 50, 0], bounds(10, 20, 30, 40).tap {|o| o.rb += 10}.to_a(3)
   end
 
-  def test_position ()
+  def test_position()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal [ 1,  2,  3], o.position.to_a(3)
     o.position = point 7, 8, 9
@@ -142,14 +142,14 @@ class TestBounds < Test::Unit::TestCase
     assert_equal [10, 11, 12], o.pos.to_a(3)
   end
 
-  def test_size ()
+  def test_size()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal point(4, 5, 6), o.size
     o.size = point 7, 8, 9
     assert_equal point(7, 8, 9), o.size
   end
 
-  def test_move_to ()
+  def test_move_to()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal bounds(7, 2, 3, 4, 5, 6), o.move_to(  7)
     assert_equal bounds(7, 8, 3, 4, 5, 6), o.move_to(  7,   8)
@@ -169,7 +169,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds( 7,  8,  9, 4, 5, 6), o1
   end
 
-  def test_move_by ()
+  def test_move_by()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal bounds( 8,  2,  3, 4, 5, 6), o.move_by(  7)
     assert_equal bounds( 8, 10,  3, 4, 5, 6), o.move_by(  7,   8)
@@ -192,7 +192,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds( 8, 10, 12, 4, 5, 6), o1
   end
 
-  def test_resize_to ()
+  def test_resize_to()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal bounds(1, 2, 3, 7, 5, 6), o.resize_to(  7)
     assert_equal bounds(1, 2, 3, 7, 8, 6), o.resize_to(  7,   8)
@@ -212,7 +212,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds(1, 2, 3,  7,  8,  9), o1
   end
 
-  def test_resize_by ()
+  def test_resize_by()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal bounds(1, 2, 3, 11,  5,  6), o.resize_by(  7)
     assert_equal bounds(1, 2, 3, 11, 13,  6), o.resize_by(  7,   8)
@@ -235,7 +235,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds(1, 2, 3, 11, 13, 15), o1
   end
 
-  def test_inset_by ()
+  def test_inset_by()
     o = bounds 1, 2, 3, 20, 30, 40
     assert_equal bounds(8,  2,  3,  6, 30, 40), o.inset_by(  7)
     assert_equal bounds(8, 10,  3,  6, 14, 40), o.inset_by(  7,   8)
@@ -255,7 +255,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal bounds( 8, 10, 12, 6, 14, 22), o1
   end
 
-  def test_to_a ()
+  def test_to_a()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal [1, 2, 4, 5],       o.to_a
     assert_equal [1, 4],             o.to_a(1)
@@ -266,7 +266,7 @@ class TestBounds < Test::Unit::TestCase
     assert_raise(ArgumentError) {o.to_a(4)}
   end
 
-  def test_index ()
+  def test_index()
     o = bounds 1, 2, 3, 4, 5, 6
     assert_equal point(1, 2, 3), o[0]
     assert_equal point(4, 5, 6), o[1]
@@ -274,7 +274,7 @@ class TestBounds < Test::Unit::TestCase
     assert_raise(IndexError) {o[2]}
   end
 
-  def test_index_assign ()
+  def test_index_assign()
     o = bounds 1, 2, 3, 4, 5, 6
     o[0] = point 7, 8, 9
     assert_equal bounds(7, 8, 9, 4, 5, 6), o
@@ -284,7 +284,7 @@ class TestBounds < Test::Unit::TestCase
     assert_raise(IndexError) {o[2]}
   end
 
-  def test_compare ()
+  def test_compare()
     o = bounds 1, 2, 3, 4, 5, 6
     assert     o == bounds(1, 2, 3, 4, 5, 6)
     assert_not o != bounds(1, 2, 3, 4, 5, 6)
@@ -304,7 +304,7 @@ class TestBounds < Test::Unit::TestCase
     assert o > bounds(1, 2, 3, 4, 5, 5)
   end
 
-  def test_operators ()
+  def test_operators()
     assert_equal bounds(50, 60, 70,  60,  60,  60), bounds(10, 20, 30, 100, 100, 100) & bounds(50, 60, 70, 100, 100, 100)
     assert_equal bounds(10, 20, 30, 140, 140, 140), bounds(10, 20, 30, 100, 100, 100) | bounds(50, 60, 70, 100, 100, 100)
     assert_equal bounds(10, 20, 30,  20,  20,  20), bounds(20, 30, 40, 10, 10, 10)    | point(10, 20, 30)
@@ -313,7 +313,7 @@ class TestBounds < Test::Unit::TestCase
     assert_equal point(0), (bounds(10, 20, 30, 10, 10, 10) & bounds(50, 60, 70, 10, 10, 10)).size
   end
 
-  def test_invalid ()
+  def test_invalid()
     o = Rays::Bounds.invalid
     assert_not o.valid?