rays 0.1.14 → 0.1.19

data/ext/rays/color.cpp

@@ -211,9 +211,8 @@ Init_color ()
 	cColor.define_method("blue",   get_blue);
 	cColor.define_method("alpha=", set_alpha);
 	cColor.define_method("alpha",  get_alpha);
-
-	cColor.define_function("hsv", hsv);
-	cColor.define_function("set_palette_color", set_palette_color);
+	cColor.define_module_function("hsv", hsv);
+	cColor.define_module_function("set_palette_color", set_palette_color);
 }
 
 

data/ext/rays/color_space.cpp

@@ -194,6 +194,9 @@ Init_color_space ()
 {
 	Module mRays = define_module("Rays");
 
+	for (size_t i = 0; i < COLOR_SPACES_SIZE; ++i)
+		mRays.define_const(COLOR_SPACES[i].name, COLOR_SPACES[i].type);
+
 	cColorSpace = mRays.define_class("ColorSpace");
 	cColorSpace.define_alloc_func(alloc);
 	cColorSpace.define_private_method("initialize",      initialize);
@@ -208,9 +211,6 @@ Init_color_space ()
 	cColorSpace.define_method("has_skip?",  has_skip);
 	cColorSpace.define_method("premult?", is_premult);
 	cColorSpace.define_method("to_s", to_s);
-
-	for (size_t i = 0; i < COLOR_SPACES_SIZE; ++i)
-		cColorSpace.define_const(COLOR_SPACES[i].name, COLOR_SPACES[i].type);
 }
 
 
@@ -231,16 +231,7 @@ namespace Rucy
 
 		if (convert)
 		{
-			if (argv->is_s() || argv->is_sym())
-			{
-				const char* str = argv[0].c_str();
-				for (size_t i = 0; i < COLOR_SPACES_SIZE; ++i)
-				{
-					if (strcasecmp(str, COLOR_SPACES[i].name) == 0)
-						return Rays::ColorSpace(COLOR_SPACES[i].type);
-				}
-			}
-			else if (argv->is_i())
+			if (argv->is_i() || argv->is_s() || argv->is_sym())
 			{
 				return Rays::ColorSpace(
 					to<Rays::ColorSpaceType>(argv[0]),
@@ -258,7 +249,24 @@ namespace Rucy
 	template <> Rays::ColorSpaceType
 	value_to<Rays::ColorSpaceType> (Value value, bool convert)
 	{
-		return (Rays::ColorSpaceType) value_to<uint>(value, convert);
+		if (convert)
+		{
+			if (value.is_s() || value.is_sym())
+			{
+				const char* str = value.c_str();
+				for (size_t i = 0; i < COLOR_SPACES_SIZE; ++i)
+				{
+					if (strcasecmp(str, COLOR_SPACES[i].name) == 0)
+						return COLOR_SPACES[i].type;
+				}
+			}
+		}
+
+		uint type = value_to<uint>(value, convert);
+		if (type >= Rays::COLORSPACE_MAX)
+			argument_error(__FILE__, __LINE__, "invalid color space type -- %d", type);
+
+		return (Rays::ColorSpaceType) type;
 	}
 
 

data/ext/rays/extconf.rb

@@ -17,7 +17,7 @@ Xot::ExtConf.new Xot, Rucy, Rays do
     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
 

data/ext/rays/font.cpp

@@ -61,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;
 
@@ -74,8 +104,11 @@ Init_font ()
 	cFont.define_private_method("initialize", initialize);
 	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);
 }
 
 

data/ext/rays/image.cpp

@@ -142,14 +142,14 @@ Init_image ()
 	cImage.define_alloc_func(alloc);
 	cImage.define_private_method("initialize",      initialize);
 	cImage.define_private_method("initialize_copy", initialize_copy);
-	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("pixel_density", pixel_density);
 	cImage.define_method("painter", painter);
 	cImage.define_method("bitmap", bitmap);
 	cImage.define_method("save", save);
-	cImage.define_function("load", load);
+	cImage.define_module_function("load", load);
 }
 
 

data/ext/rays/native.cpp

@@ -9,6 +9,7 @@ void Init_color ();
 void Init_color_space ();
 void Init_matrix ();
 
+void Init_painter ();
 void Init_polyline ();
 void Init_polygon_line ();
 void Init_polygon ();
@@ -16,8 +17,7 @@ void Init_bitmap ();
 void Init_image ();
 void Init_font ();
 void Init_shader ();
-
-void Init_painter ();
+void Init_camera ();
 
 void Init_noise ();
 
@@ -41,6 +41,7 @@ extern "C" void
 	Init_color_space();
 	Init_matrix();
 
+	Init_painter();
 	Init_polyline();
 	Init_polygon_line();
 	Init_polygon();
@@ -48,8 +49,7 @@ extern "C" void
 	Init_image();
 	Init_font();
 	Init_shader();
-
-	Init_painter();
+	Init_camera();
 
 	Init_noise();
 

