rays 0.1.12 → 0.1.13

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/ext/rays/bitmap.cpp

@@ -1,23 +1,12 @@
 #include "rays/ruby/bitmap.h"
 
 
-#include <rucy.h>
-#include "rays/exception.h"
 #include "rays/ruby/color_space.h"
 #include "rays/ruby/color.h"
 #include "rays/ruby/font.h"
-#include "rays/ruby/texture.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-using Rays::uchar;
-using Rays::ushort;
-using Rays::uint;
-using Rays::coord;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Rays::Bitmap)
 
 #define THIS  to<Rays::Bitmap*>(self)
@@ -33,42 +22,25 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF1(initialize_copy, obj)
+RUCY_DEFN(initialize)
 {
 	RUCY_CHECK_OBJ(Rays::Bitmap, self);
+	check_arg_count(__FILE__, __LINE__, "Bitmap#initialize", argc, 2, 3);
 
-	*THIS = to<Rays::Bitmap&>(obj).copy();
-	return self;
-}
-RUCY_END
+	*THIS = Rays::Bitmap(
+		to<int>(argv[0]), to<int>(argv[1]),
+		argc >= 3 ? to<Rays::ColorSpace>(argv[2]) : Rays::RGBA);
 
-static
-RUCY_DEF3(setup, width, height, color_space)
-{
-	RUCY_CHECK_OBJ(Rays::Bitmap, self);
-
-	Rays::ColorSpace* cs = to<Rays::ColorSpace*>(color_space);
-	if (!cs)
-		argument_error(__FILE__, __LINE__);
-
-	*THIS = Rays::Bitmap(to<int>(width), to<int>(height), *cs);
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEFN(draw_string)
+RUCY_DEF1(initialize_copy, obj)
 {
-	CHECK;
-	check_arg_count(__FILE__, __LINE__, "Bitmap#draw_string", argc, 1, 2, 3, 4);
-
-	const char* str        = to<const char*>(argv[0]);
-	coord x                = argc >= 2 ? to<coord>(argv[1]) : 0;
-	coord y                = argc >= 3 ? to<coord>(argv[2]) : 0;
-	const Rays::Font* font = argc >= 4
-		? to<Rays::Font*>(argv[3]) : &Rays::default_font();
+	RUCY_CHECK_OBJ(Rays::Bitmap, self);
 
-	Rays::draw_string(THIS, str, x, y, *font);
+	*THIS = to<Rays::Bitmap&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -101,54 +73,28 @@ RUCY_DEF0(color_space)
 RUCY_END
 
 static
-RUCY_DEF2(at, x, y)
-{
-	CHECK;
-
-	return value(Rays::Color(THIS->at<void>(x.as_i(), y.as_i()), THIS->color_space()));
-}
-RUCY_END
-
-static
-RUCY_DEF3(set_at, x, y, color)
+RUCY_DEFN(set_at)
 {
 	CHECK;
+	check_arg_count(__FILE__, __LINE__, "Bitmap#set_at", argc, 3, 4, 5, 6);
 
-	Rays::Color* col = to<Rays::Color*>(color);
-	if (!col)
-		argument_error(__FILE__, __LINE__);
-
-	col->get(THIS->at<void>(x.as_i(), y.as_i()), THIS->color_space());
+	int x = to<int>(argv[0]);
+	int y = to<int>(argv[1]);
+	Rays::Color color = to<Rays::Color>(argc - 2, argv + 2);
 
-	return color;
+	color.get(THIS->at<void>(x, y), THIS->color_space());
+	return value(color);
 }
 RUCY_END
 
 static
-RUCY_DEFN(to_texture)
+RUCY_DEF2(get_at, x, y)
 {
 	CHECK;
 
-	bool alpha_only = (argc >= 1) ? to<bool>(argv[0]) : false;
-	return value(Rays::Texture(*THIS, alpha_only));
-}
-RUCY_END
-
-static
-RUCY_DEF1(save, path)
-{
-	CHECK;
-
-	Rays::save_bitmap(*THIS, path.c_str());
-	return self;
-}
-RUCY_END
-
-
-static
-RUCY_DEF1(load, path)
-{
-	return value(Rays::load_bitmap(path.c_str()));
+	int xx = to<int>(x);
+	int yy = to<int>(y);
+	return value(Rays::Color(THIS->at<void>(xx, yy), THIS->color_space()));
 }
 RUCY_END
 
@@ -162,17 +108,13 @@ Init_bitmap ()
 
 	cBitmap = mRays.define_class("Bitmap");
 	cBitmap.define_alloc_func(alloc);
+	cBitmap.define_private_method("initialize",      initialize);
 	cBitmap.define_private_method("initialize_copy", initialize_copy);
-	cBitmap.define_private_method("setup", setup);
-	cBitmap.define_method("draw_string", draw_string);
 	cBitmap.define_method("width", width);
 	cBitmap.define_method("height", height);
 	cBitmap.define_method("color_space", color_space);
-	cBitmap.define_method("[]", at);
-	cBitmap.define_method("set_at", set_at);
-	cBitmap.define_method("to_texture", to_texture);
-	cBitmap.define_method("save", save);
-	cBitmap.define_function("load", load);
+	cBitmap.define_method("[]=", set_at);
+	cBitmap.define_method("[]",  get_at);
 }
 
 

data/ext/rays/bounds.cpp

@@ -1,17 +1,11 @@
 #include "rays/ruby/bounds.h"
 
 
-#include <rucy.h>
 #include "rays/ruby/point.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-using Rays::coord;
-
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Bounds)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::Bounds)
 
 #define THIS  to<Rays::Bounds*>(self)
 
