rays 0.1.15 → 0.1.16

data/src/osx/camera.mm

@@ -0,0 +1,236 @@
+// -*- mode: objc -*-
+#import "rays/camera.h"
+
+
+#import <AVFoundation/AVFoundation.h>
+#include "bitmap.h"
+
+
+static int video_input_queue_index = 0;
+
+
+@interface VideoInput : NSObject <AVCaptureVideoDataOutputSampleBufferDelegate>
+@end
+
+
+@implementation VideoInput
+
+	{
+		AVCaptureSession* captureSession;
+		dispatch_queue_t captureQueue;
+		CGImageRef captureImage;
+	}
+
+	- (id) init
+	{
+		self = [super init];
+		if (self)
+		{
+			captureSession = nil;
+			captureQueue   = nil;
+			captureImage   = nil;
+		}
+		return self;
+	}
+
+	- (void) dealloc
+	{
+		[self stop];
+		[self clearImage];
+
+		if (captureQueue)
+		{
+			dispatch_release(captureQueue);
+			captureQueue = nil;
+		}
+
+		[super dealloc];
+	}
+
+	- (dispatch_queue_t) queue
+	{
+		if (!captureQueue)
+		{
+			auto name = Xot::stringf(
+				"org.xord.RaysVideoInputQueue_%d",
+				video_input_queue_index++);
+			captureQueue = dispatch_queue_create(name, DISPATCH_QUEUE_SERIAL);
+		}
+		return captureQueue;
+	}
+
+	- (BOOL) start
+	{
+		[self stop];
+
+		AVCaptureSession* session = [[[AVCaptureSession alloc] init] autorelease];
+		session.sessionPreset = AVCaptureSessionPresetHigh;
+
+		AVCaptureDevice* device =
+			[AVCaptureDevice defaultDeviceWithMediaType: AVMediaTypeVideo];
+		if (!device) return NO;
+
+		//device.activeVideoMinFrameDuration = CMTimeMake(1, 30);
+
+		NSError* error = nil;
+		AVCaptureDeviceInput* input = [[[AVCaptureDeviceInput alloc]
+			initWithDevice: device error: &error]
+			autorelease];
+		if (!input || error || ![session canAddInput: input])
+			return NO;
+
+		AVCaptureVideoDataOutput* output =
+			[[[AVCaptureVideoDataOutput alloc] init] autorelease];
+		output.videoSettings = @{
+			(NSString*) kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA)
+		};
+		output.alwaysDiscardsLateVideoFrames = YES;
+		[output setSampleBufferDelegate: self queue: self.queue];
+		if (![session canAddOutput: output])
+			return NO;
+
+		[session addInput: input];
+		[session addOutput: output];
+		[session startRunning];
+
+		captureSession = [session retain];
+		return YES;
+	}
+
+	- (void) captureOutput: (AVCaptureOutput*) output
+		didOutputSampleBuffer: (CMSampleBufferRef) sampleBuffer
+		fromConnection: (AVCaptureConnection*) connection
+	{
+		CVPixelBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
+		if (!pixelBuffer) return;
+
+		CIImage* ciImage = [CIImage imageWithCVPixelBuffer: pixelBuffer];
+		if (!ciImage) return;
+
+		CIContext* context = [CIContext contextWithOptions: nil];
+		size_t width       = CVPixelBufferGetWidth(pixelBuffer);
+		size_t height      = CVPixelBufferGetHeight(pixelBuffer);
+		CGRect rect        = CGRectMake(0, 0, width, height);
+		CGImageRef cgImage = [context createCGImage: ciImage fromRect: rect];
+
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[self clearImage];
+			captureImage = cgImage;
+		});
+	}
+
+	- (void) stop
+	{
+		if (!captureSession) return;
+
+		[captureSession stopRunning];
+		[captureSession release];
+		captureSession = nil;
+	}
+
+	- (BOOL) isActive
+	{
+		return captureSession != nil;
+	}
+
+	- (void) clearImage
+	{
+		if (!captureImage) return;
+
+		CGImageRelease(captureImage);
+		captureImage = nil;
+	}
+
+	- (CGImageRef) getImage
+	{
+		return captureImage;
+	}
+
+@end// VideoInput
+
+
+namespace Rays
+{
+
+
+	struct Camera::Data
+	{
+
+		mutable Image image;
+
+		VideoInput* video_input = nil;
+
+		void update_image_from_video_input () const
+		{
+			if (!video_input) return;
+
+			CGImageRef cgImage = [video_input getImage];
+			if (!cgImage) return;
+
+			if (!image)
+			{
+				Bitmap bmp(
+					(int) CGImageGetWidth(cgImage),
+					(int) CGImageGetHeight(cgImage));
+				image = Image(bmp);
+			}
+
+			Bitmap_copy_pixels(&image.bitmap(), cgImage);
+
+			[video_input clearImage];
+		}
+
+	};// Camera::Data
+
+
+	Camera::Camera ()
+	{
+	}
+
+	Camera::~Camera ()
+	{
+		stop();
+		if (self->video_input) [self->video_input release];
+	}
+
+	bool
+	Camera::start ()
+	{
+		if (!self->video_input) self->video_input = [[VideoInput alloc] init];
+		return [self->video_input start];
+	}
+
+	void
+	Camera::stop ()
+	{
+		if (!self->video_input) return;
+
+		[self->video_input stop];
+	}
+
+	bool
+	Camera::is_active () const
+	{
+		return self->video_input && [self->video_input isActive];
+	}
+
+	const Image*
+	Camera::image () const
+	{
+		self->update_image_from_video_input();
+		return self->image ? &self->image : NULL;
+	}
+
+	Camera::operator bool () const
+	{
+		return true;
+	}
+
+	bool
+	Camera::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Rays

data/src/painter.cpp

@@ -652,7 +652,7 @@ namespace Rays
 
 		//glEnable(GL_CULL_FACE);
 		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE);
 		OpenGL_check_error(__FILE__, __LINE__);
 
 		FrameBuffer& fb = self->frame_buffer;

data/src/polygon.cpp

@@ -280,9 +280,11 @@ namespace Rays
 			case JOIN_MITER:  return clip::jtMiter;
 			case JOIN_ROUND:  return clip::jtRound;
 			case JOIN_SQUARE: return clip::jtSquare;
+			default:
+				argument_error(__FILE__, __LINE__, "invalid join type -- %d", join);
 		}
 
-		argument_error(__FILE__, __LINE__);
+		return clip::jtMiter;// to avoid compiler warning
 	}
 
 	static clip::EndType
@@ -295,9 +297,11 @@ namespace Rays
 			case CAP_BUTT:   return clip::etOpenButt;
 			case CAP_ROUND:  return clip::etOpenRound;
 			case CAP_SQUARE: return clip::etOpenSquare;
+			default:
+				argument_error(__FILE__, __LINE__, "invalid cap type -- %d", cap);
 		}
 
-		argument_error(__FILE__, __LINE__);
+		return clip::etOpenButt;// to avoid compiler warning
 	}
 
 	static bool

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_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.15
+  version: 0.1.16
 platform: ruby
 authors:
 - xordog
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -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"
@@ -85,6 +87,7 @@ files:
 - 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
@@ -105,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
@@ -124,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
@@ -140,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
@@ -168,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
@@ -179,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
@@ -227,7 +237,7 @@ files:
 homepage: https://github.com/xord/rays
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -243,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: