rays 0.1.12 → 0.1.17

data/ext/rays/extconf.rb

@@ -14,13 +14,12 @@ require 'rays/module'
 
 Xot::ExtConf.new Xot, Rucy, Rays do
   setup do
-    headers    << 'boost/noncopyable.hpp' << 'ruby.h'
+    headers    << 'ruby.h'
     local_libs << 'rucy'
     libs.unshift 'gdi21', 'opengl32' if win32?
-    frameworks << 'AppKit' << 'OpenGL' if osx?
+    frameworks << 'AppKit' << 'OpenGL' << 'AVFoundation' if osx?
     $LDFLAGS   << ' -Wl,--out-implib=native.dll.a' if cygwin?
   end
 
-  dir_config 'boost'
   create_makefile 'rays/native'
 end

data/ext/rays/font.cpp

@@ -1,16 +1,10 @@
 #include "rays/ruby/font.h"
 
 
-#include <rucy.h>
 #include "defs.h"
 
 
-using namespace Rucy;
-
-using Rays::coord;
-
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Font)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::Font)
 
 #define THIS  to<Rays::Font*>(self)
 
@@ -30,20 +24,7 @@ RUCY_DEFN(initialize)
 	RUCY_CHECK_OBJ(Rays::Font, self);
 	check_arg_count(__FILE__, __LINE__, "Font#initialize", argc, 0, 1, 2);
 
-	const char* name = (argc >= 1) ? argv[0].c_str()    : NULL;
-	float size       = (argc >= 2) ? to<float>(argv[1]) : 0;
-	*THIS = Rays::Font(name, size);
-
-	return self;
-}
-RUCY_END
-
-static
-RUCY_DEF1(initialize_copy, obj)
-{
-	RUCY_CHECK_OBJ(Rays::Font, self);
-
-	*THIS = to<Rays::Font&>(obj).copy();
+	*THIS = to<Rays::Font>(argc, argv);
 	return self;
 }
 RUCY_END
@@ -80,6 +61,36 @@ RUCY_DEF0(height)
 }
 RUCY_END
 
+static
+RUCY_DEF0(ascent)
+{
+	CHECK;
+	coord ascent = 0;
+	THIS->get_height(&ascent);
+	return value(ascent);
+}
+RUCY_END
+
+static
+RUCY_DEF0(descent)
+{
+	CHECK;
+	coord descent = 0;
+	THIS->get_height(NULL, &descent);
+	return value(descent);
+}
+RUCY_END
+
+static
+RUCY_DEF0(leading)
+{
+	CHECK;
+	coord leading = 0;
+	THIS->get_height(NULL, NULL, &leading);
+	return value(leading);
+}
+RUCY_END
+
 
 static Class cFont;
 
@@ -91,14 +102,53 @@ Init_font ()
 	cFont = mRays.define_class("Font");
 	cFont.define_alloc_func(alloc);
 	cFont.define_private_method("initialize", initialize);
-	cFont.define_private_method("initialize_copy", initialize_copy);
 	cFont.define_method("name", name);
 	cFont.define_method("size", size);
-	cFont.define_method("width", width);
-	cFont.define_method("height", height);
+	cFont.define_method("width",   width);
+	cFont.define_method("height",  height);
+	cFont.define_method("ascent",  ascent);
+	cFont.define_method("descent", descent);
+	cFont.define_method("leading", leading);
 }
 
 
+namespace Rucy
+{
+
+
+	template <> Rays::Font
+	value_to<Rays::Font> (int argc, const Value* argv, bool convert)
+	{
+		if (argc == 1 && argv->is_array())
+		{
+			argc = argv->size();
+			argv = argv->as_array();
+		}
+
+		assert(argc == 0 || (argc > 0 && argv));
+
+		if (convert)
+		{
+			if (argc == 0)
+				return Rays::default_font();
+
+			coord size = argc >= 2 ? to<coord>(argv[1]) : 0;
+			if (argv->is_nil())
+				return Rays::Font(NULL, size);
+			else if (argv->is_s() || argv->is_sym())
+				return Rays::Font(argv[0].c_str(), size);
+		}
+
+		if (argc != 1)
+			argument_error(__FILE__, __LINE__);
+
+		return value_to<Rays::Font&>(*argv, convert);
+	}
+
+
+}// Rucy
+
+
 namespace Rays
 {
 

data/ext/rays/image.cpp

@@ -1,19 +1,12 @@
 #include "rays/ruby/image.h"
 
 
-#include <rucy.h>
 #include "rays/ruby/color_space.h"
 #include "rays/ruby/bitmap.h"
-#include "rays/ruby/texture.h"
 #include "rays/ruby/painter.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-using Rays::coord;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Rays::Image)
 
 #define THIS  to<Rays::Image*>(self)
@@ -32,26 +25,28 @@ static
 RUCY_DEFN(initialize)
 {
 	RUCY_CHECK_OBJ(Rays::Image, self);
-	check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2, 3);
-
-	if (argc == 0) return self;
+	check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2, 3, 4);
 
 	if (argv[0].is_kind_of(Rays::bitmap_class()))
 	{
 		check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2);
 
 		const Rays::Bitmap* bitmap = to<Rays::Bitmap*>(argv[0]);