@@ -31,35 +25,8 @@ RUCY_DEFN(initialize)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#initialize", argc, 0, 1, 2, 3, 4, 6);
 
-	if (argc == 0) return self;
-
-	switch (argc)
-	{
-		case 1:
-			*THIS = Rays::Bounds(to<coord>(argv[0]));
-			break;
-
-		case 2:
-			*THIS = Rays::Bounds(to<coord>(argv[0]), to<coord>(argv[1]));
-			break;
-
-		case 3:
-			*THIS = Rays::Bounds(
-				to<coord>(argv[0]), to<coord>(argv[1]), to<coord>(argv[2]));
-			break;
-
-		case 4:
-			*THIS = Rays::Bounds(
-				to<coord>(argv[0]), to<coord>(argv[1]),
-				to<coord>(argv[2]), to<coord>(argv[3]));
-			break;
-
-		case 6:
-			*THIS = Rays::Bounds(
-				to<coord>(argv[0]), to<coord>(argv[1]), to<coord>(argv[2]),
-				to<coord>(argv[3]), to<coord>(argv[4]), to<coord>(argv[5]));
-			break;
-	}
+	if (argc >= 1)
+		*THIS = to<Rays::Bounds>(argc, argv);
 
 	return self;
 }
@@ -69,6 +36,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
+
 	*THIS = to<Rays::Bounds&>(obj);
 	return self;
 }
@@ -117,7 +85,7 @@ RUCY_DEFN(move_to)
 		}
 
 		const Rays::Point& p = THIS->position();
-		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : p.x;
+		coord x =               argv[0]  ? to<coord>(argv[0]) : p.x;
 		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : p.y;
 		coord z = (argc >= 3 && argv[2]) ? to<coord>(argv[2]) : p.z;
 		THIS->move_to(x, y, z);
@@ -143,7 +111,7 @@ RUCY_DEFN(move_by)
 			argv = argv[0].as_array();
 		}
 
-		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : 0;
+		coord x =               argv[0]  ? to<coord>(argv[0]) : 0;
 		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : 0;
 		coord z = (argc >= 3 && argv[2]) ? to<coord>(argv[2]) : 0;
 		THIS->move_by(x, y, z);
@@ -170,7 +138,7 @@ RUCY_DEFN(resize_to)
 		}
 
 		const Rays::Point& p = THIS->size();
-		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : p.x;
+		coord x =               argv[0]  ? to<coord>(argv[0]) : p.x;
 		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : p.y;
 		coord z = (argc >= 3 && argv[2]) ? to<coord>(argv[2]) : p.z;
 		THIS->resize_to(x, y, z);
@@ -196,7 +164,7 @@ RUCY_DEFN(resize_by)
 			argv = argv[0].as_array();
 		}
 
-		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : 0;
+		coord x =               argv[0]  ? to<coord>(argv[0]) : 0;
 		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : 0;
 		coord z = (argc >= 3 && argv[2]) ? to<coord>(argv[2]) : 0;
 		THIS->resize_by(x, y, z);
