rays 0.1.11 → 0.1.16

data/src/ios/font.mm

@@ -1,7 +1,8 @@
 // -*- objc -*-
-#include "rays/font.h"
+#include "../font.h"
 
 
+#import <CoreGraphics/CGContext.h>
 #import <CoreText/CoreText.h>
 #include "rays/exception.h"
 #include "helper.h"
@@ -11,7 +12,7 @@ namespace Rays
 {
 
 
-	struct Font::Data
+	struct RawFont::Data
 	{
 
 		CTFontRef font;
@@ -30,7 +31,7 @@ namespace Rays
 			}
 		}
 
-	};// Font::Data
+	};// RawFont::Data
 
 
 	static CTLineRef
@@ -64,29 +65,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(kCTFontSystemFontType, 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 +135,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 +163,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 +179,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/ios/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/ios/opengl.mm

@@ -1,5 +1,5 @@
 // -*- objc -*-
-#include "rays/opengl.h"
+#include "../opengl.h"
 
 
 #include <vector>
@@ -11,10 +11,25 @@ namespace Rays
 
 
 	void
-	init_offscreen_context ()
+	OpenGL_set_context (Context context)
 	{
-		EAGLContext* c = [[EAGLContext alloc] initWithAPI: kEAGLRenderingAPIOpenGLES1];
-		[EAGLContext setCurrentContext: c];
+		[EAGLContext setCurrentContext: (EAGLContext*) context];
+	}
+
+	Context
+	OpenGL_get_context ()
+	{
+		return [EAGLContext currentContext];
+	}
+
+
+	Context
+	get_offscreen_context ()
+	{
+		static Context context = NULL;
+		if (!context)
+			context = [[EAGLContext alloc] initWithAPI: kEAGLRenderingAPIOpenGLES3];
+		return context;
 	}
 
 

data/src/ios/rays.mm

@@ -4,6 +4,7 @@
 
 #import <Foundation/Foundation.h>
 #include "rays/exception.h"
+#include "../opengl.h"
 
 
 namespace Rays
@@ -27,6 +28,8 @@ namespace Rays
 			rays_error(__FILE__, __LINE__, "Rays::init(): already initialized.");
 
 		global::pool = [[NSAutoreleasePool alloc] init];
+
+		OpenGL_set_context(get_offscreen_context());
 	}
 
 	void

data/src/matrix.cpp

@@ -1,25 +1,33 @@
-#include "rays/matrix.h"
+#include "matrix.h"
+
+
+#include <glm/mat4x4.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+#include "xot/util.h"
+#include "rays/exception.h"
+#include "rays/point.h"
+#include "coord.h"
 
 
 namespace Rays
 {
 
 
-	Matrix::Matrix (float value)
+	Matrix::Matrix (coord value)
 	{
 		reset(value);
 	}
 
 	Matrix::Matrix (
-		float a1, float a2, float a3, float a4,
-		float b1, float b2, float b3, float b4,
-		float c1, float c2, float c3, float c4,
-		float d1, float d2, float d3, float d4)
+		coord x0, coord x1, coord x2, coord x3,
+		coord y0, coord y1, coord y2, coord y3,
+		coord z0, coord z1, coord z2, coord z3,
+		coord w0, coord w1, coord w2, coord w3)
 	{
-		reset(a1, a2, a3, a4, b1, b2, b3, b4, c1, c2, c3, c4, d1, d2, d3, d4);
+		reset(x0, x1, x2, x3, y0, y1, y2, y3, z0, z1, z2, z3, w0, w1, w2, w3);
 	}
 
-	Matrix::Matrix (const float* elements, size_t size)
+	Matrix::Matrix (const coord* elements, size_t size)
 	{
 		reset(elements, size);
 	}
@@ -31,7 +39,7 @@ namespace Rays
 	}
 
 	Matrix&
