rays 0.1.15 → 0.1.16

data/include/rays/ruby/rays.h

@@ -21,9 +21,9 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_OR_ARRAY_TO(Rays::CapType)
+RUCY_DECLARE_CONVERT_TO(Rays::CapType)
 
-RUCY_DECLARE_VALUE_OR_ARRAY_TO(Rays::JoinType)
+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,21 @@
+# -*- coding: utf-8 -*-
+
+
+require 'xot/block_util'
+require 'rays/ext'
+
+
+module Rays
+
+
+  class Camera
+
+    def initialize (*args, &block)
+      super *args
+      Xot::BlockUtil.instance_eval_or_block_call self, &block if block
+    end
+
+  end# Camera
+
+
+end# Rays

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,21 @@
+// -*- mode: c++ -*-
+#pragma once
+#ifndef __RAYS_SRC_OSX_BITMAP_H__
+#define __RAYS_SRC_OSX_BITMAP_H__
+
+
+#import <CoreGraphics/CGImage.h>
+#include "../bitmap.h"
+
+
+namespace Rays
+{
+
+
+	void Bitmap_copy_pixels (Bitmap* bitmap, CGImageRef image);
+
+
+}// Rays
+
+
+#endif//EOH

data/src/ios/bitmap.mm

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#import "../bitmap.h"
+#import "bitmap.h"
 
 
 #import <ImageIO/CGImageDestination.h>
@@ -175,6 +175,23 @@ namespace Rays
 		return bmp;
 	}
 
+	void
+	Bitmap_copy_pixels (Bitmap* bitmap, CGImageRef image)
+	{
+		if (!bitmap || !image)
+			argument_error(__FILE__, __LINE__);
+
+		CGContextRef context = bitmap->self->get_context();
+		if (!context)
+			rays_error(__FILE__, __LINE__, "getting CGContext failed.");
+
+		size_t width  = CGImageGetWidth(image);
+		size_t height = CGImageGetHeight(image);
+		CGContextDrawImage(context, CGRectMake(0, 0, 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 +202,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 +265,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_copy_pixels(&bmp, image);
 		return bmp;
 	}
 
@@ -329,7 +343,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,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/osx/bitmap.h

@@ -0,0 +1,21 @@
+// -*- mode: c++ -*-
+#pragma once
+#ifndef __RAYS_SRC_OSX_BITMAP_H__
+#define __RAYS_SRC_OSX_BITMAP_H__
+
+
+#import <CoreGraphics/CGImage.h>
+#include "../bitmap.h"
+
+
+namespace Rays
+{
+
+
+	void Bitmap_copy_pixels (Bitmap* bitmap, CGImageRef image);
+
+
+}// Rays
+
+
+#endif//EOH

data/src/osx/bitmap.mm

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#import "../bitmap.h"
+#import "bitmap.h"
 
 
 #import <Cocoa/Cocoa.h>
@@ -174,6 +174,23 @@ namespace Rays
 		return bmp;
 	}
 
+	void
+	Bitmap_copy_pixels (Bitmap* bitmap, CGImageRef image)
+	{
+		if (!bitmap || !image)
+			argument_error(__FILE__, __LINE__);
+
+		CGContextRef context = bitmap->self->get_context();
+		if (!context)
+			rays_error(__FILE__, __LINE__, "getting CGContext failed.");
+
+		size_t width  = CGImageGetWidth(image);
+		size_t height = CGImageGetHeight(image);
+		CGContextDrawImage(context, CGRectMake(0, 0, width, height), image);
+
+		Bitmap_set_modified(bitmap);
+	}
+
 	void
 	Bitmap_draw_string (
 		Bitmap* bitmap, const RawFont& font, const char* str, coord x, coord y)
@@ -184,6 +201,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 +265,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_copy_pixels(&bmp, image);
 		return bmp;
 	}