rays 0.1.11 → 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/osx/font.mm

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#include "rays/font.h"
+#include "../font.h"
 
 
 #include <ApplicationServices/ApplicationServices.h>
@@ -11,7 +11,7 @@ namespace Rays
 {
 
 
-	struct Font::Data
+	struct RawFont::Data
 	{
 
 		CTFontRef font;
@@ -30,7 +30,7 @@ namespace Rays
 			}
 		}
 
-	};// Font::Data
+	};// RawFont::Data
 
 
 	static CTLineRef
@@ -64,29 +64,61 @@ namespace Rays
 	}
 
 
-	Font::Font ()
+	RawFont::RawFont ()
 	{
 	}
 
-	Font::Font (const char* name, coord size)
+	RawFont::RawFont (const char* name, coord size)
 	{
 		self->font = name
-			? CTFontCreateWithName(cfstring(name).get(), size, NULL)
-			: CTFontCreateUIFontForLanguage(kCTFontSystemFontType, size, NULL);
+			?	CTFontCreateWithName(cfstring(name).get(), size, NULL)
+			:	CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, size, NULL);
 	}
 
-	Font::~Font ()
+	RawFont::~RawFont ()
 	{
 	}
 
-	Font
-	Font::copy () const
+	void
+	RawFont::draw_string (
+		void* context_, coord context_height,
+		const char* str, coord x, coord y) const
 	{
-		return Font(name(), size());
+		CGContextRef context = (CGContextRef) context_;
+
+		if (!*this || !context || !str)
+			argument_error(__FILE__, __LINE__);
+
+		if (*str == '\0') return;
+
+		CTLineRef line = make_line(self->font, str);
+		if (!line)
+			rays_error(__FILE__, __LINE__, "creating CTLineRef failed.");
+
+		coord width = 0, height = 0, ascent = 0;
+		width  = get_width(str);
+		height = get_height(&ascent);
+
+		height = ceil(height);
+		ascent = floor(ascent);
+
+		CGRect rect = CGRectMake(x, context_height - height - y, width, height);
+		CGContextClearRect(context, rect);
+		//CGContextSetRGBFillColor(context, 0, 0, 0, 1);
+		//CGContextFillRect(context, rect);
+		CGContextSetRGBFillColor(context, 1, 1, 1, 1);
+
+		CGContextSaveGState(context);
+		CGContextSetTextMatrix(context, CGAffineTransformIdentity);
+		CGContextSetTextPosition(context, x, context_height - ascent - y);
+		CTLineDraw(line, context);
+		CGContextRestoreGState(context);
+
+		CFRelease(line);
 	}
 
 	String
-	Font::name () const
+	RawFont::name () const
 	{
 		if (!*this) return "";
 
@@ -102,14 +134,14 @@ namespace Rays
 	}
 
 	coord
-	Font::size () const
+	RawFont::size () const
 	{
 		if (!*this) return 0;
 		return CTFontGetSize(self->font);
 	}
 
 	coord
-	Font::get_width (const char* str) const
+	RawFont::get_width (const char* str) const
 	{
 		if (!str)
 			argument_error(__FILE__, __LINE__);
@@ -130,7 +162,7 @@ namespace Rays
 	}
 
 	coord
-	Font::get_height (coord* ascent, coord* descent, coord* leading) const
+	RawFont::get_height (coord* ascent, coord* descent, coord* leading) const
 	{
 		if (!*this)
 			invalid_state_error(__FILE__, __LINE__);
@@ -146,61 +178,16 @@ namespace Rays
 		return asc + desc + lead;
 	}
 
-	Font::operator bool () const
+	RawFont::operator bool () const
 	{
 		return !!self->font;
 	}
 
 	bool
-	Font::operator ! () const
+	RawFont::operator ! () const
 	{
 		return !operator bool();
 	}
 
 
-	const Font&
-	default_font ()
-	{
-		static const Font FONT(NULL);
-		return FONT;
-	}
-
-
-	void
-	draw_string (
-		CGContextRef context, coord context_height,
-		const char* str, coord x, coord y, const Font& font)
-	{
-		if (!context || !str || !font)
-			argument_error(__FILE__, __LINE__);
-
-		if (*str == '\0') return;
-
-		CTLineRef line = make_line(font.self->font, str);
-		if (!line)
-			rays_error(__FILE__, __LINE__, "creating CTLineRef failed.");
-
-		coord width = 0, height = 0, ascent = 0;
-		width  = font.get_width(str);
-		height = font.get_height(&ascent);
-
-		height = ceil(height);
-		ascent = floor(ascent);
-
-		CGRect rect = CGRectMake(x, context_height - height - y, width, height);
-		CGContextClearRect(context, rect);
-		//CGContextSetRGBFillColor(context, 0, 0, 0, 1);
-		//CGContextFillRect(context, rect);
-		CGContextSetRGBFillColor(context, 1, 1, 1, 1);
-
-		CGContextSaveGState(context);
-		CGContextSetTextMatrix(context, CGAffineTransformIdentity);
-		CGContextSetTextPosition(context, x, context_height - ascent - y);
-		CTLineDraw(line, context);
-		CGContextRestoreGState(context);
-
-		CFRelease(line);
-	}
-
-
 }// Rays