data/ext/rays/painter.cpp

@@ -153,6 +153,38 @@ RUCY_DEF6(ellipse, args, center, radius, hole, angle_from, angle_to)
 }
 RUCY_END
 
+static
+RUCY_DEF2(curve, args, loop)
+{
+	CHECK;
+
+	if (args.empty())
+		argument_error(__FILE__, __LINE__);
+
+	std::vector<Rays::Point> points;
+	get_line_args(&points, args.size(), args.as_array());
+
+	THIS->curve(&points[0], points.size(), loop);
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF2(bezier, args, loop)
+{
+	CHECK;
+
+	if (args.empty())
+		argument_error(__FILE__, __LINE__);
+
+	std::vector<Rays::Point> points;
+	get_line_args(&points, args.size(), args.as_array());
+
+	THIS->bezier(&points[0], points.size(), loop);
+	return self;
+}
+RUCY_END
+
 static
 RUCY_DEFN(image)
 {
@@ -317,6 +349,57 @@ RUCY_DEF0(get_stroke_width)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_stroke_cap, cap)
+{
+	CHECK;
+	THIS->set_stroke_cap(to<Rays::CapType>(cap));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_stroke_cap)
+{
+	CHECK;
+	return value(THIS->stroke_cap());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_stroke_join, join)
+{
+	CHECK;
+	THIS->set_stroke_join(to<Rays::JoinType>(join));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_stroke_join)
+{
+	CHECK;
+	return value(THIS->stroke_join());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_miter_limit, limit)
+{
+	CHECK;
+	THIS->set_miter_limit(to<coord>(limit));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_miter_limit)
+{
+	CHECK;
+	return value(THIS->miter_limit());
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_nsegment, nsegment)
 {
@@ -534,6 +617,8 @@ Init_painter ()
 	cPainter.define_private_method("draw_polyline", polyline);
 	cPainter.define_private_method("draw_rect",     rect);
 	cPainter.define_private_method("draw_ellipse",  ellipse);
+	cPainter.define_private_method("draw_curve",    curve);
+	cPainter.define_private_method("draw_bezier",   bezier);
 	cPainter.define_method("image", image);
 	cPainter.define_method("text",  text);
 
@@ -543,11 +628,17 @@ Init_painter ()
 	cPainter.define_method(   "fill=", set_fill);
 	cPainter.define_method(   "fill",  get_fill);
 	cPainter.define_method("no_fill",   no_fill);
-	cPainter.define_method(   "stroke=", set_stroke);
-	cPainter.define_method(   "stroke",  get_stroke);
-	cPainter.define_method("no_stroke",   no_stroke);
+	cPainter.define_method(   "stroke=",       set_stroke);
+	cPainter.define_method(   "stroke",        get_stroke);
+	cPainter.define_method("no_stroke",         no_stroke);
 	cPainter.define_method(   "stroke_width=", set_stroke_width);
 	cPainter.define_method(   "stroke_width",  get_stroke_width);
+	cPainter.define_method(   "stroke_cap=",   set_stroke_cap);
+	cPainter.define_method(   "stroke_cap",    get_stroke_cap);
+	cPainter.define_method(   "stroke_join=",  set_stroke_join);
+	cPainter.define_method(   "stroke_join",   get_stroke_join);
+	cPainter.define_method("miter_limit=", set_miter_limit);
+	cPainter.define_method("miter_limit",  get_miter_limit);
 	cPainter.define_method("nsegment=", set_nsegment);
 	cPainter.define_method("nsegment",  get_nsegment);
 	cPainter.define_method(   "clip=", set_clip);

data/ext/rays/point.cpp

@@ -262,6 +262,20 @@ RUCY_DEF0(inspect)
 }
 RUCY_END
 
+static
+RUCY_DEF2(dot, p1, p2)
+{
+	return value(Rays::dot(to<Rays::Point>(p1), to<Rays::Point>(p2)));
+}
+RUCY_END
+
+static
+RUCY_DEF2(cross, p1, p2)
+{
+	return value(Rays::cross(to<Rays::Point>(p1), to<Rays::Point>(p2)));
+}
+RUCY_END
+
 
 static Class cPoint;
 
@@ -295,6 +309,8 @@ Init_point ()
 	cPoint.define_method("[]=", set_at);
 	cPoint.define_method("[]",  get_at);
 	cPoint.define_method("inspect", inspect);
+	cPoint.define_module_function("dot",   dot);
+	cPoint.define_module_function("cross", cross);
 }
 
 

data/ext/rays/polygon.cpp

