rays 0.1.47 → 0.1.49

data/src/ios/helper.h

@@ -15,9 +15,9 @@ namespace Rays
 	void safe_cfrelease (CFTypeRef ref);
 
 
-	typedef std::shared_ptr<const __CFString> CFString;
+	typedef std::shared_ptr<const __CFString> CFStringPtr;
 
-	CFString cfstring (const char* str);
+	CFStringPtr cfstring (const char* str);
 
 
 }// Rays

data/src/ios/helper.mm

@@ -13,12 +13,12 @@ namespace Rays
 	}
 
 
-	CFString
+	CFStringPtr
 	cfstring (const char* str)
 	{
 		CFStringRef ref = CFStringCreateWithCString(
 			kCFAllocatorDefault, str, kCFStringEncodingUTF8);
-		return CFString(ref, safe_cfrelease);
+		return CFStringPtr(ref, safe_cfrelease);
 	}
 
 

data/src/matrix.cpp

@@ -13,6 +13,44 @@ namespace Rays
 {
 
 
+	Matrix
+	ortho (coord left, coord right, coord top,  coord bottom)
+	{
+		return to_rays(glm::ortho(left, right, bottom, top));
+	}
+
+	Matrix
+	ortho (coord left, coord right, coord top,  coord bottom, coord near, coord far)
+	{
+		return to_rays(glm::ortho(left, right, bottom, top, near, far));
+	}
+
+	Matrix
+	perspective (float fov_y, float aspect_ratio, coord near, coord far)
+	{
+		return to_rays(glm::perspective(
+			(float) Xot::deg2rad(fov_y), aspect_ratio, near, far));
+	}
+
+	Matrix
+	look_at (
+		coord    eye_x,    coord eye_y, coord    eye_z,
+		coord target_x, coord target_y, coord target_z,
+		coord     up_x,     coord up_y, coord     up_z)
+	{
+		return to_rays(glm::lookAt(
+			Vec3(   eye_x,    eye_y,    eye_z),
+			Vec3(target_x, target_y, target_z),
+			Vec3(    up_x,     up_y,     up_z)));
+	}
+
+	Matrix
+	look_at (const Point& eye, const Point& target, const Point& up)
+	{
+		return to_rays(glm::lookAt(to_glm(eye), to_glm(target), to_glm(up)));
+	}
+
+
 	Matrix::Matrix (coord value)
 	{
 		reset(value);
@@ -84,6 +122,13 @@ namespace Rays
 		return *this;
 	}
 
+	Matrix&
+	Matrix::transpose ()
+	{
+		to_glm(*this) = glm::transpose(to_glm(*this));
+		return *this;
+	}
+
 	Matrix&
 	Matrix::translate (coord x, coord y, coord z)
 	{

data/src/osx/font.mm

@@ -2,7 +2,9 @@
 #include "../font.h"
 
 
-#include <ApplicationServices/ApplicationServices.h>
+#include <memory>
+#import <ApplicationServices/ApplicationServices.h>
+#import <AppKit/AppKit.h>
 #include "rays/exception.h"
 #include "helper.h"
 
@@ -11,15 +13,23 @@ namespace Rays
 {
 
 
+	typedef std::shared_ptr<const __CFDictionary>       CFDictionaryPtr;
+
+	typedef std::shared_ptr<const __CFAttributedString> CFAttributedStringPtr;
+
+	typedef std::shared_ptr<CGDataProvider>             CGDataProviderPtr;
+
+	typedef std::shared_ptr<CGFont>                     CGFontPtr;
+
+	typedef std::shared_ptr<const __CTLine>             CTLinePtr;
+
+
 	struct RawFont::Data
 	{
 
-		CTFontRef font;
+		CTFontRef font = NULL;
 
-		Data ()
-		:	font(NULL)
-		{
-		}
+		String path;
 
 		~Data ()
 		{
@@ -33,7 +43,7 @@ namespace Rays
 	};// RawFont::Data
 
 
-	static CTLineRef
+	static CTLinePtr
 	make_line (CTFontRef font, const char* str)
 	{
 		if (!font || !str || *str == '\0')
@@ -49,18 +59,67 @@ namespace Rays
 		};
 		size_t nkeys = sizeof(keys) / sizeof(keys[0]);
 
-		CFDictionaryRef attr = CFDictionaryCreate(
-			NULL, (const void**) &keys, (const void**) &values, nkeys,
-			&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+		CFDictionaryPtr attr(
+			CFDictionaryCreate(
+				NULL, (const void**) &keys, (const void**) &values, nkeys,
+				&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks),
+			CFRelease);
+
+		CFAttributedStringPtr attrstr(
+			CFAttributedStringCreate(NULL, cfstring(str).get(), attr.get()),
+			CFRelease);
+
+		return CTLinePtr(
+			CTLineCreateWithAttributedString(attrstr.get()),
+			CFRelease);
+	}
+
+	const FontFamilyMap&
+	get_font_families ()
+	{
+		static const FontFamilyMap MAP = []() {
+			NSFontManager* fm = NSFontManager.sharedFontManager;
 
-		CFAttributedStringRef attrstr = CFAttributedStringCreate(
-			NULL, cfstring(str).get(), attr);
-		CFRelease(attr);
+			FontFamilyMap map;
+			for (NSString* family in fm.availableFontFamilies)
+			{
+				FontFamilyMap::mapped_type array;
+				for (NSArray<NSString*>* members in [fm availableMembersOfFontFamily: family])
+					array.emplace_back(members[0].UTF8String);
+				map[family.UTF8String] = array;
+			}
+			return map;
+		}();
+		return MAP;
+	}
 
-		CTLineRef line = CTLineCreateWithAttributedString(attrstr);
-		CFRelease(attrstr);
+	RawFont
+	RawFont_load (const char* path, coord size)
+	{
+		if (!path)
+			argument_error(__FILE__, __LINE__);
 
-		return line;
+		CGDataProviderPtr data_provider(
+			CGDataProviderCreateWithFilename(path),
+			CGDataProviderRelease);
+		if (!data_provider)
+			rays_error(__FILE__, __LINE__, "failed to create CGDataProvider");
+
+		CGFontPtr cgfont(
+			CGFontCreateWithDataProvider(data_provider.get()),
+			CGFontRelease);
+		if (!cgfont)
+			rays_error(__FILE__, __LINE__, "failed to create CGFont");
+
+		CTFontRef ctfont = CTFontCreateWithGraphicsFont(
+			cgfont.get(), size, NULL, NULL);
+		if (!ctfont)
+			rays_error(__FILE__, __LINE__, "failed to create CTFont");
+
+		RawFont rawfont;
+		rawfont.self->font = ctfont;
+		rawfont.self->path = path;
+		return rawfont;
 	}
 
 
@@ -75,6 +134,15 @@ namespace Rays
 			:	CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, size, NULL);
 	}
 
+	RawFont::RawFont (const This& obj, coord size)
+	{
+		const char* path = obj.self->path.empty() ? NULL : obj.self->path.c_str();
+		if (path)
+			*this = RawFont_load(path, size);
+		else
+			self->font = CTFontCreateWithName(cfstring(obj.name()).get(), size, NULL);
+	}
+
 	RawFont::~RawFont ()
 	{
 	}
@@ -91,15 +159,13 @@ namespace Rays
 
 		if (*str == '\0') return;
 
-		CTLineRef line = make_line(self->font, str);
+		CTLinePtr 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);
+		coord width, height, ascent = 0;
+		width  = ceil(get_width(str));
+		height = ceil(get_height(&ascent));
 		ascent = floor(ascent);
 
 		CGRect rect = CGRectMake(x, context_height - height - y, width, height);
@@ -109,10 +175,8 @@ namespace Rays
 		CGContextSaveGState(context);
 		CGContextSetTextMatrix(context, CGAffineTransformIdentity);
 		CGContextSetTextPosition(context, x, context_height - ascent - y);
-		CTLineDraw(line, context);
+		CTLineDraw(line.get(), context);
 		CGContextRestoreGState(context);
-
-		CFRelease(line);
 	}
 
 	String
