rays 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cb95796a8c672691ee51529359a2f4fbe5476dd7a3edf27d03ac79f40a045e3
-  data.tar.gz: 3f28f201cffc7d1a021846791ba10ab637ef33aa70618a7fce00085a73438ac4
+  metadata.gz: 9afd571fda027a889bb3d2ba60886e08ee8de5b825690d28838d10e729e5097d
+  data.tar.gz: 2bd0652be52c0f2f135cad35abe6b1b7140e90185ef9ec725e673aec2563f041
 SHA512:
-  metadata.gz: bae41d0c790c9b9e766f5c28849ce91de22be9a27434b1713103cf1a4f93c11b4b2f78c2f4ce6fe7132c44c9baea78c09bb7b6f578bffc87c2b0e706c27398b2
-  data.tar.gz: 48b7ba9a9b3a8bacd70913b1caa6cf5aaea4eea4397eaea6408278999ccb848720e44f0f6b5c7b851cff7ee987407851a8dc463f8df6cfbefc58cf71e94d25cc
+  metadata.gz: 94278334d219aebbaa3bd11b51f87555b230e8cd296115ccc06476b76f4240c0d5c4d976949b7bd04ce4b11aa056b738e7c9e5247dec8d75d14d36d5c7e388a0
+  data.tar.gz: 9ffd24082a1f0f37d6fbbb5ce016395069de981ba3c1ff0538392de790029f7ed69d50b739fa6a0debe7b5461b8624704c46b5e36967342c22250f8c655bbf0e

data/.doc/ext/rays/bounds.cpp

@@ -70,7 +70,7 @@ VALUE move_to(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#move_to", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_to(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -96,7 +96,7 @@ VALUE move_by(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#move_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -121,7 +121,7 @@ VALUE resize_to(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#resize_to", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->resize_to(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -147,7 +147,7 @@ VALUE resize_by(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#resize_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->resize_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -172,7 +172,7 @@ VALUE inset_by(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#inset_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->inset_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -460,7 +460,9 @@ VALUE set_at(VALUE self, VALUE index, VALUE value)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 1 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 1)
 		index_error(__FILE__, __LINE__);
 
 	(*THIS)[i] = to<Rays::Point&>(value);
@@ -473,7 +475,9 @@ VALUE get_at(VALUE self, VALUE index)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 1 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 1)
 		index_error(__FILE__, __LINE__);
 
 	return value((*THIS)[i]);
@@ -495,9 +499,9 @@ VALUE op_or(VALUE self, VALUE arg)
 	CHECK;
 
 	Rays::Bounds b = *THIS;
-	if (arg.is_kind_of(Rays::bounds_class()))
+	if (arg.is_a(Rays::bounds_class()))
 		b |= to<Rays::Bounds&>(arg);
-	else if (arg.is_kind_of(Rays::point_class()))
+	else if (arg.is_a(Rays::point_class()))
 		b |= to<Rays::Point&>(arg);
 	else
 		argument_error(__FILE__, __LINE__);
