rays 0.1.48 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0da22dbb538f841d5c21371e0b0749479467b1c0746bbd459118b649c66678e0
-  data.tar.gz: f55580763f45ce98198c59f6fe9ed86ac21f64aba8d16cf8b002923650c9b703
+  metadata.gz: 9a16981d77f0cc82e3020f1a80757dc7620da39d9b309823b47b8dc49883128a
+  data.tar.gz: 0bffdff4eceb4b60326882341d2fd3f0b2ff583dabfbab05f28127b276a4ab83
 SHA512:
-  metadata.gz: d74814adfebbb7b9f0449abeebab017a475c76ae48a61c4f2f066e12a376fe52279db08cb6a27c3a3cadd26ae9179ce7fb204c59eff8440f9569121711d3a26e
-  data.tar.gz: 74e423c7faa9747f34e7e37737882fffce493e127fb5870a7e6a2fb0d4cc6f122a3cac43d9afa96373a6ce69f147198007db9d958a93d478cd4d5f1a9441053b
+  metadata.gz: 2e417b9f4f751adeda1108ed76818171896caf4476188a7b3e9116e81f3d1a5d2c9e023e092b202a81c48f6a7a17faed7b388a5cf8211363350efe351f3b3df5
+  data.tar.gz: 33ff8e0b58b215a1e654fcc9aec4864e35a004a5470f412ce0cec7b0a81865b5d8dad003367ee6630fde11e34fb43b83e0c5f973d0d0f0fbe5cdd00795ef1255

data/.doc/ext/rays/color.cpp

@@ -103,6 +103,16 @@ VALUE get_alpha(VALUE self)
 	return value(THIS->alpha);
 }
 
+static
+VALUE to_hsv(VALUE self)
+{
+	CHECK;
+
+	float h, s, v;
+	Rays::get_hsv(&h, &s, &v, *THIS);
+	return array(h, s, v, THIS->alpha);
+}
+
 
 typedef std::map<Rays::String, Rays::Color> ColorMap;
 
@@ -199,6 +209,7 @@ Init_rays_color ()
 	rb_define_method(cColor, "blue", RUBY_METHOD_FUNC(get_blue), 0);
 	rb_define_method(cColor, "alpha=", RUBY_METHOD_FUNC(set_alpha), 1);
 	rb_define_method(cColor, "alpha", RUBY_METHOD_FUNC(get_alpha), 0);
+	rb_define_method(cColor, "to_hsv", RUBY_METHOD_FUNC(to_hsv), 0);
 	rb_define_module_function(cColor, "hsv", RUBY_METHOD_FUNC(hsv), -1);
 	rb_define_module_function(cColor, "set_palette_color", RUBY_METHOD_FUNC(set_palette_color), -1);
 }

data/.doc/ext/rays/image.cpp

@@ -104,10 +104,10 @@ VALUE painter(VALUE self)
 }
 
 static
-VALUE bitmap(VALUE self)
+VALUE get_bitmap(VALUE self, VALUE modify)
 {
 	CHECK;
-	return value(THIS->bitmap());
+	return value(THIS->bitmap(modify));
 }
 
 static
@@ -134,7 +134,7 @@ Init_rays_image ()
 	rb_define_method(cImage, "color_space", RUBY_METHOD_FUNC(color_space), 0);
 	rb_define_method(cImage, "pixel_density", RUBY_METHOD_FUNC(pixel_density), 0);
 	rb_define_method(cImage, "painter", RUBY_METHOD_FUNC(painter), 0);
-	rb_define_method(cImage, "bitmap", RUBY_METHOD_FUNC(bitmap), 0);
+	rb_define_private_method(cImage, "get_bitmap", RUBY_METHOD_FUNC(get_bitmap), 1);
 	rb_define_module_function(cImage, "load", RUBY_METHOD_FUNC(load), 1);
 }
 

data/.doc/ext/rays/matrix.cpp

@@ -67,6 +67,14 @@ VALUE reset(VALUE self)
 	return self;
 }
 
+static
+VALUE transpose(VALUE self)
+{
+	CHECK;
+	THIS->transpose();
+	return self;
+}
+
 static
 VALUE translate(VALUE self)
 {
@@ -108,10 +116,10 @@ VALUE to_a(VALUE self)
 {
 	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);
 }
 
 static
