rays 0.3 → 0.3.1

data/ext/rays/point.cpp

@@ -47,7 +47,7 @@ RUCY_DEFN(move_to)
 	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
 	{
@@ -68,7 +68,7 @@ RUCY_DEFN(move_by)
 	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
 	{
@@ -224,7 +224,9 @@ RUCY_DEF2(set_at, index, 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);
@@ -238,7 +240,9 @@ RUCY_DEF1(get_at, 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/ext/rays/polygon.cpp

@@ -27,7 +27,7 @@ RUCY_DEF4(setup, args, loop, colors, 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
 	{
@@ -89,7 +89,9 @@ RUCY_DEF1(get_at, 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]);
@@ -124,10 +126,10 @@ RUCY_DEF1(op_add, 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())
@@ -139,7 +141,7 @@ RUCY_DEF1(op_add, 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)
 		{
@@ -407,7 +409,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/ext/rays/polyline.cpp

@@ -111,7 +111,9 @@ RUCY_DEF1(get_at, 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/ext/rays/rays.cpp

@@ -128,7 +128,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;
@@ -159,7 +161,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;
@@ -190,7 +194,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;
@@ -221,7 +227,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;
@@ -252,7 +260,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/ext/rays/shader.cpp

@@ -141,7 +141,7 @@ RUCY_DEFN(set_uniform)
 			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/include/rays/image.h

@@ -27,9 +27,11 @@ namespace Rays
 
 			Image (
 				int width, int height, const ColorSpace& cs = DEFAULT_COLOR_SPACE,
-				float pixel_density = 1);
+				float pixel_density = 1, bool smooth = false);
 
-			Image (const Bitmap& bitmap, float pixel_density = 1);
+			Image (
+				const Bitmap& bitmap,
+				float pixel_density = 1, bool smooth = false);
 
 			~Image ();
 
@@ -45,6 +47,10 @@ namespace Rays
 
 			float pixel_density () const;
 
+			void set_smooth (bool smooth);
+
+			bool     smooth () const;
+
 			Painter painter ();
 
 			      Bitmap& bitmap (bool modify = false);

data/lib/rays/image.rb

@@ -13,6 +13,10 @@ module Rays
 
     def_delegators :bitmap_for_write, :pixels=, :[]=
 
+    def initialize(*args, pixel_density: 1, smooth: false)
+      initialize! args, pixel_density, smooth
+    end
+
     def paint(&block)
       painter.paint self, &block
       self

data/rays.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',  '~> 0.3'
-  s.add_runtime_dependency 'rucy', '~> 0.3'
+  s.add_runtime_dependency 'xot',  '~> 0.3.1'
+  s.add_runtime_dependency 'rucy', '~> 0.3.1'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/bounds.cpp

@@ -50,7 +50,9 @@ namespace Rays
 	bool
 	Bounds::is_intersect (const Bounds& other, int dimension) const
 	{
-		if (dimension < 1 || 3 < dimension)
+		if (dimension < 1)
+			argument_error(__FILE__, __LINE__);
+		if (dimension > 3)
 			argument_error(__FILE__, __LINE__);
 
 		Point size = (*this & other).size();
@@ -69,7 +71,9 @@ namespace Rays
 	bool
 	Bounds::is_include (const Point& point, int dimension) const
 	{
-		if (dimension < 1 || 3 < dimension)
+		if (dimension < 1)
+			argument_error(__FILE__, __LINE__);
+		if (dimension > 3)
 			argument_error(__FILE__, __LINE__);
 
 		const Point &pos = position(), &size_ = size();

data/src/color.cpp

@@ -117,7 +117,9 @@ namespace Rays
 	Color&
 	Color::reset (const void* pixel, const ColorSpace& cs)
 	{
-		if (!pixel || !cs)
+		if (!pixel)
+			argument_error(__FILE__, __LINE__);
+		if (!cs)
 			argument_error(__FILE__, __LINE__);
 
 		if (cs.is_float())
@@ -175,7 +177,9 @@ namespace Rays
 	static void
 	get_rgba (float* red, float* green, float* blue, float* alpha, const float* c)
 	{
-		if ((!red && !green && !blue && !alpha) || !c)
+		if (!red && !green && !blue && !alpha)
+			argument_error(__FILE__, __LINE__);
+		if (!c)
 			argument_error(__FILE__, __LINE__);
 
 		if (red)   *red   = c[0];
@@ -187,7 +191,9 @@ namespace Rays
 	static void
 	get_rgba (uchar* red, uchar* green, uchar* blue, uchar* alpha, const float* c)
 	{
-		if ((!red && !green && !blue && !alpha) || !c)
+		if (!red && !green && !blue && !alpha)
+			argument_error(__FILE__, __LINE__);
+		if (!c)
 			argument_error(__FILE__, __LINE__);
 
 		if (red)   *red   = Color::float2uchar(c[0]);
@@ -199,7 +205,9 @@ namespace Rays
 	void
 	Color::get (void* pixel, const ColorSpace& cs) const
 	{
-		if (!pixel || !cs)
+		if (!pixel)
+			argument_error(__FILE__, __LINE__);
+		if (!cs)
 			argument_error(__FILE__, __LINE__);
 
 		const float* c = array;

data/src/image.cpp

@@ -30,6 +30,8 @@ namespace Rays
 
 		float pixel_density = 1;
 
+		bool smooth = false;
+
 		mutable Bitmap bitmap;
 
 		mutable Texture texture;
@@ -56,6 +58,13 @@ namespace Rays
 		if (self->texture) self->texture.set_modified(false);
 	}
 
+	static void
+	invalidate_texture (Image* image)
+	{
+		image->bitmap();// update bitmap
+		image->self->texture = Texture();
+	}
+
 	static Bitmap&
 	get_bitmap (Image* image)
 	{
@@ -117,12 +126,13 @@ namespace Rays
 			if (self->bitmap)
 			{
 				PRINT_MODIFIED_FLAGS("new texture from bitmap");
-				self->texture = Texture(self->bitmap);
+				self->texture = Texture(self->bitmap, self->smooth);
 			}
 			else
 			{
 				PRINT_MODIFIED_FLAGS("new texture");
-				self->texture = Texture(self->width, self->height, self->color_space);
+				self->texture = Texture(
+					self->width, self->height, self->color_space, self->smooth);
 
 				Painter p = image.painter();
 				p.begin();
@@ -167,7 +177,8 @@ namespace Rays
 	}
 
 	Image::Image (
-		int width, int height, const ColorSpace& cs, float pixel_density)
+		int width, int height, const ColorSpace& cs,
+		float pixel_density, bool smooth)
 	{
 		if (pixel_density <= 0)
 			argument_error(__FILE__, __LINE__, "invalid pixel_density.");
@@ -176,9 +187,10 @@ namespace Rays
 		self->height        = (int) (height * pixel_density);
 		self->color_space   = cs;
 		self->pixel_density = pixel_density;
+		self->smooth        = smooth;
 	}
 
-	Image::Image (const Bitmap& bitmap, float pixel_density)
+	Image::Image (const Bitmap& bitmap, float pixel_density, bool smooth)
 	{
 		if (pixel_density <= 0)
 			argument_error(__FILE__, __LINE__, "invalid pixel_density.");
@@ -188,6 +200,7 @@ namespace Rays
 		self->height        = bitmap.height();
 		self->color_space   = bitmap.color_space();
 		self->pixel_density = pixel_density;
+		self->smooth        = smooth;
 	}
 
 	Image::~Image ()
@@ -233,6 +246,21 @@ namespace Rays
 		return self->pixel_density;
 	}
 
+	void
+	Image::set_smooth (bool smooth)
+	{
+		if (smooth == self->smooth) return;
+
+		self->smooth = smooth;
+		invalidate_texture(this);
+	}
+
+	bool
+	Image::smooth () const
+	{
+		return self->smooth;
+	}
+
 	Painter
 	Image::painter ()
 	{

data/src/ios/bitmap.mm

@@ -126,7 +126,11 @@ namespace Rays
 		int w, int h, const ColorSpace& cs,
 		const void* pixels = NULL, bool clear_pixels = true)
 	{
-		if (w <= 0 || h <= 0 || !cs)
+		if (w <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (h <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (!cs)
 			argument_error(__FILE__, __LINE__);
 
 		Bitmap::Data* self = bitmap->self.get();
@@ -179,7 +183,9 @@ namespace Rays
 	{
 		if (width == 0 || height == 0) return;
 
-		if (!bitmap || !image)
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!image)
 			argument_error(__FILE__, __LINE__);
 
 		CGContextRef context = bitmap->self->get_context();
@@ -197,7 +203,13 @@ namespace Rays
 	Bitmap_draw_string (
 		Bitmap* bitmap, const RawFont& font, const char* str, coord x, coord y)
 	{
-		if (!bitmap || !*bitmap || !font || !str)
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!*bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!font)
+			argument_error(__FILE__, __LINE__);
+		if (!str)
 			argument_error(__FILE__, __LINE__);
 
 		if (*str == '\0') return;
@@ -261,7 +273,9 @@ namespace Rays
 	Bitmap
 	Bitmap_load (const char* path_)
 	{
-		if (!path_ || path_[0] == '\0')
+		if (!path_)
+			argument_error(__FILE__, __LINE__);
+		if (path_[0] == '\0')
 			argument_error(__FILE__, __LINE__);
 
 		NSString* path = [NSString stringWithUTF8String: path_];

data/src/ios/font.mm

@@ -152,7 +152,9 @@ namespace Rays
 	{
 		CGContextRef context = (CGContextRef) context_;
 
-		if (!context || !str)
+		if (!context)
+			argument_error(__FILE__, __LINE__);
+		if (!str)
 			argument_error(__FILE__, __LINE__);
 
 		if (*str == '\0') return;

data/src/osx/bitmap.mm

@@ -125,7 +125,11 @@ namespace Rays
 		int w, int h, const ColorSpace& cs,
 		const void* pixels = NULL, bool clear_pixels = true)
 	{
-		if (w <= 0 || h <= 0 || !cs)
+		if (w <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (h <= 0)
+			argument_error(__FILE__, __LINE__);
+		if (!cs)
 			argument_error(__FILE__, __LINE__);
 
 		Bitmap::Data* self = bitmap->self.get();
@@ -178,7 +182,9 @@ namespace Rays
 	{
 		if (width == 0 || height == 0) return;
 
-		if (!bitmap || !image)
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!image)
 			argument_error(__FILE__, __LINE__);
 
 		CGContextRef context = bitmap->self->get_context();
@@ -196,7 +202,13 @@ namespace Rays
 	Bitmap_draw_string (
 		Bitmap* bitmap, const RawFont& font, const char* str, coord x, coord y)
 	{
-		if (!bitmap || !*bitmap || !font || !str)
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!*bitmap)
+			argument_error(__FILE__, __LINE__);
+		if (!font)
+			argument_error(__FILE__, __LINE__);
+		if (!str)
 			argument_error(__FILE__, __LINE__);
 
 		if (*str == '\0') return;
@@ -260,7 +272,9 @@ namespace Rays
 	Bitmap
 	Bitmap_load (const char* path_)
 	{
-		if (!path_ || path_[0] == '\0')
+		if (!path_)
+			argument_error(__FILE__, __LINE__);
+		if (path_[0] == '\0')
 			argument_error(__FILE__, __LINE__);
 
 		NSString* path = [NSString stringWithUTF8String: path_];

data/src/osx/font.mm

@@ -154,7 +154,9 @@ namespace Rays
 	{
 		CGContextRef context = (CGContextRef) context_;
 
-		if (!context || !str)
+		if (!context)
+			argument_error(__FILE__, __LINE__);
+		if (!str)
 			argument_error(__FILE__, __LINE__);
 
 		if (*str == '\0') return;

data/src/painter.cpp

@@ -332,7 +332,9 @@ namespace Rays
 			const TextureInfo* texinfo = NULL,
 			const Shader* shader       = NULL)
 		{
-			if (!points || npoints <= 0)
+			if (!points)
+				argument_error(__FILE__, __LINE__);
+			if (npoints <= 0)
 				argument_error(__FILE__, __LINE__);
 
 			if (!painting)

data/src/point.cpp

@@ -159,7 +159,11 @@ namespace Rays
 	Point&
 	Point::operator /= (const This& rhs)
 	{
-		if (rhs.x == 0 || rhs.y == 0 || rhs.z == 0)
+		if (rhs.x == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.y == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.z == 0)
 			argument_error(__FILE__, __LINE__);
 
 		to_glm(*this) /= to_glm(rhs);
@@ -235,7 +239,11 @@ namespace Rays
 	Point
 	operator / (coord lhs, const Point& rhs)
 	{
-		if (rhs.x == 0 || rhs.y == 0 || rhs.z == 0)
+		if (rhs.x == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.y == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.z == 0)
 			argument_error(__FILE__, __LINE__);
 
 		return to_rays<Point>(lhs / to_glm(rhs));
@@ -253,7 +261,11 @@ namespace Rays
 	Point
 	operator / (const Point& lhs, const Point& rhs)
 	{
-		if (rhs.x == 0 || rhs.y == 0 || rhs.z == 0)
+		if (rhs.x == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.y == 0)
+			argument_error(__FILE__, __LINE__);
+		if (rhs.z == 0)
 			argument_error(__FILE__, __LINE__);
 
 		return to_rays<Point>(to_glm(lhs) / to_glm(rhs));

data/src/polygon.cpp

@@ -70,12 +70,10 @@ namespace Rays
 				if (!points_)
 					argument_error(__FILE__, __LINE__);
 
-				if (
-					!points.empty() &&
-					(!colors_ != !pcolors || !texcoords_ != !ptexcoords))
-				{
+				if (!points.empty() && !colors_ != !pcolors)
+					argument_error(__FILE__, __LINE__);
+				if (!points.empty() && !texcoords_ != !ptexcoords)
 					argument_error(__FILE__, __LINE__);
-				}
 
 				segments.emplace_back(points.size(), 0, polyline.hole());
 				points.insert(points.end(), points_, points_ + polyline.size());

data/src/render_buffer.cpp

@@ -25,16 +25,24 @@ namespace Rays
 
 		void create (int width_, int height_)
 		{
-			if (width_ <= 0 || height_ <= 0)
+			if (width_  <= 0)
+				argument_error(__FILE__, __LINE__);
+			if (height_ <= 0)
 				argument_error(__FILE__, __LINE__);
 
 			if (is_valid())
 			{
-				if (width != width_ || height == height_)
+				if (width  != width_)
+				{
+					argument_error(__FILE__, __LINE__,
+						"RenderBuffer is already created and "
+						"width parameters is not same as current width.");
+				}
+				if (height != height_)
 				{
 					argument_error(__FILE__, __LINE__,
 						"RenderBuffer is already created and "
-						"width/height parameters is not same as current width/height.");
+						"height parameters is not same as current height.");
 				}
 				return;
 			}

data/src/shader_program.cpp

@@ -99,42 +99,50 @@ namespace Rays
 	};// UniformValueT
 
 
-	template <> void UniformValueT<int, 1>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<int, 1>::apply_value (GLint location) const
 	{
 		glUniform1iv(location, 1, array);
 	}
 
-	template <> void UniformValueT<int, 2>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<int, 2>::apply_value (GLint location) const
 	{
 		glUniform2iv(location, 1, array);
 	}
 
-	template <> void UniformValueT<int, 3>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<int, 3>::apply_value (GLint location) const
 	{
 		glUniform3iv(location, 1, array);
 	}
 
-	template <> void UniformValueT<int, 4>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<int, 4>::apply_value (GLint location) const
 	{
 		glUniform4iv(location, 1, array);
 	}
 
-	template <> void UniformValueT<float, 1>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<float, 1>::apply_value (GLint location) const
 	{
 		glUniform1fv(location, 1, array);
 	}
 
-	template <> void UniformValueT<float, 2>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<float, 2>::apply_value (GLint location) const
 	{
 		glUniform2fv(location, 1, array);
 	}
 
-	template <> void UniformValueT<float, 3>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<float, 3>::apply_value (GLint location) const
 	{
 		glUniform3fv(location, 1, array);
 	}
 
-	template <> void UniformValueT<float, 4>::apply_value (GLint location) const
+	template <> void
+	UniformValueT<float, 4>::apply_value (GLint location) const
 	{
 		glUniform4fv(location, 1, array);
 	}
@@ -191,7 +199,9 @@ namespace Rays
 
 		Uniform (const char* name, const UniformValue* value)
 		{
-			if (!name || name[0] == '\0')
+			if (!name)
+				argument_error(__FILE__, __LINE__);
+			if (name[0] == '\0')
 				argument_error(__FILE__, __LINE__);
 
 			reset(value);

data/src/shader_source.cpp

@@ -29,7 +29,11 @@ namespace Rays
 
 		void compile (GLenum type_, const char* source_)
 		{
-			if (!is_valid_type(type_) || !source_ || !*source_)
+			if (!is_valid_type(type_))
+				argument_error(__FILE__, __LINE__);
+			if (!source_)
+				argument_error(__FILE__, __LINE__);
+			if (!*source_)
 				argument_error(__FILE__, __LINE__);
 
 			if (is_valid())