data/src/osx/helper.h

@@ -4,7 +4,7 @@
 #define __RAYS_SRC_OSX_HELPER_H__
 
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <CoreFoundation/CoreFoundation.h>
 
 
@@ -15,7 +15,7 @@ namespace Rays
 	void safe_cfrelease (CFTypeRef ref);
 
 
-	typedef boost::shared_ptr<const __CFString> CFString;
+	typedef std::shared_ptr<const __CFString> CFString;
 
 	CFString cfstring (const char* str);
 

data/src/osx/opengl.mm

@@ -1,102 +1,38 @@
 // -*- objc -*-
-#include "rays/opengl.h"
+#include "../opengl.h"
 
 
-#include <vector>
-#import <Cocoa/Cocoa.h>
-#import <AppKit/NSApplication.h>
-#import <AppKit/NSWindow.h>
-#import <AppKit/NSOpenGLView.h>
-#import <OpenGL/OpenGL.h>
+#import <AppKit/AppKit.h>
 
 
-static NSOpenGLPixelFormat*
-make_pixelformat ()
+namespace Rays
 {
-	static const NSOpenGLPixelFormatAttribute DEFAULT[] =
-	{
-		NSOpenGLPFAWindow,
-		//NSOpenGLPFAAccelerated,
-		NSOpenGLPFADoubleBuffer,
-		//NSOpenGLPFAColorSize, 24,
-		//NSOpenGLPFAAlphaSize, 8,
-		NSOpenGLPFADepthSize, 24,
-		//NSOpenGLPFANoRecovery,
-	};
-	static const size_t DEFAULT_SIZE  = sizeof(DEFAULT) / sizeof(DEFAULT[0]);
-
-	std::vector<NSOpenGLPixelFormatAttribute> attr(
-		DEFAULT, DEFAULT + DEFAULT_SIZE);
-	attr.push_back(0);
-
-	return [[[NSOpenGLPixelFormat alloc] initWithAttributes: &attr[0]] autorelease];
-}
-
-
-@interface OffscreenGLView : NSOpenGLView
-@end// OffscreenGLView
-
-
-@implementation OffscreenGLView
-
-	- (id) init
-	{
-		self = [super
-			initWithFrame: NSMakeRect(0, 0, 0, 0)
-			pixelFormat:   make_pixelformat()];
-		if (!self) return nil;
-
-		[[self openGLContext] makeCurrentContext];
-		return self;
-	}
-
-@end// OffscreenGLView
-
 
-@interface OffscreenWindow : NSWindow
 
+	void
+	OpenGL_set_context (Context context)
 	{
-		@private
-			OffscreenGLView* view;
-	}
-
-@end// OffscreenWindow
-
-
-@implementation OffscreenWindow
-
-	- (id) init
-	{
-		self = [super
-			initWithContentRect: NSMakeRect(0, 0, 0, 0)
-			styleMask: 0
-			backing: NSBackingStoreBuffered
-			defer: NO];
-		if (!self) return nil;
-
-		view = [[OffscreenGLView alloc] init];
-		[self setContentView: view];
-		return self;
+		NSOpenGLContext* c = (NSOpenGLContext*) context;
+		[c makeCurrentContext];
 	}
 
-	- (void) dealloc
+	Context
+	OpenGL_get_context ()
 	{
-		if (view) [view release];
-		[super dealloc];
+		return [NSOpenGLContext currentContext];
 	}
 
-@end// OffscreenWindow
-
 
-namespace Rays
-{
-
-
-	void
-	init_offscreen_context ()
+	Context
+	get_offscreen_context ()
 	{
-		[NSApplication sharedApplication];
-		[[[OffscreenWindow alloc] init] autorelease];
+		static Context context = NULL;
+		if (!context)
+		{
+			NSOpenGLPixelFormat* pf  = [NSOpenGLView defaultPixelFormat];
+			context = [[NSOpenGLContext alloc] initWithFormat: pf shareContext: nil];
+		}
+		return context;
 	}