@@ -222,7 +190,7 @@ RUCY_DEFN(inset_by)
 			argv = argv[0].as_array();
 		}
 
-		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : 0;
+		coord x =               argv[0]  ? to<coord>(argv[0]) : 0;
 		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : 0;
 		coord z = (argc >= 3 && argv[2]) ? to<coord>(argv[2]) : 0;
 		THIS->inset_by(x, y, z);
@@ -232,12 +200,22 @@ RUCY_DEFN(inset_by)
 }
 RUCY_END
 
+static
+RUCY_DEF0(is_valid)
+{
+	CHECK;
+
+	return value(THIS->operator bool());
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_x, x)
 {
 	CHECK;
 
-	return value(THIS->x = to<coord>(x));
+	THIS->x = to<coord>(x);
+	return x;
 }
 RUCY_END
 
@@ -255,7 +233,8 @@ RUCY_DEF1(set_y, y)
 {
 	CHECK;
 
-	return value(THIS->y = to<coord>(y));
+	THIS->y = to<coord>(y);
+	return y;
 }
 RUCY_END
 
@@ -273,7 +252,8 @@ RUCY_DEF1(set_z, z)
 {
 	CHECK;
 
-	return value(THIS->z = to<coord>(z));
+	THIS->z = to<coord>(z);
+	return z;
 }
 RUCY_END
 
@@ -291,7 +271,8 @@ RUCY_DEF1(set_width, width)
 {
 	CHECK;
 
-	return value(THIS->width = to<coord>(width));
+	THIS->width = to<coord>(width);
+	return width;
 }
 RUCY_END
 
@@ -309,7 +290,8 @@ RUCY_DEF1(set_height, height)
 {
 	CHECK;
 
-	return value(THIS->height = to<coord>(height));
+	THIS->height = to<coord>(height);
+	return height;
 }
 RUCY_END
 
@@ -327,7 +309,8 @@ RUCY_DEF1(set_depth, depth)
 {
 	CHECK;
 
-	return value(THIS->depth = to<coord>(depth));
+	THIS->depth = to<coord>(depth);
+	return depth;
 }
 RUCY_END
 
@@ -344,10 +327,9 @@ static
 RUCY_DEF1(set_left, left)
 {
 	CHECK;
-	Rays::Bounds* this_ = THIS;
 
-	this_->set_left(to<coord>(left));
-	return value(this_->left());
+	THIS->set_left(to<coord>(left));
+	return left;
 }
 RUCY_END
 
@@ -364,10 +346,9 @@ static
 RUCY_DEF1(set_right, right)
 {
 	CHECK;
-	Rays::Bounds* this_ = THIS;
 
-	this_->set_right(to<coord>(right));
-	return value(this_->right());
+	THIS->set_right(to<coord>(right));
+	return right;
 }
 RUCY_END
 
@@ -384,10 +365,9 @@ static
 RUCY_DEF1(set_top, top)
 {
 	CHECK;
-	Rays::Bounds* this_ = THIS;
 
-	this_->set_top(to<coord>(top));
-	return value(this_->top());
+	THIS->set_top(to<coord>(top));
+	return top;
 }
 RUCY_END
 
@@ -404,10 +384,9 @@ static
 RUCY_DEF1(set_bottom, bottom)
 {
 	CHECK;
-	Rays::Bounds* this_ = THIS;
 
-	this_->set_bottom(to<coord>(bottom));
-	return value(this_->bottom());
+	THIS->set_bottom(to<coord>(bottom));
+	return bottom;
 }
 RUCY_END
 
@@ -424,10 +403,9 @@ static
 RUCY_DEF1(set_back, back)
 {
 	CHECK;
-	Rays::Bounds* this_ = THIS;
 
-	this_->set_back(to<coord>(back));
-	return value(this_->back());
+	THIS->set_back(to<coord>(back));
+	return back;
 }
 RUCY_END
 
@@ -444,10 +422,9 @@ static
 RUCY_DEF1(set_front, front)
 {
 	CHECK;
-	Rays::Bounds* this_ = THIS;
 
-	this_->set_front(to<coord>(front));
-	return value(this_->front());
+	THIS->set_front(to<coord>(front));
+	return front;
 }
 RUCY_END
 
