rays 0.1.13 → 0.1.18

data/include/rays/ruby/rays.h

@@ -4,7 +4,10 @@
 #define __RAYS_RUBY_RAYS_H__
 
 
+#include <rucy/rucy.h>
 #include <rucy/module.h>
+#include <rucy/extension.h>
+#include <rays/rays.h>
 
 
 namespace Rays
@@ -18,4 +21,9 @@ namespace Rays
 }// Rays
 
 
+RUCY_DECLARE_CONVERT_TO(Rays::CapType)
+
+RUCY_DECLARE_CONVERT_TO(Rays::JoinType)
+
+
 #endif//EOH

data/lib/rays.rb

@@ -10,6 +10,7 @@ require 'rays/color'
 require 'rays/color_space'
 require 'rays/matrix'
 
+require 'rays/painter'
 require 'rays/polyline'
 require 'rays/polygon'
 require 'rays/polygon_line'
@@ -17,5 +18,4 @@ require 'rays/bitmap'
 require 'rays/image'
 require 'rays/font'
 require 'rays/shader'
-
-require 'rays/painter'
+require 'rays/camera'

data/lib/rays/camera.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/block_util'
+require 'rays/ext'
+
+
+module Rays
+
+
+  class Camera
+
+    def initialize (
+      min_width = -1, min_height = -1,
+      device_name: nil, resize: true, crop: true, &block)
+
+      setup device_name, min_width, min_height, resize, crop
+      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
+    end
+
+  end# Camera
+
+
+end# Rays

data/lib/rays/image.rb

@@ -24,7 +24,7 @@ module Rays
     end
 
     def bounds ()
-      Bounds.new 0, 0, *size
+      Bounds.new 0, 0, width, height
     end
 
   end# Image

data/lib/rays/painter.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
+require 'xot/const_symbol_accessor'
 require 'xot/universal_accessor'
 require 'xot/block_util'
 require 'rays/ext'
@@ -73,6 +74,14 @@ module Rays
       draw_ellipse args, center, radius, hole, from, to
     end
 
+    def curve (*args, loop: false)
+      draw_curve args, loop
+    end
+
+    def bezier (*args, loop: false)
+      draw_bezier args, loop
+    end
+
     def color= (fill, stroke = nil)
       self.fill   fill
       self.stroke stroke
@@ -87,8 +96,21 @@ module Rays
       set_shader shader
     end
 
+    const_symbol_accessor :stroke_cap, {
+      butt:   CAP_BUTT,
+      round:  CAP_ROUND,
+      square: CAP_SQUARE
+    }
+
+    const_symbol_accessor :stroke_join, {
+      miter:  JOIN_MITER,
+      round:  JOIN_ROUND,
+      square: JOIN_SQUARE
+    }
+
     universal_accessor :background, :fill, :stroke, :color,
-      :stroke_width, :nsegment, :shader, :clip, :font
+      :stroke_width, :stroke_cap, :stroke_join, :miter_limit,
+      :nsegment, :shader, :clip, :font
 
     private
 

data/lib/rays/polygon.rb

@@ -44,6 +44,14 @@ module Rays
       create_ellipse args, center, radius, hole, from, to, nsegment
     end
 
+    def self.curve (*args, loop: false)
+      create_curve args, loop
+    end
+
+    def self.bezier (*args, loop: false)
+      create_bezier args, loop
+    end
+
   end# Polygon
 
 

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'
-  s.add_runtime_dependency 'rucy', '~> 0.1'
+  s.add_runtime_dependency 'xot',  '~> 0.1.16'
+  s.add_runtime_dependency 'rucy', '~> 0.1.18'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/color_space.cpp

@@ -55,7 +55,7 @@ namespace Rays
 			32, 32, 32,        // RGB(A) float
 			32, 32, 32,        // BGR(A) float
 		};
-		if (type_ < 0 || COLORSPACE_LAST <= type_) return BPPS[COLORSPACE_UNKNOWN];
+		if (type_ < 0 || COLORSPACE_MAX <= type_) return BPPS[COLORSPACE_UNKNOWN];
 		return BPPS[type_];
 	}
 
@@ -78,7 +78,7 @@ namespace Rays
 			96, 128, 128,          // RGB(A) float
 			96, 128, 128,          // BGR(A) float
 		};
