rays 0.1.47 → 0.1.49

data/ext/rays/font.cpp

@@ -30,6 +30,16 @@ RUCY_DEFN(initialize)
 }
 RUCY_END
 
+static
+RUCY_DEF1(initialize_copy, obj)
+{
+	RUCY_CHECK_OBJ(Rays::Font, self);
+
+	*THIS = to<Rays::Font&>(obj).dup();
+	return self;
+}
+RUCY_END
+
 static
 RUCY_DEF0(name)
 {
@@ -38,6 +48,15 @@ RUCY_DEF0(name)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_size, size)
+{
+	CHECK;
+	THIS->set_size(to<coord>(size));
+	return size;
+}
+RUCY_END
+
 static
 RUCY_DEF0(size)
 {
@@ -92,6 +111,35 @@ RUCY_DEF0(leading)
 }
 RUCY_END
 
+static
+RUCY_DEF0(families)
+{
+	Hash hash;
+	for (const auto& family : Rays::get_font_families())
+	{
+		std::vector<Value> members;
+		for (const auto& member : family.second)
+			members.emplace_back(member.c_str());
+		hash.set(family.first.c_str(), value(members.size(), &members[0]));
+	}
+	return hash;
+}
+RUCY_END
+
+static
+RUCY_DEFN(load)
+{
+	check_arg_count(__FILE__, __LINE__, "Font.load", argc, 1, 2);
+
+	const char* path = argv[0].c_str();
+
+	if (argc >= 2)
+		return value(Rays::load_font(path, to<Rays::coord>(argv[1])));
+	else
+		return value(Rays::load_font(path));
+}
+RUCY_END
+
 
 static Class cFont;
 
@@ -102,14 +150,18 @@ Init_rays_font ()
 
 	cFont = mRays.define_class("Font");
 	cFont.define_alloc_func(alloc);
-	cFont.define_private_method("initialize", initialize);
+	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("size=", set_size);
+	cFont.define_method("size",      size);
 	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);
+	cFont.define_module_function("families", families);
+	cFont.define_module_function("load", load);
 }
 
 
@@ -131,9 +183,9 @@ namespace Rucy
 		if (convert)
 		{
 			if (argc == 0)
-				return Rays::default_font();
+				return Rays::get_default_font();
 
-			coord size = argc >= 2 ? to<coord>(argv[1]) : 0;
+			coord size = argc >= 2 ? to<coord>(argv[1]) : Rays::Font::DEFAULT_SIZE;
 			if (argv->is_nil())
 				return Rays::Font(NULL, size);
 			else if (argv->is_s() || argv->is_sym())

data/ext/rays/image.cpp

@@ -113,10 +113,10 @@ RUCY_DEF0(painter)
 RUCY_END
 
 static
-RUCY_DEF0(bitmap)
+RUCY_DEF1(get_bitmap, modify)
 {
 	CHECK;
-	return value(THIS->bitmap());
+	return value(THIS->bitmap(modify));
 }
 RUCY_END
 
@@ -145,7 +145,7 @@ Init_rays_image ()
 	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_private_method("get_bitmap", get_bitmap);
 	cImage.define_module_function("load", load);
 }
 

data/ext/rays/matrix.cpp

@@ -71,6 +71,15 @@ RUCY_DEFN(reset)
 }
 RUCY_END
 
+static
+RUCY_DEFN(transpose)
+{
+	CHECK;
+	THIS->transpose();
+	return self;
+}
+RUCY_END
+
 static
 RUCY_DEFN(translate)
 {
@@ -115,10 +124,10 @@ 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);
+		THIS->x0, THIS->x1, THIS->x2, THIS->x3,
+		THIS->y0, THIS->y1, THIS->y2, THIS->y3,
+		THIS->z0, THIS->z1, THIS->z2, THIS->z3,
+		THIS->w0, THIS->w1, THIS->w2, THIS->w3);
 }
 RUCY_END
 
@@ -206,6 +215,54 @@ RUCY_DEFN(s_rotate)
 }
 RUCY_END
 