@@ -597,7 +601,7 @@ namespace Rucy
 		{
 			if (argc == 0)
 				return Rays::Bounds();
-			else if (argv->is_kind_of(Rays::point_class()))
+			else if (argv->is_a(Rays::point_class()))
 			{
 				switch (argc)
 				{

data/.doc/ext/rays/defs.cpp

@@ -84,7 +84,7 @@ void get_rect_args (
 	if (argc <= 0)
 		argument_error(__FILE__, __LINE__);
 
-	if (argv[0].is_kind_of(Rays::bounds_class()))
+	if (argv[0].is_a(Rays::bounds_class()))
 	{
 		Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x  = b.x;
@@ -96,7 +96,7 @@ void get_rect_args (
 		*lb = argc >= 4 ? to<coord>(argv[3]) : *lt;
 		*rb = argc >= 5 ? to<coord>(argv[4]) : *lt;
 	}
-	else if (argv[0].is_kind_of(Rays::point_class()))
+	else if (argv[0].is_a(Rays::point_class()))
 	{
 		if (argc < 2)
 			argument_error(__FILE__, __LINE__);
@@ -154,7 +154,7 @@ void get_ellipse_args (
 	{
 		*x = *y = *w = *h = 0;
 	}
-	else if (argv[0].is_kind_of(Rays::bounds_class()))
+	else if (argv[0].is_a(Rays::bounds_class()))
 	{
 		const Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x = b.x;
@@ -162,7 +162,7 @@ void get_ellipse_args (
 		*w = b.w;
 		*h = b.h;
 	}
-	else if (argv[0].is_kind_of(Rays::point_class()))
+	else if (argv[0].is_a(Rays::point_class()))
 	{
 		if (argc < 2)
 			argument_error(__FILE__, __LINE__);

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

@@ -21,31 +21,28 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE args, VALUE pixel_density, VALUE smooth)
 {
 	RUCY_CHECK_OBJ(Rays::Image, 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);
+	size_t argc = args.size();
+	check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2, 3);
 
-		const Rays::Bitmap* bitmap = to<Rays::Bitmap*>(argv[0]);
-		if (!bitmap)
+	float pd = to<float>(pixel_density);
+	if (args[0].is_a(Rays::bitmap_class()))
+	{
+		const Rays::Bitmap* bmp = to<Rays::Bitmap*>(args[0]);
+		if (!bmp)
 			argument_error(__FILE__, __LINE__);
 
-		float pixel_density = (argc >= 2) ? to<float>(argv[1]) : 1;
-		*THIS = Rays::Image(*bitmap, pixel_density);
+		*THIS = Rays::Image(*bmp, pd, smooth);
 	}
 	else
 	{
-		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);
+		int width  = to<int>(args[0]);
+		int height = to<int>(args[1]);
+		auto cs    = (argc >= 3) ? to<Rays::ColorSpace>(args[2]) : Rays::RGBA;
+		*THIS = Rays::Image(width, height, cs, pd, smooth);
 	}
 
 	return self;
@@ -110,6 +107,21 @@ VALUE get_bitmap(VALUE self, VALUE modify)
 	return value(THIS->bitmap(modify));
 }
 
+static
+VALUE set_smooth(VALUE self, VALUE smooth)
+{
+	CHECK;
+	THIS->set_smooth(smooth);
+	return smooth;
+}
+
+static
+VALUE get_smooth(VALUE self)
+{
+	CHECK;
+	return value(THIS->smooth());
+}
+
 static
 VALUE load(VALUE self, VALUE path)
 {
@@ -126,7 +138,7 @@ Init_rays_image ()
 
 	cImage = rb_define_class_under(mRays, "Image", rb_cObject);
 	rb_define_alloc_func(cImage, alloc);
-	rb_define_private_method(cImage, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	cImage.define_private_method("initialize!",     initialize);
 	rb_define_private_method(cImage, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cImage, "save", RUBY_METHOD_FUNC(save), 1);
 	rb_define_method(cImage, "width", RUBY_METHOD_FUNC(width), 0);
@@ -135,6 +147,8 @@ Init_rays_image ()
 	rb_define_method(cImage, "pixel_density", RUBY_METHOD_FUNC(pixel_density), 0);
 	rb_define_method(cImage, "painter", RUBY_METHOD_FUNC(painter), 0);
 	rb_define_private_method(cImage, "get_bitmap", RUBY_METHOD_FUNC(get_bitmap), 1);
+	rb_define_method(cImage, "smooth=", RUBY_METHOD_FUNC(set_smooth), 1);
+	rb_define_method(cImage, "smooth", RUBY_METHOD_FUNC(get_smooth), 0);
 	rb_define_module_function(cImage, "load", RUBY_METHOD_FUNC(load), 1);
 }
 

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

@@ -127,10 +127,10 @@ VALUE mult(VALUE self, VALUE val)
 {
 	CHECK;
 
-	if (val.is_kind_of(Rays::matrix_class()))
+	if (val.is_a(Rays::matrix_class()))
 		return value(*THIS * to<Rays::Matrix&>(val));
 
-	if (val.is_kind_of(Rays::point_class()))
+	if (val.is_a(Rays::point_class()))
 		return value(*THIS * to<Rays::Point&>(val));
 
 	if (val.is_array())

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

@@ -44,7 +44,7 @@ VALUE move_to(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Point#move_to", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_to(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -64,7 +64,7 @@ VALUE move_by(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Point#move_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -204,7 +204,9 @@ VALUE set_at(VALUE self, VALUE index, VALUE value)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 2 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 2)
 		index_error(__FILE__, __LINE__);
 
 	(*THIS)[i] = to<coord>(value);
@@ -217,7 +219,9 @@ VALUE get_at(VALUE self, VALUE index)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 2 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 2)
 		index_error(__FILE__, __LINE__);
 
 	return value((*THIS)[i]);

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

@@ -26,7 +26,7 @@ VALUE setup(VALUE self, VALUE args, VALUE loop, VALUE colors, VALUE texcoords)
 {
 	CHECK;
 
-	if (args[0].is_kind_of(Rays::polyline_class()))
+	if (args[0].is_a(Rays::polyline_class()))
 		*THIS = to<Rays::Polygon>(args.size(), args.as_array());
 	else
 	{
@@ -83,7 +83,9 @@ VALUE get_at(VALUE self, VALUE index)
 	int i    = to<int>(index);
 	if (i < 0) i += size;
 
-	if (i < 0 || size <= i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i >= size)
 		index_error(__FILE__, __LINE__);
 
 	return value((*THIS)[i]);
@@ -116,10 +118,10 @@ VALUE op_add(VALUE self, VALUE obj)
 {
 	CHECK;
 
-	if (obj.is_kind_of(Rays::polyline_class()))
+	if (obj.is_a(Rays::polyline_class()))
 		return value(*THIS + to<Rays::Polyline&>(obj));
 
-	if (obj.is_kind_of(Rays::polygon_class()))
+	if (obj.is_a(Rays::polygon_class()))
 		return value(*THIS + to<Rays::Polygon&>(obj));
 
 	if (!obj.is_array())
@@ -131,7 +133,7 @@ VALUE op_add(VALUE self, VALUE obj)
 	for (const auto& polyline : to<Rays::Polygon&>(self))
 		polylines.emplace_back(polyline);
 
-	if (obj[0].is_kind_of(Rays::polyline_class()))
+	if (obj[0].is_a(Rays::polyline_class()))
 	{
 		each_poly<Rays::Polyline>(obj, [&](const auto& polyline)
 		{
@@ -382,7 +384,7 @@ namespace Rucy
 		{
 			if (argc <= 0)
 				return Rays::Polygon();
-			else if (argv->is_kind_of(Rays::polyline_class()))
+			else if (argv->is_a(Rays::polyline_class()))
 			{
 				if (argc == 1)
 					return Rays::Polygon(to<Rays::Polyline&>(*argv));

data/.doc/ext/rays/polyline.cpp

@@ -102,7 +102,9 @@ VALUE get_at(VALUE self, VALUE index)
 	int i    = to<int>(index);
 	if (i < 0) i += size;
 
-	if (i < 0 || size <= i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i >= size)
 		index_error(__FILE__, __LINE__);
 
 	return value((*THIS)[i]);

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

@@ -126,7 +126,9 @@ namespace Rucy
 		}
 
 		int type = value_to<int>(*argv, convert);
-		if (type < 0 || Rays::CAP_MAX <= type)
+		if (type < 0)
+			argument_error(__FILE__, __LINE__, "invalid cap type -- %d", type);
+		if (type >= Rays::CAP_MAX)
 			argument_error(__FILE__, __LINE__, "invalid cap type -- %d", type);
 
 		return (Rays::CapType) type;
@@ -157,7 +159,9 @@ namespace Rucy
 		}
 
 		int type = value_to<int>(*argv, convert);
-		if (type < 0 || Rays::JOIN_MAX <= type)
+		if (type < 0)
+			argument_error(__FILE__, __LINE__, "invalid join type -- %d", type);
+		if (type >= Rays::JOIN_MAX)
 			argument_error(__FILE__, __LINE__, "invalid join type -- %d", type);
 
 		return (Rays::JoinType) type;
@@ -188,7 +192,9 @@ namespace Rucy
 		}
 
 		int mode = value_to<int>(*argv, convert);
-		if (mode < 0 || Rays::BLEND_MAX <= mode)
+		if (mode < 0)
+			argument_error(__FILE__, __LINE__, "invalid blend mode -- %d", mode);
+		if (mode >= Rays::BLEND_MAX)
 			argument_error(__FILE__, __LINE__, "invalid blend mode -- %d", mode);
 
 		return (Rays::BlendMode) mode;
@@ -219,7 +225,9 @@ namespace Rucy
 		}
 
 		int mode = value_to<int>(*argv, convert);
-		if (mode < 0 || Rays::TEXCOORD_MODE_MAX <= mode)
+		if (mode < 0)
+			argument_error(__FILE__, __LINE__, "invalid texcoord mode -- %d", mode);
+		if (mode >= Rays::TEXCOORD_MODE_MAX)
 			argument_error(__FILE__, __LINE__, "invalid texcoord mode -- %d", mode);
 
 		return (Rays::TexCoordMode) mode;
@@ -250,7 +258,9 @@ namespace Rucy
 		}
 
 		int wrap = value_to<int>(*argv, convert);
-		if (wrap < 0 || Rays::TEXCOORD_WRAP_MAX <= wrap)
+		if (wrap < 0)
+			argument_error(__FILE__, __LINE__, "invalid texcoord wrap -- %d", wrap);
+		if (wrap >= Rays::TEXCOORD_WRAP_MAX)
 			argument_error(__FILE__, __LINE__, "invalid texcoord wrap -- %d", wrap);
 
 		return (Rays::TexCoordWrap) wrap;

data/.doc/ext/rays/shader.cpp

@@ -139,7 +139,7 @@ VALUE set_uniform(VALUE self)
 			case 4: THIS->set_uniform(name, Af(0), Af(1), Af(2), Af(3)); break;
 		}
 	}
-	else if (argv[0].is_kind_of(Rays::image_class()))
+	else if (argv[0].is_a(Rays::image_class()))
 		THIS->set_uniform(name, to<Rays::Image&>(argv[0]));
 	else
 		argument_error(__FILE__, __LINE__);

data/ChangeLog.md

@@ -1,6 +1,12 @@
 # rays ChangeLog
 
 
+## [v0.3.1] - 2025-01-13
+
+- Update LICENSE
+- Add smooth flag for Image
+
+
 ## [v0.3] - 2024-07-06
 
 - Support Windows

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
-  arm64-darwin-22
+  arm64-darwin-23
 
 DEPENDENCIES
   rake

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 xord.org
+Copyright (c) 2011 xord.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,6 +1,5 @@
 # -*- mode: ruby -*-
 
-
 %w[../xot ../rucy .]
   .map  {|s| File.expand_path "#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/VERSION

@@ -1 +1 @@
-0.3
+0.3.1

data/ext/rays/bounds.cpp

@@ -75,7 +75,7 @@ RUCY_DEFN(move_to)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#move_to", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_to(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -102,7 +102,7 @@ RUCY_DEFN(move_by)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#move_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -128,7 +128,7 @@ RUCY_DEFN(resize_to)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#resize_to", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->resize_to(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -155,7 +155,7 @@ RUCY_DEFN(resize_by)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#resize_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->resize_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -181,7 +181,7 @@ RUCY_DEFN(inset_by)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#inset_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->inset_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -501,7 +501,9 @@ RUCY_DEF2(set_at, index, value)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 1 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 1)
 		index_error(__FILE__, __LINE__);
 
 	(*THIS)[i] = to<Rays::Point&>(value);
@@ -515,7 +517,9 @@ RUCY_DEF1(get_at, index)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 1 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 1)
 		index_error(__FILE__, __LINE__);
 
 	return value((*THIS)[i]);
@@ -539,9 +543,9 @@ RUCY_DEF1(op_or, arg)
 	CHECK;
 
 	Rays::Bounds b = *THIS;
-	if (arg.is_kind_of(Rays::bounds_class()))
+	if (arg.is_a(Rays::bounds_class()))
 		b |= to<Rays::Bounds&>(arg);
-	else if (arg.is_kind_of(Rays::point_class()))
+	else if (arg.is_a(Rays::point_class()))
 		b |= to<Rays::Point&>(arg);
 	else
 		argument_error(__FILE__, __LINE__);
@@ -644,7 +648,7 @@ namespace Rucy
 		{
 			if (argc == 0)
 				return Rays::Bounds();
-			else if (argv->is_kind_of(Rays::point_class()))
+			else if (argv->is_a(Rays::point_class()))
 			{
 				switch (argc)
 				{

data/ext/rays/defs.cpp

@@ -84,7 +84,7 @@ void get_rect_args (
 	if (argc <= 0)
 		argument_error(__FILE__, __LINE__);
 
-	if (argv[0].is_kind_of(Rays::bounds_class()))
+	if (argv[0].is_a(Rays::bounds_class()))
 	{
 		Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x  = b.x;
@@ -96,7 +96,7 @@ void get_rect_args (
 		*lb = argc >= 4 ? to<coord>(argv[3]) : *lt;
 		*rb = argc >= 5 ? to<coord>(argv[4]) : *lt;
 	}
-	else if (argv[0].is_kind_of(Rays::point_class()))
+	else if (argv[0].is_a(Rays::point_class()))
 	{
 		if (argc < 2)
 			argument_error(__FILE__, __LINE__);
@@ -154,7 +154,7 @@ void get_ellipse_args (
 	{
 		*x = *y = *w = *h = 0;
 	}
-	else if (argv[0].is_kind_of(Rays::bounds_class()))
+	else if (argv[0].is_a(Rays::bounds_class()))
 	{
 		const Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x = b.x;
@@ -162,7 +162,7 @@ void get_ellipse_args (
 		*w = b.w;
 		*h = b.h;
 	}
-	else if (argv[0].is_kind_of(Rays::point_class()))
+	else if (argv[0].is_a(Rays::point_class()))
 	{
 		if (argc < 2)
 			argument_error(__FILE__, __LINE__);

data/ext/rays/image.cpp

@@ -22,31 +22,28 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEFN(initialize)
+RUCY_DEF3(initialize, args, pixel_density, smooth)
 {
 	RUCY_CHECK_OBJ(Rays::Image, 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);
+	size_t argc = args.size();
+	check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2, 3);
 
-		const Rays::Bitmap* bitmap = to<Rays::Bitmap*>(argv[0]);
-		if (!bitmap)
+	float pd = to<float>(pixel_density);
+	if (args[0].is_a(Rays::bitmap_class()))
+	{
+		const Rays::Bitmap* bmp = to<Rays::Bitmap*>(args[0]);
+		if (!bmp)
 			argument_error(__FILE__, __LINE__);
 
-		float pixel_density = (argc >= 2) ? to<float>(argv[1]) : 1;
-		*THIS = Rays::Image(*bitmap, pixel_density);
+		*THIS = Rays::Image(*bmp, pd, smooth);
 	}
 	else
 	{
-		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);
+		int width  = to<int>(args[0]);
+		int height = to<int>(args[1]);
+		auto cs    = (argc >= 3) ? to<Rays::ColorSpace>(args[2]) : Rays::RGBA;
+		*THIS = Rays::Image(width, height, cs, pd, smooth);
 	}
 
 	return self;
@@ -120,6 +117,23 @@ RUCY_DEF1(get_bitmap, modify)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_smooth, smooth)
+{
+	CHECK;
+	THIS->set_smooth(smooth);
+	return smooth;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_smooth)
+{
+	CHECK;
+	return value(THIS->smooth());
+}
+RUCY_END
+
 static
 RUCY_DEF1(load, path)
 {
@@ -137,7 +151,7 @@ Init_rays_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("save", save);
 	cImage.define_method("width",  width);
@@ -146,6 +160,8 @@ Init_rays_image ()
 	cImage.define_method("pixel_density", pixel_density);
 	cImage.define_method("painter", painter);
 	cImage.define_private_method("get_bitmap", get_bitmap);
+	cImage.define_method("smooth=", set_smooth);
+	cImage.define_method("smooth",  get_smooth);
 	cImage.define_module_function("load", load);
 }
 

data/ext/rays/matrix.cpp

@@ -136,10 +136,10 @@ RUCY_DEF1(mult, val)
 {
 	CHECK;
 
-	if (val.is_kind_of(Rays::matrix_class()))
+	if (val.is_a(Rays::matrix_class()))
 		return value(*THIS * to<Rays::Matrix&>(val));
 
-	if (val.is_kind_of(Rays::point_class()))
+	if (val.is_a(Rays::point_class()))
 		return value(*THIS * to<Rays::Point&>(val));
 
 	if (val.is_array())