-		if (!bitmap) argument_error(__FILE__, __LINE__);
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
 
-		bool alpha_only = (argc == 2) ? to<bool>(argv[1]) : false;
-		*THIS = Rays::Image(*bitmap, alpha_only);
+		float pixel_density = (argc >= 2) ? to<float>(argv[1]) : 1;
+		*THIS = Rays::Image(*bitmap, pixel_density);
 	}
 	else
 	{
-		int width  = to<int>(argv[0]);
-		int height = to<int>(argv[1]);
-		uint colorspace = (argc == 3) ? to<uint>(argv[2]) : (uint) Rays::RGBA;
-		*THIS = Rays::Image(width, height, (Rays::ColorSpaceType) colorspace);
+		check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 2, 3, 4);
+
+		int width           = to<int>(argv[0]);
+		int height          = to<int>(argv[1]);
+		Rays::ColorSpace cs = (argc >= 3) ? to<Rays::ColorSpace>(argv[2]) : Rays::RGBA;
+		float pixel_density = (argc >= 4) ? to<float>(argv[3]) : 1;
+		*THIS = Rays::Image(width, height, cs, pixel_density);
 	}
 
 	return self;
@@ -63,19 +58,11 @@ RUCY_DEF1(initialize_copy, obj)
 {
 	RUCY_CHECK_OBJ(Rays::Image, self);
 
-	*THIS = to<Rays::Image&>(obj).copy();
+	*THIS = to<Rays::Image&>(obj).dup();
 	return self;
 }
 RUCY_END
 
-static
-RUCY_DEF0(painter)
-{
-	CHECK;
-	return value(THIS->painter());
-}
-RUCY_END
-
 static
 RUCY_DEF0(width)
 {
@@ -101,26 +88,26 @@ RUCY_DEF0(color_space)
 RUCY_END
 
 static
-RUCY_DEF0(alpha_only)
+RUCY_DEF0(pixel_density)
 {
 	CHECK;
-	return value(THIS->alpha_only());
+	return value(THIS->pixel_density());
 }
 RUCY_END
 
 static
-RUCY_DEF0(bitmap)
+RUCY_DEF0(painter)
 {
 	CHECK;
-	return value(THIS->bitmap());
+	return value(THIS->painter());
 }
 RUCY_END
 
 static
-RUCY_DEF0(texture)
+RUCY_DEF0(bitmap)
 {
 	CHECK;
-	return value(THIS->texture());
+	return value(THIS->bitmap());
 }
 RUCY_END
 
@@ -135,9 +122,11 @@ RUCY_END
 
 
 static
-RUCY_DEF2(load, path, alpha_only)
+RUCY_DEFN(load)
 {
-	return value(Rays::load_image(path.c_str(), to<bool>(alpha_only)));
+	check_arg_count(__FILE__, __LINE__, "Image.load", argc, 1);
+
+	return value(Rays::load_image(argv[0].c_str()));
 }
 RUCY_END
 
@@ -151,17 +140,16 @@ Init_image ()
 
 	cImage = mRays.define_class("Image");
 	cImage.define_alloc_func(alloc);
-	cImage.define_private_method("initialize", initialize);
+	cImage.define_private_method("initialize",      initialize);
 	cImage.define_private_method("initialize_copy", initialize_copy);
-	cImage.define_method("painter", painter);
-	cImage.define_method("width", width);
+	cImage.define_method("width",  width);
 	cImage.define_method("height", height);
 	cImage.define_method("color_space", color_space);
-	cImage.define_method("alpha_only", alpha_only);
+	cImage.define_method("pixel_density", pixel_density);
+	cImage.define_method("painter", painter);
 	cImage.define_method("bitmap", bitmap);
-	cImage.define_method("texture", texture);
 	cImage.define_method("save", save);
-	cImage.define_function("load_image", load);
+	cImage.define_module_function("load", load);
 }
 
 