+static
+RUCY_DEFN(s_ortho)
+{
+	check_arg_count(__FILE__, __LINE__, "Matrix#ortho", argc, 4, 6);
+
+	coord l = to<coord>(argv[0]);
+	coord r = to<coord>(argv[1]);
+	coord t = to<coord>(argv[2]);
+	coord b = to<coord>(argv[3]);
+	if (argc == 4)
+		return value(Rays::ortho(l, r, t, b));
+	else
+		return value(Rays::ortho(l, r, t, b, to<coord>(argv[4]), to<coord>(argv[5])));
+}
+RUCY_END
+
+static
+RUCY_DEF4(s_perspective, fov_y, aspect_ratio, near, far)
+{
+	return value(Rays::perspective(
+		to<float>(fov_y), to<float>(aspect_ratio), to<coord>(near), to<coord>(far)));
+}
+RUCY_END
+
+static
+RUCY_DEFN(s_look_at)
+{
+	check_arg_count(__FILE__, __LINE__, "Matrix#ortho", argc, 3, 6, 9);
+
+	if (argc == 3)
+	{
+		return value(Rays::look_at(
+			to<Rays::Point&>(argv[0]),
+			to<Rays::Point&>(argv[1]),
+			to<Rays::Point&>(argv[2])));
+	}
+	else
+	{
+		return value(Rays::look_at(
+			to<coord>(argv[0]), to<coord>(argv[1]), to<coord>(argv[2]),
+			to<coord>(argv[3]), to<coord>(argv[4]), to<coord>(argv[5]),
+			argc >= 7 ? to<coord>(argv[6]) : 0,
+			argc >= 8 ? to<coord>(argv[7]) : 1,
+			argc >= 9 ? to<coord>(argv[8]) : 0));
+	}
+}
+RUCY_END
+
 
 static Class cMatrix;
 
@@ -219,9 +276,10 @@ Init_rays_matrix ()
 	cMatrix.define_private_method("initialize",      initialize);
 	cMatrix.define_private_method("initialize_copy", initialize_copy);
 	cMatrix.define_method("reset", reset);
-	cMatrix.define_method("translate", translate);
-	cMatrix.define_method("scale",     scale);
-	cMatrix.define_method("rotate",    rotate);
+	cMatrix.define_method("transpose!", transpose);
+	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);
@@ -232,6 +290,10 @@ Init_rays_matrix ()
 	cMatrix.define_singleton_method("translate", s_translate);
 	cMatrix.define_singleton_method("scale",     s_scale);
 	cMatrix.define_singleton_method("rotate",    s_rotate);
+	cMatrix.define_singleton_method("ortho",       s_ortho);
+	cMatrix.define_singleton_method("perspective", s_perspective);
+	cMatrix.define_singleton_method("look_at",     s_look_at);
+
 }
 
 

data/ext/rays/native.cpp

@@ -12,7 +12,6 @@ void Init_rays_matrix ();
 
 void Init_rays_painter ();
 void Init_rays_polyline ();
-void Init_rays_polygon_line ();
 void Init_rays_polygon ();
 void Init_rays_bitmap ();
 void Init_rays_image ();
@@ -20,7 +19,7 @@ void Init_rays_font ();
 void Init_rays_shader ();
 void Init_rays_camera ();
 
-void Init_rays_noise ();
+void Init_rays_util ();
 
 
 extern "C" void
@@ -45,7 +44,6 @@ extern "C" void
 
 	Init_rays_painter();
 	Init_rays_polyline();
-	Init_rays_polygon_line();
 	Init_rays_polygon();
 	Init_rays_bitmap();
 	Init_rays_image();
@@ -53,7 +51,7 @@ extern "C" void
 	Init_rays_shader();
 	Init_rays_camera();
 
-	Init_rays_noise();
+	Init_rays_util();
 
 	RUCY_CATCH
 }

data/ext/rays/painter.cpp

@@ -156,13 +156,26 @@ RUCY_DEFN(polygon)
 }
 RUCY_END
 