@@ -190,6 +198,51 @@ VALUE s_rotate(VALUE self)
 	return rotate(argc, argv, value(Rays::Matrix()));
 }
 
+static
+VALUE s_ortho(VALUE self)
+{
+	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])));
+}
+
+static
+VALUE s_perspective(VALUE self, VALUE fov_y, VALUE aspect_ratio, VALUE near, VALUE far)
+{
+	return value(Rays::perspective(
+		to<float>(fov_y), to<float>(aspect_ratio), to<coord>(near), to<coord>(far)));
+}
+
+static
+VALUE s_look_at(VALUE self)
+{
+	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));
+	}
+}
+
 
 static Class cMatrix;
 
@@ -203,9 +256,10 @@ Init_rays_matrix ()
 	rb_define_private_method(cMatrix, "initialize", RUBY_METHOD_FUNC(initialize), -1);
 	rb_define_private_method(cMatrix, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cMatrix, "reset", RUBY_METHOD_FUNC(reset), -1);
-	rb_define_method(cMatrix, "translate", RUBY_METHOD_FUNC(translate), -1);
-	rb_define_method(cMatrix, "scale", RUBY_METHOD_FUNC(scale), -1);
-	rb_define_method(cMatrix, "rotate", RUBY_METHOD_FUNC(rotate), -1);
+	cMatrix.define_method("transpose!", transpose);
+	cMatrix.define_method("translate!", translate);
+	cMatrix.define_method("scale!",     scale);
+	cMatrix.define_method("rotate!",    rotate);
 	rb_define_method(cMatrix, "to_a", RUBY_METHOD_FUNC(to_a), 0);
 	cMatrix.define_method("*", mult);
 	cMatrix.define_method("[]=", set_at);
@@ -216,6 +270,10 @@ Init_rays_matrix ()
 	rb_define_singleton_method(cMatrix, "translate", RUBY_METHOD_FUNC(s_translate), -1);
 	rb_define_singleton_method(cMatrix, "scale", RUBY_METHOD_FUNC(s_scale), -1);
 	rb_define_singleton_method(cMatrix, "rotate", RUBY_METHOD_FUNC(s_rotate), -1);
+	rb_define_singleton_method(cMatrix, "ortho", RUBY_METHOD_FUNC(s_ortho), -1);
+	rb_define_singleton_method(cMatrix, "perspective", RUBY_METHOD_FUNC(s_perspective), 4);
+	rb_define_singleton_method(cMatrix, "look_at", RUBY_METHOD_FUNC(s_look_at), -1);
+
 }
 
 

data/.doc/ext/rays/painter.cpp

@@ -147,6 +147,18 @@ VALUE polygon(VALUE self)
 	return self;
 }
 
+static
+VALUE point(VALUE self)
+{
+	CHECK;
+
+	std::vector<Rays::Point> points;
+	get_points(&points, argc, argv);
+
+	THIS->points(&points[0], points.size());
+	return self;
+}
+
 static
 VALUE line(VALUE self, VALUE args, VALUE loop)
 {
@@ -458,6 +470,28 @@ VALUE get_nsegment(VALUE self)
 	return value(THIS->nsegment());
 }
 
+static
+VALUE set_line_height(VALUE self, VALUE height)
+{
+	CHECK;
+	THIS->set_line_height(height ? to<coord>(height) : -1);
+	return self;
+}
+
+static
+VALUE get_line_height(VALUE self)
+{
+	CHECK;
+	return value(THIS->line_height());
+}
+
+static
+VALUE get_line_height_raw(VALUE self)
+{
+	CHECK;
+	return value(THIS->line_height(true));
+}
+
 static
 VALUE set_blend_mode(VALUE self, VALUE mode)
 {
@@ -721,12 +755,13 @@ Init_rays_painter ()
 	cPainter.define_method(              "painting?", is_painting);
 	rb_define_method(cPainter, "clear", RUBY_METHOD_FUNC(clear), 0);
 	rb_define_method(cPainter, "polygon", RUBY_METHOD_FUNC(polygon), -1);
-	rb_define_private_method(cPainter, "draw_line", RUBY_METHOD_FUNC(line), 2);
-	rb_define_private_method(cPainter, "draw_polyline", RUBY_METHOD_FUNC(polyline), 1);
-	rb_define_private_method(cPainter, "draw_rect", RUBY_METHOD_FUNC(rect), 6);
-	rb_define_private_method(cPainter, "draw_ellipse", RUBY_METHOD_FUNC(ellipse), 6);
-	rb_define_private_method(cPainter, "draw_curve", RUBY_METHOD_FUNC(curve), 2);
-	rb_define_private_method(cPainter, "draw_bezier", RUBY_METHOD_FUNC(bezier), 2);
+	rb_define_method(cPainter, "point", RUBY_METHOD_FUNC(point), -1);
+	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);
 	rb_define_method(cPainter, "image", RUBY_METHOD_FUNC(image), -1);
 	rb_define_method(cPainter, "text", RUBY_METHOD_FUNC(text), -1);
 