-		if (type_ < 0 || COLORSPACE_LAST <= type_) return BPPS[COLORSPACE_UNKNOWN];
+		if (type_ < 0 || COLORSPACE_MAX <= type_) return BPPS[COLORSPACE_UNKNOWN];
 		return BPPS[type_];
 	}
 

data/src/image.cpp

@@ -1,4 +1,4 @@
-#include "rays/image.h"
+#include "image.h"
 
 
 #include <math.h>

data/src/ios/bitmap.h

@@ -0,0 +1,23 @@
+// -*- mode: c++ -*-
+#pragma once
+#ifndef __RAYS_SRC_IOS_BITMAP_H__
+#define __RAYS_SRC_IOS_BITMAP_H__
+
+
+#import <CoreGraphics/CGImage.h>
+#include "../bitmap.h"
+
+
+namespace Rays
+{
+
+
+	void Bitmap_draw_image (
+		Bitmap* bitmap, CGImageRef image,
+		coord x = 0, coord y = 0, coord width = -1, coord height = -1);
+
+
+}// Rays
+
+
+#endif//EOH

data/src/ios/bitmap.mm

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#import "../bitmap.h"
+#import "bitmap.h"
 
 
 #import <ImageIO/CGImageDestination.h>
@@ -27,14 +27,14 @@ namespace Rays
 		if (cs.is_alpha_first())
 		{
 			info |= cs.is_premult()
-				? kCGImageAlphaPremultipliedFirst
-				: kCGImageAlphaFirst;
+				?	kCGImageAlphaPremultipliedFirst
+				:	kCGImageAlphaFirst;
 		}
 		else if (cs.is_alpha_last())
 		{
 			info |= cs.is_premult()
-				? kCGImageAlphaPremultipliedLast
-				: kCGImageAlphaLast;
+				?	kCGImageAlphaPremultipliedLast
+				:	kCGImageAlphaLast;
 		}
 		else if (cs.is_skip_first())
 			info |= kCGImageAlphaNoneSkipFirst;
@@ -175,6 +175,27 @@ namespace Rays
 		return bmp;
 	}
 
+	void
+	Bitmap_draw_image (
+		Bitmap* bitmap, CGImageRef image,
+		coord x, coord y, coord width, coord height)
+	{
+		if (width == 0 || height == 0) return;
+
+		if (!bitmap || !image)
+			argument_error(__FILE__, __LINE__);
+
+		CGContextRef context = bitmap->self->get_context();
+		if (!context)
+			rays_error(__FILE__, __LINE__, "getting CGContext failed.");
+
+		if (width  < 0) width  = (coord) CGImageGetWidth(image);
+		if (height < 0) height = (coord) CGImageGetHeight(image);
+		CGContextDrawImage(context, CGRectMake(x, y, width, height), image);
+
+		Bitmap_set_modified(bitmap);
+	}
+
 	void
 	Bitmap_draw_string (
 		Bitmap* bitmap, const RawFont& font, const char* str, coord x, coord y)
@@ -185,6 +206,7 @@ namespace Rays
 		if (*str == '\0') return;
 
 		font.draw_string(bitmap->self->get_context(), bitmap->height(), str, x, y);
+
 		Bitmap_set_modified(bitmap);
 	}
 
@@ -247,11 +269,7 @@ namespace Rays
 		if (!bmp)
 			rays_error(__FILE__, __LINE__, "invalid bitmap.");
 
-		CGContextRef context = bmp.self->get_context();
-		if (!context)
-			rays_error(__FILE__, __LINE__, "creating CGContext failed.");
-
-		CGContextDrawImage(context, CGRectMake(0, 0, width, height), image);
+		Bitmap_draw_image(&bmp, image);
 		return bmp;
 	}
 
@@ -329,7 +347,10 @@ namespace Rays
 	Bitmap::operator bool () const
 	{
 		return
-			self->width > 0 && self->height > 0 && self->color_space && self->pixels;
+			self->width  > 0  &&
+			self->height > 0  &&
+			self->color_space &&
+			self->pixels;
 	}
 
 	bool

data/src/ios/camera.mm