+static
+RUCY_DEFN(point)
+{
+	CHECK;
+
+	std::vector<Rays::Point> points;
+	get_points(&points, argc, argv);
+
+	THIS->points(&points[0], points.size());
+	return self;
+}
+RUCY_END
+
 static
 RUCY_DEF2(line, args, loop)
 {
 	CHECK;
 
 	std::vector<Rays::Point> points;
-	get_line_args(&points, args.size(), args.as_array());
+	get_points(&points, args.size(), args.as_array());
 
 	THIS->line(&points[0], points.size(), loop);
 	return self;
@@ -224,7 +237,7 @@ RUCY_DEF2(curve, args, loop)
 		argument_error(__FILE__, __LINE__);
 
 	std::vector<Rays::Point> points;
-	get_line_args(&points, args.size(), args.as_array());
+	get_points(&points, args.size(), args.as_array());
 
 	THIS->curve(&points[0], points.size(), loop);
 	return self;
@@ -240,7 +253,7 @@ RUCY_DEF2(bezier, args, loop)
 		argument_error(__FILE__, __LINE__);
 
 	std::vector<Rays::Point> points;
-	get_line_args(&points, args.size(), args.as_array());
+	get_points(&points, args.size(), args.as_array());
 
 	THIS->bezier(&points[0], points.size(), loop);
 	return self;
@@ -496,6 +509,31 @@ RUCY_DEF0(get_nsegment)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_line_height, height)
+{
+	CHECK;
+	THIS->set_line_height(height ? to<coord>(height) : -1);
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_line_height)
+{
+	CHECK;
+	return value(THIS->line_height());
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_line_height_raw)
+{
+	CHECK;
+	return value(THIS->line_height(true));
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_blend_mode, mode)
 {
@@ -558,6 +596,76 @@ RUCY_DEF0(get_font)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_texture, image)
+{
+	CHECK;
+
+	if (!image)
+		THIS->no_texture();
+	else
+		THIS->set_texture(to<Rays::Image&>(image));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_texture)
+{
+	CHECK;
+
+	const Rays::Image& image = THIS->texture();
+	return image ? value(image) : nil();
+}
+RUCY_END
+
+static
+RUCY_DEF0(no_texture)
+{
+	CHECK;
+	THIS->no_texture();
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_texcoord_mode, mode)
+{
+	CHECK;
+
+	THIS->set_texcoord_mode(to<Rays::TexCoordMode>(mode));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_texcoord_mode)
+{
+	CHECK;
+
+	return value(THIS->texcoord_mode());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_texcoord_wrap, wrap)
+{
+	CHECK;
+
+	THIS->set_texcoord_wrap(to<Rays::TexCoordWrap>(wrap));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_texcoord_wrap)
+{
+	CHECK;
+
+	return value(THIS->texcoord_wrap());
+}
+RUCY_END
+
 static
 RUCY_DEFN(set_shader)
 {
@@ -713,16 +821,17 @@ Init_rays_painter ()
 	cPainter.define_private_method("begin_paint",  begin_paint);
 	cPainter.define_private_method(  "end_paint",    end_paint);
 	cPainter.define_method(              "painting?", is_painting);
-	cPainter.define_method("clear",   clear);
-	cPainter.define_method("polygon", polygon);
-	cPainter.define_private_method("draw_line",     line);
-	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);
+	cPainter.define_method("clear", clear);
+	cPainter.define_method(        "polygon",   polygon);
+	cPainter.define_method(        "point",     point);
+	cPainter.define_private_method("line!",     line);
+	cPainter.define_private_method("polyline!", polyline);
+	cPainter.define_private_method("rect!",     rect);
+	cPainter.define_private_method("ellipse!",  ellipse);
+	cPainter.define_private_method("curve!",    curve);
+	cPainter.define_private_method("bezier!",   bezier);
+	cPainter.define_method(        "image",     image);
+	cPainter.define_method(        "text",      text);
 
 	cPainter.define_method(   "background=", set_background);
 	cPainter.define_method(   "background",  get_background);
@@ -745,6 +854,9 @@ Init_rays_painter ()
 	cPainter.define_method("miter_limit",  get_miter_limit);
 	cPainter.define_method("nsegment=", set_nsegment);
 	cPainter.define_method("nsegment",  get_nsegment);
+	cPainter.define_method("line_height=", set_line_height);
+	cPainter.define_method("line_height",  get_line_height);
+	cPainter.define_method("line_height!", get_line_height_raw);
 	cPainter.define_method("blend_mode=", set_blend_mode);
 	cPainter.define_method("blend_mode",  get_blend_mode);
 	cPainter.define_method(   "clip=", set_clip);
@@ -752,6 +864,13 @@ Init_rays_painter ()
 	cPainter.define_method("no_clip",   no_clip);
 	cPainter.define_method("font=", set_font);
 	cPainter.define_method("font",  get_font);
+	cPainter.define_method(   "texture=", set_texture);
+	cPainter.define_method(   "texture",  get_texture);
+	cPainter.define_method("no_texture",   no_texture);
+	cPainter.define_method("texcoord_mode=", set_texcoord_mode);
+	cPainter.define_method("texcoord_mode",  get_texcoord_mode);
+	cPainter.define_method("texcoord_wrap=", set_texcoord_wrap);
+	cPainter.define_method("texcoord_wrap",  get_texcoord_wrap);
 	cPainter.define_private_method("set_shader", set_shader);
 	cPainter.define_method(            "shader", get_shader);
 	cPainter.define_method(         "no_shader",  no_shader);

data/ext/rays/point.cpp

@@ -84,16 +84,6 @@ RUCY_END
 
 static
 RUCY_DEF1(rotate, degree)
-{
-	CHECK;
-	Rays::Point p = *THIS;
-	p.rotate(to<float>(degree));
-	return value(p);
-}
-RUCY_END
-
-static
-RUCY_DEF1(rotate_self, degree)
 {
 	CHECK;
 	THIS->rotate(to<float>(degree));
@@ -283,8 +273,7 @@ Init_rays_point ()
 	cPoint.define_private_method("initialize_copy", initialize_copy);
 	cPoint.define_method("move_to!", move_to);
 	cPoint.define_method("move_by!", move_by);
-	cPoint.define_method("rotate",  rotate);
-	cPoint.define_method("rotate!", rotate_self);
+	cPoint.define_method("rotate!",  rotate);
 	cPoint.define_method("length", length);
 	cPoint.define_method("normalize", normalize);
 	cPoint.define_method("normal",    normal);