@@ -751,6 +786,9 @@ Init_rays_painter ()
 	rb_define_method(cPainter, "miter_limit", RUBY_METHOD_FUNC(get_miter_limit), 0);
 	rb_define_method(cPainter, "nsegment=", RUBY_METHOD_FUNC(set_nsegment), 1);
 	rb_define_method(cPainter, "nsegment", RUBY_METHOD_FUNC(get_nsegment), 0);
+	rb_define_method(cPainter, "line_height=", RUBY_METHOD_FUNC(set_line_height), 1);
+	rb_define_method(cPainter, "line_height", RUBY_METHOD_FUNC(get_line_height), 0);
+	cPainter.define_method("line_height!", get_line_height_raw);
 	rb_define_method(cPainter, "blend_mode=", RUBY_METHOD_FUNC(set_blend_mode), 1);
 	rb_define_method(cPainter, "blend_mode", RUBY_METHOD_FUNC(get_blend_mode), 0);
 	rb_define_method(cPainter, "clip=", RUBY_METHOD_FUNC(set_clip), -1);

data/.doc/ext/rays/point.cpp

@@ -79,15 +79,6 @@ VALUE move_by(VALUE self)
 
 static
 VALUE rotate(VALUE self, VALUE degree)
-{
-	CHECK;
-	Rays::Point p = *THIS;
-	p.rotate(to<float>(degree));
-	return value(p);
-}
-
-static
-VALUE rotate_self(VALUE self, VALUE degree)
 {
 	CHECK;
 	THIS->rotate(to<float>(degree));
@@ -258,8 +249,7 @@ Init_rays_point ()
 	rb_define_private_method(cPoint, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	cPoint.define_method("move_to!", move_to);
 	cPoint.define_method("move_by!", move_by);
-	rb_define_method(cPoint, "rotate", RUBY_METHOD_FUNC(rotate), 1);
-	cPoint.define_method("rotate!", rotate_self);
+	cPoint.define_method("rotate!",  rotate);
 	rb_define_method(cPoint, "length", RUBY_METHOD_FUNC(length), 0);
 	rb_define_method(cPoint, "normalize", RUBY_METHOD_FUNC(normalize), 0);
 	rb_define_method(cPoint, "normal", RUBY_METHOD_FUNC(normal), 0);

data/.doc/ext/rays/polygon.cpp

@@ -319,17 +319,19 @@ VALUE create_ellipse(VALUE self, VALUE
 }
 
 static
-VALUE create_curve(VALUE self, VALUE points, VALUE loop)
+VALUE create_curve(VALUE self, VALUE points, VALUE loop, VALUE nsegment)
 {
 	CreateParams params(points, nil(), nil());
-	return value(Rays::create_curve(params.ppoints(), params.size(), loop));
+	uint nseg = nsegment ? 0 : to<uint>(nsegment);
+	return value(Rays::create_curve(params.ppoints(), params.size(), loop, nseg));
 }
 
 static
-VALUE create_bezier(VALUE self, VALUE points, VALUE loop)
+VALUE create_bezier(VALUE self, VALUE points, VALUE loop, VALUE nsegment)
 {
 	CreateParams params(points, nil(), nil());
-	return value(Rays::create_bezier(params.ppoints(), params.size(), loop));
+	uint nseg = nsegment ? 0 : to<uint>(nsegment);
+	return value(Rays::create_bezier(params.ppoints(), params.size(), loop, nseg));
 }
 
 

data/ChangeLog.md

@@ -1,6 +1,29 @@
 # rays ChangeLog
 
 
+## [v0.1.49] - 2024-02-07
+
+- Add point(), line_height(), and line_height!() to Painter
+- Add translate!(), scale!(), rotate!(), transpose(), and transpose!() to Rays::Matrix class
+- Add ortho(), perspective(), and look_at() to Rays::Matrix
+- Add Color#to_hsv
+- Add get_hsv()
+- hsb as an alias for hsv
+
+- Font::get_width() handles multiple lines if there is a newline character
+- Painter::curve() and Painter::bezier() use nsegment state
+- Polygon.curve() and Polygon.bezier() can take 'nsegment' parameter
+- When updating a texture with a bitmap, the texture is reused, not created anew
+- If the texture is bound to the frame buffer, replacing it with a new texture will cause the drawing target to shift
+- Set the modified flag on the texture in the framebuffer at the beginning of painting
+- Set modified flag for bitmap if needed
+- Throw error on conflict between bitmap and texture
+
+- Fix a bug that dust was drawn on the right edge when drawing text
+- Fix that Painter#point ignores stroke_cap
+- Fix Matrix::to_a order
+
+
 ## [v0.1.48] - 2024-01-08
 
 - Add Bitmap#pixels=

data/VERSION

@@ -1 +1 @@
-0.1.48
+0.1.49

data/ext/rays/color.cpp

@@ -114,6 +114,17 @@ RUCY_DEF0(get_alpha)
 }
 RUCY_END
 
+static
+RUCY_DEF0(to_hsv)
+{
+	CHECK;
+
+	float h, s, v;
+	Rays::get_hsv(&h, &s, &v, *THIS);
+	return array(h, s, v, THIS->alpha);
+}
+RUCY_END
+
 
 typedef std::map<Rays::String, Rays::Color> ColorMap;
 
@@ -212,7 +223,8 @@ Init_rays_color ()
 	cColor.define_method("blue",   get_blue);
 	cColor.define_method("alpha=", set_alpha);
 	cColor.define_method("alpha",  get_alpha);
-	cColor.define_module_function("hsv", hsv);
+	cColor.define_method(      "to_hsv", to_hsv);
+	cColor.define_module_function("hsv",    hsv);
 	cColor.define_module_function("set_palette_color", set_palette_color);
 }
 

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/painter.cpp