@@ -27,7 +27,7 @@ RUCY_DEF2(setup, args, loop)
 {
 	CHECK;
 
-	if (loop)
+	if (args[0].is_kind_of(Rays::polyline_class()))
 		*THIS = to<Rays::Polygon>(args.size(), args.as_array());
 	else
 	{
@@ -39,12 +39,18 @@ RUCY_DEF2(setup, args, loop)
 RUCY_END
 
 static
-RUCY_DEF1(expand, width)
+RUCY_DEFN(expand)
 {
 	CHECK;
+	check_arg_count(__FILE__, __LINE__, "Polygon#expand", argc, 1, 2, 3, 4);
+
+	coord width         =             to<coord>         (argv[0]);
+	Rays::CapType cap   = argc >= 2 ? to<Rays::CapType> (argv[1]) : Rays::CAP_DEFAULT;
+	Rays::JoinType join = argc >= 3 ? to<Rays::JoinType>(argv[2]) : Rays::JOIN_DEFAULT;
+	coord ml            = argc >= 4 ? to<coord>         (argv[3]) : Rays::JOIN_DEFAULT_MITER_LIMIT;
 
 	Rays::Polygon polygon;
-	THIS->expand(&polygon, to<coord>(width));
+	THIS->expand(&polygon, width, cap, join, ml);
 	return value(polygon);
 }
 RUCY_END
@@ -74,7 +80,7 @@ RUCY_DEF0(empty)
 RUCY_END
 
 static
-RUCY_DEF1(at, index)
+RUCY_DEF1(get_at, index)
 {
 	CHECK;
 
@@ -94,7 +100,7 @@ RUCY_DEF0(each)
 {
 	CHECK;
 
-	Value ret;
+	Value ret = Qnil;
 	for (const auto& line : *THIS)
 		ret = rb_yield(value(line));
 	return ret;
@@ -219,6 +225,26 @@ RUCY_DEF7(create_ellipse,
 }
 RUCY_END
 
+static
+RUCY_DEF2(create_curve, args, loop)
+{
+	std::vector<Rays::Point> points;
+	get_line_args(&points, args.size(), args.as_array());
+
+	return value(Rays::create_curve(&points[0], points.size(), loop));
+}
+RUCY_END
+
+static
+RUCY_DEF2(create_bezier, args, loop)
+{
+	std::vector<Rays::Point> points;
+	get_line_args(&points, args.size(), args.as_array());
+
+	return value(Rays::create_bezier(&points[0], points.size(), loop));
+}
+RUCY_END
+
 
 static Class cPolygon;
 
@@ -234,7 +260,7 @@ Init_polygon ()
 	cPolygon.define_method("bounds", bounds);
 	cPolygon.define_method("size", size);
 	cPolygon.define_method("empty?", empty);
-	cPolygon.define_method("[]", at);
+	cPolygon.define_method("[]", get_at);
 	cPolygon.define_method("each", each);
 	cPolygon.define_method("+", op_or);
 	cPolygon.define_method("-", op_sub);
@@ -243,6 +269,8 @@ Init_polygon ()
 	cPolygon.define_method("^", op_xor);
 	cPolygon.define_singleton_method("create_rect",    create_rect);
 	cPolygon.define_singleton_method("create_ellipse", create_ellipse);
+	cPolygon.define_singleton_method("create_curve",   create_curve);
+	cPolygon.define_singleton_method("create_bezier",  create_bezier);
 }
 
 

data/ext/rays/polyline.cpp

@@ -34,12 +34,18 @@ RUCY_DEF2(setup, points, loop)
 RUCY_END
 
 static
-RUCY_DEF1(expand, width)
+RUCY_DEFN(expand)
 {
 	CHECK;
+	check_arg_count(__FILE__, __LINE__, "Polyline#expand", argc, 1, 2, 3, 4);
+
+	coord width         =             to<coord>         (argv[0]);
+	Rays::CapType cap   = argc >= 2 ? to<Rays::CapType> (argv[1]) : Rays::CAP_DEFAULT;
+	Rays::JoinType join = argc >= 3 ? to<Rays::JoinType>(argv[2]) : Rays::JOIN_DEFAULT;
+	coord ml            = argc >= 4 ? to<coord>         (argv[3]) : Rays::JOIN_DEFAULT_MITER_LIMIT;
 
 	Rays::Polygon polygon;
-	THIS->expand(&polygon, to<coord>(width));
+	THIS->expand(&polygon, width, cap, join, ml);
 	return value(polygon);
 }
 RUCY_END
@@ -77,7 +83,7 @@ RUCY_DEF0(empty)
 RUCY_END
 
 static
-RUCY_DEF1(at, index)
+RUCY_DEF1(get_at, index)
 {
 	CHECK;
 
@@ -97,7 +103,7 @@ RUCY_DEF0(each)
 {
 	CHECK;
 
-	Value ret;
+	Value ret = Qnil;
 	for (const auto& point : *THIS)
 		ret = rb_yield(value(point));
 	return ret;
@@ -120,7 +126,7 @@ Init_polyline ()
 	cPolyline.define_method("loop?", loop);
 	cPolyline.define_method("size", size);
 	cPolyline.define_method("empty?", empty);
-	cPolyline.define_method("[]", at);
+	cPolyline.define_method("[]", get_at);
 	cPolyline.define_method("each", each);
 }