-	Matrix::reset (float value)
+	Matrix::reset (coord value)
 	{
 		return reset(
 			value, 0, 0, 0,
@@ -42,50 +50,127 @@ namespace Rays
 
 	Matrix&
 	Matrix::reset (
-		float a1, float a2, float a3, float a4,
-		float b1, float b2, float b3, float b4,
-		float c1, float c2, float c3, float c4,
-		float d1, float d2, float d3, float d4)
-	{
-		this->a1 = a1; this->a2 = a2; this->a3 = a3; this->a4 = a4;
-		this->b1 = b1; this->b2 = b2; this->b3 = b3; this->b4 = b4;
-		this->c1 = c1; this->c2 = c2; this->c3 = c3; this->c4 = c4;
-		this->d1 = d1; this->d2 = d2; this->d3 = d3; this->d4 = d4;
+		coord x0, coord x1, coord x2, coord x3,
+		coord y0, coord y1, coord y2, coord y3,
+		coord z0, coord z1, coord z2, coord z3,
+		coord w0, coord w1, coord w2, coord w3)
+	{
+		this->x0 = x0; this->x1 = x1; this->x2 = x2; this->x3 = x3;
+		this->y0 = y0; this->y1 = y1; this->y2 = y2; this->y3 = y3;
+		this->z0 = z0; this->z1 = z1; this->z2 = z2; this->z3 = z3;
+		this->w0 = w0; this->w1 = w1; this->w2 = w2; this->w3 = w3;
+		return *this;
+	}
+
+	Matrix&
+	Matrix::reset (const coord* elements, size_t size)
+	{
+		if (size != 16)
+			argument_error(__FILE__, __LINE__);
+
+		const coord* e = elements;
+		x0 = e[ 0]; x1 = e[ 1]; x2 = e[ 2]; x3 = e[ 3];
+		y0 = e[ 4]; y1 = e[ 5]; y2 = e[ 6]; y3 = e[ 7];
+		z0 = e[ 8]; z1 = e[ 9]; z2 = e[10]; z3 = e[11];
+		w0 = e[12]; w1 = e[13]; w2 = e[14]; w3 = e[15];
+		return *this;
+	}
+
+	Matrix&
+	Matrix::translate (coord x, coord y, coord z)
+	{
+		to_glm(*this) = glm::translate(to_glm(*this), Vec3(x, y, z));
+		return *this;
+	}
+
+	Matrix&
+	Matrix::translate (const Coord3& translate)
+	{
+		to_glm(*this) = glm::translate(to_glm(*this), to_glm(translate));
+		return *this;
+	}
+
+	Matrix&
+	Matrix::scale (coord x, coord y, coord z)
+	{
+		to_glm(*this) = glm::scale(to_glm(*this), Vec3(x, y, z));
+		return *this;
+	}
+
+	Matrix&
+	Matrix::scale (const Coord3& scale)
+	{
+		to_glm(*this) = glm::scale(to_glm(*this), to_glm(scale));
+		return *this;
+	}
+
+	Matrix&
+	Matrix::rotate (float degree, coord x, coord y, coord z)
+	{
+		to_glm(*this) = glm::rotate(
+			to_glm(*this), (float) Xot::deg2rad(degree), Vec3(x, y, z));
 		return *this;
 	}
 
 	Matrix&
-	Matrix::reset (const float* elements, size_t size)
+	Matrix::rotate (float degree, const Coord3& axis)
 	{
-		if (size != 16) return *this;
-		float* e = array;
-		for (int i = 0; i < 16; ++i) *e++ = *elements++;
+		to_glm(*this) = glm::rotate(
+			to_glm(*this), (float) Xot::deg2rad(degree), to_glm(axis));
 		return *this;
 	}
 
-	float&
+	coord&
 	Matrix::at (int row, int column)
 	{
 		return array[column * 4 + row];
 	}
 
-	float
+	coord
 	Matrix::at (int row, int column) const
 	{
 		return const_cast<Matrix*>(this)->at(row, column);
 	}
 
-	float&
+	String
+	Matrix::inspect () const
+	{
+		return Xot::stringf(
+			"%f %f %f %f, %f %f %f %f, %f %f %f %f, %f %f %f %f",
+			x0, x1, x2, x3, y0, y1, y2, y3, z0, z1, z2, z3, w0, w1, w2, w3);
+	}
+
+	coord&
 	Matrix::operator [] (int index)
 	{
 		return array[index];
 	}
 
-	float
+	coord
 	Matrix::operator [] (int index) const
 	{
 		return const_cast<Matrix*>(this)->operator[](index);
 	}
 
+	Matrix&
+	Matrix::operator *= (const Matrix& rhs)
+	{
+		to_glm(*this) *= to_glm(rhs);
+		return *this;
+	}
+
+	Point
+	Matrix::operator * (const Point& rhs) const
+	{
+		Vec4 v = to_glm(*this) * Vec4(rhs.x, rhs.y, rhs.z, 1);
+		return to_rays<Point>(Vec3(v));
+	}
+
+	Matrix
+	Matrix::operator * (const Matrix& rhs) const
+	{
+		return to_rays(to_glm(*this) * to_glm(rhs));
+	}
+
 
 }// Rays