@@ -120,14 +184,13 @@ namespace Rays
 	{
 		if (!*this) return "";
 
-		CFStringRef str = CTFontCopyFullName(self->font);
+		CFStringPtr str(CTFontCopyFullName(self->font), CFRelease);
 
 		enum {BUFSIZE = 2048};
 		char buf[BUFSIZE + 1];
-		if (!CFStringGetCString(str, buf, BUFSIZE, kCFStringEncodingUTF8))
+		if (!CFStringGetCString(str.get(), buf, BUFSIZE, kCFStringEncodingUTF8))
 			buf[0] = '\0';
 
-		CFRelease(str);
 		return buf;
 	}
 
@@ -149,14 +212,11 @@ namespace Rays
 
 		if (*str == '\0') return 0;
 
-		CTLineRef line = make_line(self->font, str);
+		CTLinePtr line = make_line(self->font, str);
 		if (!line)
 			rays_error(__FILE__, __LINE__, "creating CTLineRef failed.");
 
-		coord w = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
-		CFRelease(line);
-
-		return w;
+		return CTLineGetTypographicBounds(line.get(), NULL, NULL, NULL);
 	}
 
 	coord

data/src/osx/helper.h

@@ -15,9 +15,9 @@ namespace Rays
 	void safe_cfrelease (CFTypeRef ref);
 
 
-	typedef std::shared_ptr<const __CFString> CFString;
+	typedef std::shared_ptr<const __CFString> CFStringPtr;
 
-	CFString cfstring (const char* str);
+	CFStringPtr cfstring (const char* str);
 
 
 }// Rays

data/src/osx/helper.mm

@@ -13,12 +13,12 @@ namespace Rays
 	}
 
 
-	CFString
+	CFStringPtr
 	cfstring (const char* str)
 	{
 		CFStringRef ref = CFStringCreateWithCString(
 			kCFAllocatorDefault, str, kCFStringEncodingUTF8);
-		return CFString(ref, safe_cfrelease);
+		return CFStringPtr(ref, safe_cfrelease);
 	}