@@ -156,6 +156,19 @@ 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)
 {
@@ -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)
 {
@@ -783,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);
@@ -815,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);

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);

data/ext/rays/polygon.cpp

@@ -342,18 +342,20 @@ RUCY_DEF7(create_ellipse,
 RUCY_END
 
 static
-RUCY_DEF2(create_curve, points, loop)
+RUCY_DEF3(create_curve, points, loop, nsegment)
 {
 	CreateParams params(points, nil(), nil());
-	return value(Rays::create_curve(params.ppoints(), params.size(), loop));
+	uint nseg = nsegment ? 0 : to<uint>(nsegment);
+	return value(Rays::create_curve(params.ppoints(), params.size(), loop, nseg));
 }
 RUCY_END
 
 static
-RUCY_DEF2(create_bezier, points, loop)
+RUCY_DEF3(create_bezier, points, loop, nsegment)
 {
 	CreateParams params(points, nil(), nil());
-	return value(Rays::create_bezier(params.ppoints(), params.size(), loop));
+	uint nseg = nsegment ? 0 : to<uint>(nsegment);
+	return value(Rays::create_bezier(params.ppoints(), params.size(), loop, nseg));
 }
 RUCY_END
 

data/include/rays/color.h

@@ -72,7 +72,9 @@ namespace Rays
 
 	Color rgb8 (int   red, int   green, int   blue, int   alpha = 255);
 
-	Color hsv (float hue, float saturation, float value, float alpha = 1);
+	Color    hsv (float  hue, float  saturation, float  value, float alpha = 1);
+
+	void get_hsv (float* hue, float* saturation, float* value, const Color& color);
 
 
 }// Rays

data/include/rays/image.h

@@ -47,7 +47,7 @@ namespace Rays
 
 			Painter painter ();
 
-			      Bitmap& bitmap ();
+			      Bitmap& bitmap (bool modify = false);
 
 			const Bitmap& bitmap () const;