@@ -0,0 +1,517 @@
+// -*- mode: objc -*-
+#import "rays/camera.h"
+
+
+#import <AVFoundation/AVFoundation.h>
+#include "rays/exception.h"
+#include "bitmap.h"
+
+
+static int video_input_queue_index = 0;
+
+
+@interface VideoInput : NSObject <AVCaptureVideoDataOutputSampleBufferDelegate>
+@end
+
+
+@implementation VideoInput
+
+	{
+		AVCaptureSession* session;
+		dispatch_queue_t queue;
+		CGImageRef image;
+		AVCaptureVideoOrientation orientation;
+	}
+
+	- (id) init
+	{
+		self = [super init];
+		if (self)
+		{
+			session     = nil;
+			queue       = nil;
+			image       = nil;
+			orientation = AVCaptureVideoOrientationPortrait;
+		}
+		return self;
+	}
+
+	- (void) dealloc
+	{
+		[self stop];
+		[self clearImage];
+
+		if (queue)
+		{
+			dispatch_release(queue);
+			queue = nil;
+		}
+
+		[super dealloc];
+	}
+
+	- (dispatch_queue_t) getQueue
+	{
+		if (!queue)
+		{
+			auto name = Xot::stringf(
+				"org.xord.RaysVideoInputQueue_%d",
+				video_input_queue_index++);
+			queue = dispatch_queue_create(name, DISPATCH_QUEUE_SERIAL);
+		}
+		return queue;
+	}
+
+	- (BOOL) start: (AVCaptureDevice*) device
+		preset: (AVCaptureSessionPreset) preset
+	{
+		if (!device) return NO;
+
+		[self stop];
+		[self updateOrientation];
+
+		AVCaptureSession* sess = [[[AVCaptureSession alloc] init] autorelease];
+		if (preset != nil)
+			sess.sessionPreset = preset;
+
+		//device.activeVideoMinFrameDuration = CMTimeMake(1, 30);
+
+		NSError* error = nil;
+		AVCaptureDeviceInput* input = [[[AVCaptureDeviceInput alloc]
+			initWithDevice: device error: &error]
+			autorelease];
+		if (!input || error || ![sess canAddInput: input])
+			return NO;
+
+		AVCaptureVideoDataOutput* output =
+			[[[AVCaptureVideoDataOutput alloc] init] autorelease];
+		output.videoSettings = @{
+			(NSString*) kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA)
+		};
+		output.alwaysDiscardsLateVideoFrames = YES;
+		[output setSampleBufferDelegate: self queue: [self getQueue]];
+		if (![sess canAddOutput: output])
+			return NO;
+
+		[sess addInput: input];
+		[sess addOutput: output];
+
+		AVCaptureConnection* connection =
+			[output connectionWithMediaType: AVMediaTypeVideo];
+		if (connection)
+		{
+			if (connection.isVideoOrientationSupported)
+				[connection setVideoOrientation: orientation];
+
+			if (connection.isVideoMirroringSupported)
+			{
+				[connection setVideoMirrored:
+					device.position == AVCaptureDevicePositionFront];
+			}
+		}
+
+		[sess startRunning];
+
+		session = [sess retain];
+		return YES;
+	}
+
+	- (void) updateOrientation
+	{
+		assert(NSThread.isMainThread);
+
+		switch (UIApplication.sharedApplication.statusBarOrientation)
+		{
+			case UIInterfaceOrientationPortraitUpsideDown:
+				orientation = AVCaptureVideoOrientationPortraitUpsideDown;
+				break;
+
+			case UIInterfaceOrientationLandscapeLeft:
+				orientation = AVCaptureVideoOrientationLandscapeLeft;
+				break;
+
+			case UIInterfaceOrientationLandscapeRight:
+				orientation = AVCaptureVideoOrientationLandscapeRight;
+				break;
+
+			default:
+				orientation = AVCaptureVideoOrientationPortrait;
+				break;
+		}
+	}
+
+	- (void) captureOutput: (AVCaptureOutput*) output
+		didOutputSampleBuffer: (CMSampleBufferRef) sampleBuffer
+		fromConnection: (AVCaptureConnection*) connection
+	{
+		[connection setVideoOrientation: orientation];
+
+		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];
+			image = cgImage;
+
+			[self updateOrientation];
+		});
+	}
+
+	- (void) stop
+	{
+		if (!session) return;
+
+		[session stopRunning];
+		[session release];
+		session = nil;
+	}
+
+	- (BOOL) isActive
+	{
+		return session != nil;
+	}
+
+	- (void) clearImage
+	{
+		if (!image) return;
+
+		CGImageRelease(image);
+		image = nil;
+	}
+
+	- (CGImageRef) getImage
+	{
+		return image;
+	}
+
+@end// VideoInput
+
+
+namespace Rays
+{
+
+
+	struct Camera::Data
+	{
+
+		String device_name;
+
+		int min_width = -1, min_height = -1;
+
+		bool resize = false, crop = false;
+
+		mutable Image image;
+
+		VideoInput* video_input = nil;
+
+		AVCaptureSessionPreset get_preset (AVCaptureDevice* device)
+		{
+			int w = min_width, h = min_height;
+			if (w > 0 && h > 0)
+			{
+				#define SUPPORT(x) \
+					[device supportsAVCaptureSessionPreset: AVCaptureSessionPreset##x]
+
+				//if (w <= 320 && h <= 240 && SUPPORT(320x240))
+				//	return AVCaptureSessionPreset320x240;
+
+				if (w <= 352 && h <= 288 && SUPPORT(352x288))
+					return AVCaptureSessionPreset352x288;
+
+				if (w <= 640 && h <= 480 && SUPPORT(640x480))
+					return AVCaptureSessionPreset640x480;
+
+				//if (w <= 960 && h <= 540 && SUPPORT(960x540))
+				//	return AVCaptureSessionPreset960x540;
+
+				if (w <= 1280 && h <= 720 && SUPPORT(1280x720))
+					return AVCaptureSessionPreset1280x720;
+
+				if (/*w <= 1920 && h <= 1080 &&*/ SUPPORT(1920x1080))
+					return AVCaptureSessionPreset1920x1080;
+
+				//if (SUPPORT(3840x2160))
+				//	return AVCaptureSessionPreset3840x2160;
+
+				#undef SUPPORT
+			}
+
+			return nil;
+		}
+
+		void update_image_from_video_input () const
+		{
+			if (!video_input) return;
+
+			CGImageRef cgImage = [video_input getImage];
+			if (!cgImage) return;
+
+			coord draw_x, draw_y, draw_width, draw_height;
+			int bitmap_width, bitmap_height;
+			get_draw_bounds(
+				&draw_x, &draw_y, &draw_width, &draw_height,
+				&bitmap_width, &bitmap_height,
+				cgImage);
+
+			if (
+				!image ||
+				image.bitmap().width()  != bitmap_width ||
+				image.bitmap().height() != bitmap_height)
+			{
+				image = Image(Bitmap(bitmap_width, bitmap_height));
+			}
+
+			Bitmap_draw_image(
+				&image.bitmap(), cgImage,
+				draw_x, draw_y, draw_width, draw_height);
+
+			[video_input clearImage];
+		}
+
+		void get_draw_bounds (
+			coord* draw_x, coord* draw_y, coord* draw_width, coord* draw_height,
+			int* bitmap_width, int* bitmap_height,
+			CGImageRef image) const
+		{
+			int image_width   = (int) CGImageGetWidth(image);
+			int image_height  = (int) CGImageGetHeight(image);
+			float image_ratio = (float) image_width / (float) image_height;
+
+			if (resize && min_width > 0 && min_height > 0)
+			{
+				float min_size_ratio = (float) min_width / (float) min_height;
+				if (image_ratio > min_size_ratio)
+				{
+					*draw_width  = min_height * image_ratio;
+					*draw_height = min_height;
+				}
+				else
+				{
+					*draw_width  = min_width;
+					*draw_height = min_width / image_ratio;
+				}
+			}
+			else if (resize && min_width > 0)
+			{
+				*draw_width  = min_width;
+				*draw_height = min_width / image_ratio;
+			}
+			else if (resize && min_height > 0)
+			{
+				*draw_width  = min_height * image_ratio;
+				*draw_height = min_height;
+			}
+			else
+			{
+				*draw_width  = image_width;
+				*draw_height = image_height;
+			}
+
+			*draw_x        = 0;
+			*draw_y        = 0;
+			*bitmap_width  = *draw_width;
+			*bitmap_height = *draw_height;
+
+			if (crop && min_width > 0)
+			{
+				*draw_x       = min_width / 2 - *draw_width / 2;
+				*bitmap_width = min_width;
+			}
+			else if (crop && min_height > 0)
+			{
+				*draw_y        = min_height / 2 - *draw_height / 2;
+				*bitmap_height = min_height;
+			}
+		}
+
+	};// Camera::Data
+
+
+	static NSArray<AVCaptureDevice*>*
+	get_video_devices ()
+	{
+#if 0
+		AVCaptureDeviceDiscoverySession* discoverySession =
+			[AVCaptureDeviceDiscoverySession
+				discoverySessionWithDeviceTypes: @[
+					AVCaptureDeviceTypeBuiltInTripleCamera,
+					AVCaptureDeviceTypeBuiltInDualWideCamera,
+					AVCaptureDeviceTypeBuiltInDualCamera,
+					AVCaptureDeviceTypeBuiltInUltraWideCamera,
+					AVCaptureDeviceTypeBuiltInTelephotoCamera,
+					AVCaptureDeviceTypeBuiltInWideAngleCamera
+				]
+				mediaType: AVMediaTypeVideo
+				position: AVCaptureDevicePositionUnspecified];
+		NSArray<AVCaptureDevice*>* devices = discoverySession.devices;
+		for (AVCaptureDevice* d in devices)
+		{
+			printf("%s\n", d.localizedName.UTF8String);
+		}
+#endif
+		NSMutableArray<AVCaptureDevice*>* devices = [NSMutableArray array];
+		for (AVCaptureDevice* d in AVCaptureDevice.devices)
+		{
+			if ([d hasMediaType: AVMediaTypeVideo])
+				[devices addObject: d];
+		}
+		return devices;
+	}
+
+	static AVCaptureDevice*
+	get_default_video_device ()
+	{
+		AVCaptureDevice* device =
+			[AVCaptureDevice defaultDeviceWithMediaType: AVMediaTypeVideo];
+		if (!device)
+			rays_error(__FILE__, __LINE__, "Default camera device is not found.");
+
+		return device;
+	}
+
+	static AVCaptureDevice*
+	get_video_device (const char* name)
+	{
+		if (!name || *name == 0)
+			return get_default_video_device();
+
+		for (AVCaptureDevice* d in get_video_devices())
+		{
+			if (strcmp(name, d.localizedName.UTF8String) == 0)
+				return d;
+		}
+
+		rays_error(__FILE__, __LINE__, "Camera device '%s' is not found.", name);
+		return nil;
+	}
+
+	std::vector<String>
+	get_camera_device_names ()
+	{
+		std::vector<String> names;
+		for (AVCaptureDevice* d in get_video_devices())
+			names.emplace_back(d.localizedName.UTF8String);
+		return names;
+	}
+
+
+	Camera::Camera (
+		const char* device_name,
+		int min_width, int min_height, bool resize, bool crop)
+	{
+		if (device_name)
+			self->device_name = device_name;
+
+		self->min_width  = min_width;
+		self->min_height = min_height;
+		self->resize     = resize;
+		self->crop       = crop;
+	}
+
+	Camera::~Camera ()
+	{
+		stop();
+	}
+
+	bool
+	Camera::start ()
+	{
+		if (!self->video_input) self->video_input = [[VideoInput alloc] init];
+
+		AVCaptureDevice* device = get_video_device(self->device_name.c_str());
+		return [self->video_input start: device preset: self->get_preset(device)];
+	}
+
+	void
+	Camera::stop ()
+	{
+		if (!self->video_input) return;
+
+		[self->video_input stop];
+		[self->video_input release];
+		self->video_input = nil;
+	}
+
+	bool
+	Camera::is_active () const
+	{
+		return self->video_input && [self->video_input isActive];
+	}
+
+	void
+	Camera::set_min_width (int width)
+	{
+		self->min_width = width;
+	}
+
+	int
+	Camera::min_width () const
+	{
+		return self->min_width;
+	}
+
+	void
+	Camera::set_min_height (int height)
+	{
+		self->min_height = height;
+	}
+
+	int
+	Camera::min_height () const
+	{
+		return self->min_height;
+	}
+
+	void
+	Camera::set_resize (bool resize)
+	{
+		self->resize = resize;
+	}
+
+	bool
+	Camera::is_resize () const
+	{
+		return self->resize;
+	}
+
+	void
+	Camera::set_crop (bool crop)
+	{
+		self->crop = crop;
+	}
+
+	bool
+	Camera::is_crop () const
+	{
+		return self->crop;
+	}
+
+	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