@@ -464,11 +441,9 @@ static
 RUCY_DEFN(set_position)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "Bounds#set_position", argc, 1, 2, 3);
 
-	coord* pos = THIS->position().array;
-	for (int i = 0; i < 3; ++i)
-		if (argc > i && !argv[i].is_nil()) pos[i] = to<coord>(argv[i]);
+	THIS->set_position(to<Rays::Point>(argc, argv));
+	return value(THIS->position());
 }
 RUCY_END
 
@@ -485,11 +460,9 @@ static
 RUCY_DEFN(set_size)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "Bounds#set_size", argc, 1, 2, 3);
 
-	coord* size = THIS->size().array;
-	for (int i = 0; i < 3; ++i)
-		if (argc > i && !argv[i].is_nil()) size[i] = to<coord>(argv[i]);
+	THIS->set_size(to<Rays::Point>(argc, argv));
+	return value(THIS->size());
 }
 RUCY_END
 
@@ -506,25 +479,14 @@ static
 RUCY_DEFN(set_center)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "Bounds#set_center", argc, 1, 2, 3);
-
-	if (argv[0].is_kind_of(Rays::point_class()))
-		THIS->set_center(to<Rays::Point&>(argv[0]));
-	else
-	{
-		Rays::Point p = THIS->center();
-		coord x = (argc >= 1 && argv[0]) ? to<coord>(argv[0]) : p.x;
-		coord y = (argc >= 2 && argv[1]) ? to<coord>(argv[1]) : p.y;
-		coord z = (argc >= 3 && argv[2]) ? to<coord>(argv[2]) : p.z;
-		THIS->set_center(x, y, z);
-	}
 
+	THIS->set_center(to<Rays::Point>(argc, argv));
 	return value(THIS->center());
 }
 RUCY_END
 
 static
-RUCY_DEF0(center)
+RUCY_DEF0(get_center)
 {
 	CHECK;
 
@@ -533,7 +495,7 @@ RUCY_DEF0(center)
 RUCY_END
 
 static
-RUCY_DEF1(array_get, index)
+RUCY_DEF2(set_at, index, value)
 {
 	CHECK;
 
@@ -541,12 +503,13 @@ RUCY_DEF1(array_get, index)
 	if (i < 0 || 1 < i)
 		index_error(__FILE__, __LINE__);
 
-	return value((*THIS)[i]);
+	(*THIS)[i] = to<Rays::Point&>(value);
+	return value;
 }
 RUCY_END
 
 static
-RUCY_DEF2(array_set, index, value)
+RUCY_DEF1(get_at, index)
 {
 	CHECK;
 
@@ -554,13 +517,12 @@ RUCY_DEF2(array_set, index, value)
 	if (i < 0 || 1 < i)
 		index_error(__FILE__, __LINE__);
 
-	(*THIS)[i] = to<Rays::Point&>(value);
-	return value;
+	return value((*THIS)[i]);
 }
 RUCY_END
 
 static
-RUCY_DEF1(and_, bounds)
+RUCY_DEF1(op_and, bounds)
 {
 	CHECK;
 
@@ -571,12 +533,18 @@ RUCY_DEF1(and_, bounds)
 RUCY_END
 
 static
-RUCY_DEF1(or_, bounds)
+RUCY_DEF1(op_or, arg)
 {
 	CHECK;
 
 	Rays::Bounds b = *THIS;
-	b |= to<Rays::Bounds&>(bounds);
+	if (arg.is_kind_of(Rays::bounds_class()))
+		b |= to<Rays::Bounds&>(arg);
+	else if (arg.is_kind_of(Rays::point_class()))
+		b |= to<Rays::Point&>(arg);
+	else
+		argument_error(__FILE__, __LINE__);
+
 	return value(b);
 }
 RUCY_END
@@ -590,6 +558,13 @@ RUCY_DEF0(inspect)
 }
 RUCY_END
 
+static
+RUCY_DEF0(invalid)
+{
+	return value(Rays::invalid_bounds());
+}
+RUCY_END
+
 
 static Class cBounds;
 
@@ -600,7 +575,7 @@ Init_bounds ()
 
 	cBounds = mRays.define_class("Bounds");
 	cBounds.define_alloc_func(alloc);
-	cBounds.define_private_method("initialize", initialize);
+	cBounds.define_private_method("initialize",      initialize);
 	cBounds.define_private_method("initialize_copy", initialize_copy);
 	cBounds.define_method("intersect?", intersect);
 	cBounds.define_method("include?",   include);
@@ -609,6 +584,7 @@ Init_bounds ()
 	cBounds.define_method("resize_to!", resize_to);
 	cBounds.define_method("resize_by!", resize_by);
 	cBounds.define_method("inset_by!",  inset_by);
+	cBounds.define_method("valid?", is_valid);
 	cBounds.define_method("x=",      set_x);
 	cBounds.define_method("x",       get_x);
 	cBounds.define_method("y=",      set_y);
@@ -633,17 +609,18 @@ Init_bounds ()
 	cBounds.define_method("back",    get_back);
 	cBounds.define_method("front=",  set_front);
 	cBounds.define_method("front",   get_front);
-	cBounds.define_method("set_position", set_position);
-	cBounds.define_method(    "position", get_position);
-	cBounds.define_method("set_size", set_size);
-	cBounds.define_method(    "size", get_size);
-	cBounds.define_method("set_center", set_center);
-	cBounds.define_method("center", center);
-	cBounds.define_method("[]",  array_get);
-	cBounds.define_method("[]=", array_set);
-	cBounds.define_method("&", and_);
-	cBounds.define_method("|", or_);
+	cBounds.define_method("position=", set_position);
+	cBounds.define_method("position",  get_position);
+	cBounds.define_method("size=", set_size);
+	cBounds.define_method("size",  get_size);
+	cBounds.define_method("center=", set_center);
+	cBounds.define_method("center",  get_center);
+	cBounds.define_method("[]",  get_at);
+	cBounds.define_method("[]=", set_at);
+	cBounds.define_method("&", op_and);
+	cBounds.define_method("|", op_or);
 	cBounds.define_method("inspect", inspect);
+	cBounds.define_singleton_method("invalid", invalid);
 }
 
 