data/ext/rays/matrix.cpp

@@ -1,14 +1,11 @@
 #include "rays/ruby/matrix.h"
 
 
-#include <rucy.h>
+#include "rays/ruby/point.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Matrix)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::Matrix)
 
 #define THIS  to<Rays::Matrix*>(self)
 
@@ -28,22 +25,8 @@ RUCY_DEFN(initialize)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Matrix#initialize", argc, 0, 1, 16);
 
-	if (argc == 0) return self;
-
-	switch (argc)
-	{
-		case 1:
-			*THIS = Rays::Matrix(to<float>(argv[0]));
-			break;
-
-		case 16:
-			*THIS = Rays::Matrix(
-				to<float>(argv[0]),  to<float>(argv[1]),  to<float>(argv[2]),  to<float>(argv[3]),
-				to<float>(argv[4]),  to<float>(argv[5]),  to<float>(argv[6]),  to<float>(argv[7]),
-				to<float>(argv[8]),  to<float>(argv[9]),  to<float>(argv[10]), to<float>(argv[11]),
-				to<float>(argv[12]), to<float>(argv[13]), to<float>(argv[14]), to<float>(argv[15]));
-			break;
-	}
+	if (argc > 0)
+		*THIS = to<Rays::Matrix>(argc, argv);
 
 	return self;
 }
@@ -59,23 +42,23 @@ RUCY_DEF1(initialize_copy, obj)
 RUCY_END
 
 static
-RUCY_DEFN(set)
+RUCY_DEFN(reset)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "Matrix#initialize", argc, 0, 1, 16);
+	check_arg_count(__FILE__, __LINE__, "Matrix#reset", argc, 0, 1, 16);
 
 	switch (argc)
 	{
 		case 0:
-			*THIS = Rays::Matrix();
+			THIS->reset();
 			break;
 
 		case 1:
-			*THIS = Rays::Matrix(to<float>(argv[0]));
+			THIS->reset(to<float>(argv[0]));
 			break;
 
 		case 16:
-			*THIS = Rays::Matrix(
+			THIS->reset(
 				to<float>(argv[0]),  to<float>(argv[1]),  to<float>(argv[2]),  to<float>(argv[3]),
 				to<float>(argv[4]),  to<float>(argv[5]),  to<float>(argv[6]),  to<float>(argv[7]),
 				to<float>(argv[8]),  to<float>(argv[9]),  to<float>(argv[10]), to<float>(argv[11]),
@@ -88,13 +71,140 @@ RUCY_DEFN(set)
 RUCY_END
 
 static
-RUCY_DEF2(at, row, column)
+RUCY_DEFN(translate)
+{
+	CHECK;
+	check_arg_count(__FILE__, __LINE__, "Matrix#translate", argc, 1, 2, 3);
+
+	THIS->translate(to<Rays::Point>(argc, argv));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEFN(scale)
+{
+	CHECK;
+	check_arg_count(__FILE__, __LINE__, "Matrix#scale", argc, 1, 2, 3);
+
+	THIS->scale(to<Rays::Point>(argc, argv));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEFN(rotate)
+{
+	CHECK;
+	check_arg_count(__FILE__, __LINE__, "Matrix#rotate", argc, 1, 2, 4);
+
+	float degree = to<float>(argv[0]);
+
+	if (argc == 1)
+		THIS->rotate(degree);
+	else
+		THIS->rotate(degree, to<Rays::Point>(argc - 1, argv + 1));
+
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(to_a)
+{
+	CHECK;
+	return array(
+		THIS->x0, THIS->y0, THIS->z0, THIS->w0,
+		THIS->x1, THIS->y1, THIS->z1, THIS->w1,
+		THIS->x2, THIS->y2, THIS->z2, THIS->w2,
+		THIS->x3, THIS->y3, THIS->z3, THIS->w3);
+}
+RUCY_END
+
+static
+RUCY_DEF1(mult, val)
+{
+	CHECK;
+
+	if (val.is_kind_of(Rays::matrix_class()))
+		return value(*THIS * to<Rays::Matrix&>(val));
+
+	if (val.is_kind_of(Rays::point_class()))
+		return value(*THIS * to<Rays::Point&>(val));
+
+	if (val.is_array())
+	{
+		if (val.size() == 16)
+			return value(*THIS * to<Rays::Matrix>(val));
+		else
+			return value(*THIS * to<Rays::Point>(val));
+	}
+
+	argument_error(__FILE__, __LINE__);
+}
+RUCY_END
+
+static
+RUCY_DEF3(set_at, row, column, val)
+{
+	CHECK;
+	return value(THIS->at(row.as_i(), column.as_i()) = to<float>(val));
+}
+RUCY_END
+
+static
+RUCY_DEF2(get_at, row, column)
 {
 	CHECK;
 	return value(THIS->at(row.as_i(), column.as_i()));
 }
 RUCY_END
 
+static
+RUCY_DEF1(compare, other)
+{
+	CHECK;
+
+	const Rays::Matrix& a = *THIS;
+	const Rays::Matrix& b = to<const Rays::Matrix&>(other);
+	for (int i = 0; i < Rays::Matrix::NELEM; ++i)
+	{
+		if (a[i] == b[i]) continue;
+		return value(a[i] < b[i] ? -1 : +1);
+	}
+	return value(0);
+}
+RUCY_END
+
+static
+RUCY_DEF0(inspect)
+{
+	CHECK;
+	return value(Xot::stringf("#<Rays::Matrix %s>", THIS->inspect().c_str()));
+}
+RUCY_END
+
+static
+RUCY_DEFN(s_translate)
+{
+	return translate(argc, argv, value(Rays::Matrix()));
+}
+RUCY_END
+
+static
+RUCY_DEFN(s_scale)
+{
+	return scale(argc, argv, value(Rays::Matrix()));
+}
+RUCY_END
+
+static
+RUCY_DEFN(s_rotate)
+{
+	return rotate(argc, argv, value(Rays::Matrix()));
+}
+RUCY_END
+
 
 static Class cMatrix;
 
@@ -105,13 +215,71 @@ Init_matrix ()
 
 	cMatrix = mRays.define_class("Matrix");
 	cMatrix.define_alloc_func(alloc);
-	cMatrix.define_private_method("initialize", initialize);
+	cMatrix.define_private_method("initialize",      initialize);
 	cMatrix.define_private_method("initialize_copy", initialize_copy);
-	cMatrix.define_method("set", set);
-	cMatrix.define_method("at", at);
+	cMatrix.define_method("reset", reset);
+	cMatrix.define_method("translate", translate);
+	cMatrix.define_method("scale",     scale);
+	cMatrix.define_method("rotate",    rotate);
+	cMatrix.define_method("to_a", to_a);
+	cMatrix.define_method("*", mult);
+	cMatrix.define_method("[]=", set_at);
+	cMatrix.define_method("[]",  get_at);
+	cMatrix.define_method("<=>", compare);
+	cMatrix.define_method("inspect", inspect);
+
+	cMatrix.define_singleton_method("translate", s_translate);
+	cMatrix.define_singleton_method("scale",     s_scale);
+	cMatrix.define_singleton_method("rotate",    s_rotate);
 }
 
 
+namespace Rucy
+{
+
+
+	template <> Rays::Matrix
+	value_to<Rays::Matrix> (int argc, const Value* argv, bool convert)
+	{
+		if (argc == 1 && argv->is_array())
+		{
+			argc = argv->size();
+			argv = argv->as_array();
+		}
+
+		assert(argc == 0 || (argc > 0 && argv));
+
+		if (convert)
+		{
+			if (argc == 0)
+				return Rays::Matrix();
+			else if (argv->is_num())
+			{
+				switch (argc)
+				{
+					#define V(i) argv[i].as_f(true)
+					case 1:  return Rays::Matrix(V(0));
+					case 16: return Rays::Matrix(
+						V(0),  V(1),  V(2),  V(3),
+						V(4),  V(5),  V(6),  V(7),
+						V(8),  V(9),  V(10), V(11),
+						V(12), V(13), V(14), V(15));
+					#undef V
+					default: argument_error(__FILE__, __LINE__);
+				}
+			}
+		}
+
+		if (argc != 1)
+			argument_error(__FILE__, __LINE__);
+
+		return value_to<Rays::Matrix&>(*argv, convert);
+	}
+
+
+}// Rucy
+
+
 namespace Rays
 {