@@ -652,29 +629,21 @@ namespace Rucy
 
 
 	template <> Rays::Bounds
-	value_to<Rays::Bounds> (Value value, bool convert)
+	value_to<Rays::Bounds> (int argc, const Value* argv, bool convert)
 	{
-		if (convert)
+		if (argc == 1 && argv->is_array())
 		{
-			size_t argc = 0;
-			Value* argv = NULL;
-			if (value.is_array())
-			{
-				argc = value.size();
-				argv = value.as_array();
-			}
-			else
-			{
-				argc = 1;
-				argv = &value;
-			}
+			argc = argv->size();
+			argv = argv->as_array();
+		}
 
-			if (argc < 1)
-				Rucy::argument_error(__FILE__, __LINE__);
+		assert(argc == 0 || (argc > 0 && argv));
 
-			if (argv[0].is_kind_of(Rays::bounds_class()))
-				value = argv[0];
-			else if (argv[0].is_kind_of(Rays::point_class()))
+		if (convert)
+		{
+			if (argc == 0)
+				return Rays::Bounds();
+			else if (argv->is_kind_of(Rays::point_class()))
 			{
 				switch (argc)
 				{
@@ -682,10 +651,10 @@ namespace Rucy
 					case 1: return Rays::Bounds(V(0));
 					case 2: return Rays::Bounds(V(0), V(1));
 					#undef V
-					default: Rucy::argument_error(__FILE__, __LINE__);
+					default: argument_error(__FILE__, __LINE__);
 				}
 			}
-			else if (argv[0].is_i() || argv[0].is_f())
+			else if (argv->is_num())
 			{
 				switch (argc)
 				{
@@ -696,12 +665,15 @@ namespace Rucy
 					case 4: return Rays::Bounds(V(0), V(1), V(2), V(3));
 					case 6: return Rays::Bounds(V(0), V(1), V(2), V(3), V(4), V(5));
 					#undef V
-					default: Rucy::argument_error(__FILE__, __LINE__);
+					default: argument_error(__FILE__, __LINE__);
 				}
 			}
 		}
 
-		return value_to<Rays::Bounds&>(value, convert);
+		if (argc != 1)
+			argument_error(__FILE__, __LINE__);
+
+		return value_to<Rays::Bounds&>(*argv, convert);
 	}