rays 0.3.16 → 0.4.0

data/ext/rays/font.cpp

@@ -1,7 +1,6 @@
 #include "rays/ruby/font.h"
 
 
-#include <assert.h>
 #include "defs.h"
 
 
@@ -191,14 +190,12 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::Font
 	value_to<Rays::Font> (int argc, const Value* argv, bool convert)
 	{
-		if (argc == 1 && argv->is_array())
+		if (argc == 1 && argv && argv->is_array())
 		{
 			argc = argv->size();
 			argv = argv->as_array();
 		}
 
-		assert(argc == 0 || (argc > 0 && argv));
-
 		if (convert)
 		{
 			if (argc == 0)

data/ext/rays/image.cpp

@@ -42,7 +42,7 @@ RUCY_DEF3(initialize, args, pixel_density, smooth)
 	{
 		int width  = to<int>(args[0]);
 		int height = to<int>(args[1]);
-		auto cs    = (argc >= 3) ? to<Rays::ColorSpace>(args[2]) : Rays::RGBA;
+		auto cs    = (argc >= 3) ? to<Rays::ColorSpace>(args[2]) : Rays::DEFAULT_COLORSPACE;
 		*THIS = Rays::Image(width, height, cs, pd, smooth);
 	}
 
@@ -145,9 +145,10 @@ RUCY_DEF1(compare, other)
 RUCY_END
 
 static
-RUCY_DEF1(load, path)
+RUCY_DEF3(load, path, pixel_density, smooth)
 {
-	return value(Rays::load_image(path.c_str()));
+	return value(Rays::load_image(
+		path.c_str(), to<float>(pixel_density), to<bool>(smooth)));
 }
 RUCY_END
 

data/ext/rays/matrix.cpp

@@ -1,7 +1,6 @@
 #include "rays/ruby/matrix.h"
 
 
-#include <assert.h>
 #include "rays/ruby/point.h"
 #include "defs.h"
 
@@ -304,14 +303,12 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::Matrix
 	value_to<Rays::Matrix> (int argc, const Value* argv, bool convert)
 	{
-		if (argc == 1 && argv->is_array())
+		if (argc == 1 && argv && argv->is_array())
 		{
 			argc = argv->size();
 			argv = argv->as_array();
 		}
 
-		assert(argc == 0 || (argc > 0 && argv));
-
 		if (convert)
 		{
 			if (argc == 0)

data/ext/rays/painter.cpp

@@ -2,6 +2,7 @@
 
 
 #include <vector>
+#include "rays/exception.h"
 #include "rays/ruby/point.h"
 #include "rays/ruby/bounds.h"
 #include "rays/ruby/color.h"
@@ -26,6 +27,13 @@ RUCY_DEF_ALLOC(alloc, klass)
 }
 RUCY_END
 
+static
+RUCY_DEF1(initialize_copy, obj)
+{
+	Rays::rays_error(__FILE__, __LINE__, "can not duplicate Painter");
+}
+RUCY_END
+
 static
 RUCY_DEFN(canvas)
 {
@@ -865,6 +873,7 @@ Init_rays_painter ()
 
 	cPainter = mRays.define_class("Painter");
 	cPainter.define_alloc_func(alloc);
+	cPainter.define_private_method("initialize_copy", initialize_copy);
 
 	cPainter.define_method("canvas", canvas);
 	cPainter.define_method("bounds", bounds);

data/ext/rays/point.cpp

@@ -1,7 +1,6 @@
 #include "rays/ruby/point.h"
 
 
-#include <assert.h>
 #include "defs.h"
 
 
@@ -306,14 +305,12 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::Point
 	value_to<Rays::Point> (int argc, const Value* argv, bool convert)
 	{
-		if (argc == 1 && argv->is_array())
+		if (argc == 1 && argv && argv->is_array())
 		{
 			argc = argv->size();
 			argv = argv->as_array();
 		}
 
-		assert(argc == 0 || (argc > 0 && argv));
-
 		if (convert)
 		{
 			if (argc == 0)

data/ext/rays/polygon.cpp

@@ -23,7 +23,7 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF4(setup, args, loop, colors, texcoords)
+RUCY_DEF4(initialize, args, loop, colors, texcoords)
 {
 	CHECK;
 
@@ -39,6 +39,14 @@ RUCY_DEF4(setup, args, loop, colors, texcoords)
 }
 RUCY_END
 
+static
+RUCY_DEF1(initialize_copy, obj)
+{
+	CHECK;
+	*THIS = to<Rays::Polygon&>(obj);
+}
+RUCY_END
+
 static
 RUCY_DEFN(expand)
 {
@@ -105,7 +113,7 @@ RUCY_DEF0(each)
 
 	Value ret = Qnil;
 	for (const auto& polyline : *THIS)
-		ret = rb_yield(value(polyline));
+		ret = yield(value(polyline));
 	return ret;
 }
 RUCY_END
@@ -371,7 +379,8 @@ Init_rays_polygon ()
 
 	cPolygon = mRays.define_class("Polygon");
 	cPolygon.define_alloc_func(alloc);
-	cPolygon.define_private_method("setup", setup);
+	cPolygon.define_private_method("initialize!",     initialize);
+	cPolygon.define_private_method("initialize_copy", initialize_copy);
 	cPolygon.define_method("expand", expand);
 	cPolygon.define_method("bounds", bounds);
 	cPolygon.define_method("size",   size);

data/ext/rays/polyline.cpp

@@ -1,7 +1,6 @@
 #include "rays/ruby/polyline.h"
 
 
-#include <assert.h>
 #include <vector>
 #include "rays/ruby/color.h"
 #include "rays/ruby/point.h"
@@ -25,7 +24,7 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF6(setup, points, loop, fill, colors, texcoords, hole)
+RUCY_DEF6(initialize, points, loop, fill, colors, texcoords, hole)
 {
 	CHECK;
 
@@ -37,6 +36,14 @@ RUCY_DEF6(setup, points, loop, fill, colors, texcoords, hole)
 }
 RUCY_END
 
+static
+RUCY_DEF1(initialize_copy, obj)
+{
+	CHECK;
+	*THIS = to<Rays::Polyline&>(obj);
+}
+RUCY_END
+
 static
 RUCY_DEFN(expand)
 {
@@ -151,7 +158,7 @@ RUCY_DEF0(each_point)
 
 	Value ret = Qnil;
 	for (const auto& point : *THIS)
-		ret = rb_yield(value(point));
+		ret = yield(value(point));
 	return ret;
 }
 RUCY_END
@@ -168,7 +175,7 @@ RUCY_DEF0(each_color)
 	{
 		size_t size = THIS->size();
 		for (size_t i = 0; i < size; ++i)
-			ret = rb_yield(value(colors[i]));
+			ret = yield(value(colors[i]));
 	}
 	return ret;
 }
@@ -186,7 +193,7 @@ RUCY_DEF0(each_texcoord)
 	{
 		size_t size = THIS->size();
 		for (size_t i = 0; i < size; ++i)
-			ret = rb_yield(value(*(Rays::Point*) &texcoords[i]));
+			ret = yield(value(*(Rays::Point*) &texcoords[i]));
 	}
 	return ret;
 }
@@ -202,7 +209,8 @@ Init_rays_polyline ()
 
 	cPolyline = mRays.define_class("Polyline");
 	cPolyline.define_alloc_func(alloc);
-	cPolyline.define_private_method("setup", setup);
+	cPolyline.define_private_method("initialize!",     initialize);
+	cPolyline.define_private_method("initialize_copy", initialize_copy);
 	cPolyline.define_method("expand", expand);
 	cPolyline.define_method("bounds", bounds);
 	cPolyline.define_method("loop?", is_loop);
@@ -227,8 +235,6 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::Polyline
 	value_to<Rays::Polyline> (int argc, const Value* argv, bool convert)
 	{
-		assert(argc == 0 || (argc > 0 && argv));
-
 		if (convert)
 		{
 			if (argc <= 0)

data/ext/rays/rays.cpp

@@ -1,7 +1,6 @@
 #include "rays/ruby/rays.h"
 
 
-#include <assert.h>
 #include <vector>
 #include "defs.h"
 
@@ -115,7 +114,8 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::CapType
 	value_to<Rays::CapType> (int argc, const Value* argv, bool convert)
 	{
-		assert(argc > 0 && argv);
+		if (argc <= 0 || !argv)
+			argument_error(__FILE__, __LINE__);
 
 		if (convert)
 		{
@@ -148,7 +148,8 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::JoinType
 	value_to<Rays::JoinType> (int argc, const Value* argv, bool convert)
 	{
-		assert(argc > 0 && argv);
+		if (argc <= 0 || !argv)
+			argument_error(__FILE__, __LINE__);
 
 		if (convert)
 		{
@@ -181,7 +182,8 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::BlendMode
 	value_to<Rays::BlendMode> (int argc, const Value* argv, bool convert)
 	{
-		assert(argc > 0 && argv);
+		if (argc <= 0 || !argv)
+			argument_error(__FILE__, __LINE__);
 
 		if (convert)
 		{
@@ -214,7 +216,8 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::TexCoordMode
 	value_to<Rays::TexCoordMode> (int argc, const Value* argv, bool convert)
 	{
-		assert(argc > 0 && argv);
+		if (argc <= 0 || !argv)
+			argument_error(__FILE__, __LINE__);
 
 		if (convert)
 		{
@@ -247,7 +250,8 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::TexCoordWrap
 	value_to<Rays::TexCoordWrap> (int argc, const Value* argv, bool convert)
 	{
-		assert(argc > 0 && argv);
+		if (argc <= 0 || !argv)
+			argument_error(__FILE__, __LINE__);
 
 		if (convert)
 		{

data/ext/rays/shader.cpp

@@ -1,7 +1,7 @@
 #include "rays/ruby/shader.h"
 
 
-#include <assert.h>
+#include "rays/exception.h"
 #include "rays/ruby/image.h"
 #include "defs.h"
 
@@ -20,6 +20,13 @@ RUCY_DEF_ALLOC(alloc, klass)
 }
 RUCY_END
 
+static
+RUCY_DEF1(initialize_copy, obj)
+{
+	Rays::rays_error(__FILE__, __LINE__, "can not duplicate Shader");
+}
+RUCY_END
+
 static const char*
 to_name (const Value& names, size_t index)
 {
@@ -82,7 +89,7 @@ make_env (const Value& names, const Value& ignore_no_uniform_location_error)
 }
 
 static
-RUCY_DEF4(setup,
+RUCY_DEF4(initialize,
 	fragment_shader_source, vertex_shader_source,
 	builtin_variable_names, ignore_no_uniform_location_error)
 {
@@ -185,7 +192,8 @@ Init_rays_shader ()
 
 	cShader = mRays.define_class("Shader");
 	cShader.define_alloc_func(alloc);
-	cShader.define_private_method("setup", setup);
+	cShader.define_private_method("initialize!",     initialize);
+	cShader.define_private_method("initialize_copy", initialize_copy);
 	cShader.define_private_method("set_uniform", set_uniform);
 	cShader.define_method(  "vertex_shader_source",   get_vertex_shader_source);
 	cShader.define_method("fragment_shader_source", get_fragment_shader_source);
@@ -199,13 +207,14 @@ namespace Rucy
 	template <> RAYS_EXPORT Rays::Shader
 	value_to<Rays::Shader> (int argc, const Value* argv, bool convert)
 	{
-		if (argc == 1 && argv->is_array())
+		if (argc == 1 && argv && argv->is_array())
 		{
 			argc = argv->size();
 			argv = argv->as_array();
 		}
 
-		assert(argc > 0 && argv);
+		if (argc <= 0 || !argv)
+			argument_error(__FILE__, __LINE__);
 
 		if (convert)
 		{

data/include/rays/bitmap.h

@@ -24,7 +24,7 @@ namespace Rays
 			Bitmap ();
 
 			Bitmap (
-				int width, int height, const ColorSpace& cs = RGBA,
+				int width, int height, const ColorSpace& cs = DEFAULT_COLORSPACE,
 				const void* pixels = NULL);
 
 			~Bitmap ();

data/include/rays/color_space.h

@@ -14,7 +14,7 @@ namespace Rays
 	enum ColorSpaceType
 	{
 
-		COLORSPACE_UNKNOWN = 0,
+		COLORSPACE_NONE = 0,
 
 		 GRAY_8,  GRAY_16,  GRAY_24,  GRAY_32,  GRAY_float,
 
@@ -40,7 +40,11 @@ namespace Rays
 
 		BGRA  = BGRA_8888, BGRX = BGRX_8888, ABGR = ABGR_8888, XBGR = XBGR_8888,
 
-		DEFAULT_COLOR_SPACE = RGBA
+#ifdef WIN32
+		DEFAULT_COLORSPACE = BGRA,
+#else
+		DEFAULT_COLORSPACE = RGBA,
+#endif
 
 	};// ColorSpaceType
 

data/include/rays/defs.h

@@ -22,14 +22,24 @@ namespace Rays
 {
 
 
-	using namespace Xot::Types;
+	namespace Types
+	{
 
-	using Xot::String;
 
-	using Xot::StringList;
+		typedef float coord;
+
+
+	}// Types
+
 
+	using namespace Xot ::Types;
 
-	typedef float coord;
+	using namespace Rays::Types;
+
+
+	using Xot::String;
+
+	using Xot::StringList;
 
 
 	enum CapType

data/include/rays/image.h

@@ -26,7 +26,7 @@ namespace Rays
 			Image ();
 
 			Image (
-				int width, int height, const ColorSpace& cs = DEFAULT_COLOR_SPACE,
+				int width, int height, const ColorSpace& cs = DEFAULT_COLORSPACE,
 				float pixel_density = 1, bool smooth = false);
 
 			Image (
@@ -78,7 +78,7 @@ namespace Rays
 	};// Image
 
 
-	Image load_image (const char* path);
+	Image load_image (const char* path, float pixel_density = 1, bool smooth = false);
 
 
 }// Rays

data/lib/rays/camera.rb

@@ -11,7 +11,7 @@ module Rays
       min_width = -1, min_height = -1,
       device_name: nil, resize: true, crop: true, &block)
 
-      setup device_name, min_width, min_height, resize, crop
+      initialize! device_name, min_width, min_height, resize, crop
       Xot::BlockUtil.instance_eval_or_block_call self, &block if block
     end
 

data/lib/rays/extension.rb

@@ -6,7 +6,7 @@ module Rays
     module_function
 
     def name(downcase = false)
-      super().split('::')[-2].then {|s|
+      super().split('::')[..-2].join.then {|s|
         downcase ? s.gsub(/([a-z])([A-Z])/) {"#{$1}-#{$2}"}.downcase : s
       }
     end

data/lib/rays/image.rb

@@ -39,9 +39,9 @@ module Rays
       get_bitmap true
     end
 
-    def self.load(path)
+    def self.load(path, pixel_density: 1, smooth: false)
       raise Errno::ENOENT, "no such file: '#{path}'" unless File.exist? path
-      load! path
+      load! path, pixel_density, smooth
     end
 
   end# Image

data/lib/rays/polygon.rb

@@ -11,7 +11,7 @@ module Rays
     include Comparable
 
     def initialize(*args, loop: true, colors: nil, texcoords: nil)
-      setup args, loop, colors, texcoords
+      initialize! args, loop, colors, texcoords
     end
 
     def transform(&block)

data/lib/rays/polyline.rb

@@ -12,7 +12,7 @@ module Rays
     def initialize(
       *points, loop: false, fill: nil, colors: nil, texcoords: nil, hole: false)
 
-      setup points, loop, (fill != nil ? fill : loop), colors, texcoords, hole
+      initialize! points, loop, (fill != nil ? fill : loop), colors, texcoords, hole
     end
 
     def with(**kwargs)

data/lib/rays/shader.rb

@@ -14,7 +14,7 @@ module Rays
       ignore_no_uniform_location_error: false,
       **uniforms, &block)
 
-      setup(
+      initialize!(
         fragment_shader_source, vertex_shader_source,
         builtin_variable_names&.values_at(
           :attribute_position,

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_dependency 'xot',  '~> 0.3.15'
-  s.add_dependency 'rucy', '~> 0.3.15'
+  s.add_dependency 'xot',  '~> 0.4.0'
+  s.add_dependency 'rucy', '~> 0.4.0'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/color_space.cpp

@@ -26,7 +26,7 @@ namespace Rays
 
 
 	ColorSpace::ColorSpace ()
-	:	type_(COLORSPACE_UNKNOWN), premult(false)
+	:	type_(COLORSPACE_NONE), premult(false)
 	{
 	}
 
@@ -46,7 +46,7 @@ namespace Rays
 	{
 		static const int BPPS[] =
 		{
-			0,                 // UNKNOWN
+			0,                 // NONE
 			8, 16, 24, 32, 32, // GRAY
 			8, 16, 24, 32, 32, // ALPHA
 			8, 8, 8, 8, 8,     // RGB(A),
@@ -54,7 +54,7 @@ namespace Rays
 			32, 32, 32,        // RGB(A) float
 			32, 32, 32,        // BGR(A) float
 		};
-		if (type_ < 0 || COLORSPACE_MAX <= type_) return BPPS[COLORSPACE_UNKNOWN];
+		if (type_ < 0 || COLORSPACE_MAX <= type_) return BPPS[COLORSPACE_NONE];
 		return BPPS[type_];
 	}
 
@@ -69,7 +69,7 @@ namespace Rays
 	{
 		static const int BPPS[] =
 		{
-			0,                     // UNKNOWN
+			0,                     // NONE
 			8,  16,  24,  32,  32, // GRAY
 			8,  16,  24,  32,  32, // ALPHA
 			24, 32,  32,  32,  32, // RGB(A)
@@ -77,7 +77,7 @@ namespace Rays
 			96, 128, 128,          // RGB(A) float
 			96, 128, 128,          // BGR(A) float
 		};
-		if (type_ < 0 || COLORSPACE_MAX <= type_) return BPPS[COLORSPACE_UNKNOWN];
+		if (type_ < 0 || COLORSPACE_MAX <= type_) return BPPS[COLORSPACE_NONE];
 		return BPPS[type_];
 	}
 

data/src/image.cpp

@@ -178,9 +178,9 @@ namespace Rays
 	}
 
 	Image
-	load_image (const char* path)
+	load_image (const char* path, float pixel_density, bool smooth)
 	{
-		return Image(Bitmap_load(path));
+		return Image(Bitmap_load(path), pixel_density, smooth);
 	}
 
 

data/src/ios/bitmap.mm

@@ -120,7 +120,7 @@ namespace Rays
 			if (pixels) delete [] (uchar*) pixels;
 
 			width = height = 0;
-			color_space = COLORSPACE_UNKNOWN;
+			color_space = COLORSPACE_NONE;
 			pixels      = NULL;
 			context     = NULL;
 			modified    = false;
@@ -323,8 +323,8 @@ namespace Rays
 	{
 		if (!*this)
 		{
-			static const ColorSpace UNKNOWN = COLORSPACE_UNKNOWN;
-			return UNKNOWN;
+			static const ColorSpace NONE = COLORSPACE_NONE;
+			return NONE;
 		}
 		return self->color_space;
 	}

data/src/ios/font.mm

@@ -67,7 +67,7 @@ namespace Rays
 			CFRelease);
 
 		CFAttributedStringPtr attrstr(
-			CFAttributedStringCreate(NULL, Xot::cfstring(str).get(), attr.get()),
+			CFAttributedStringCreate(NULL, Xot::String(str).to_cfstr().get(), attr.get()),
 			CFRelease);
 
 		return CTLinePtr(
@@ -129,7 +129,7 @@ namespace Rays
 	RawFont::RawFont (const char* name, coord size)
 	{
 		self->font = name
-			?	CTFontCreateWithName(Xot::cfstring(name).get(), size, NULL)
+			?	CTFontCreateWithName(Xot::String(name).to_cfstr().get(), size, NULL)
 			:	CTFontCreateUIFontForLanguage(kCTFontSystemFontType, size, NULL);
 	}
 
@@ -139,7 +139,7 @@ namespace Rays
 		if (path)
 			*this = RawFont_load(path, size);
 		else
-			self->font = CTFontCreateWithName(Xot::cfstring(obj.name()).get(), size, NULL);
+			self->font = CTFontCreateWithName(obj.name().to_cfstr().get(), size, NULL);
 	}
 
 	RawFont::~RawFont ()

data/src/opengl/bitmap.cpp

@@ -23,7 +23,7 @@ namespace Rays
 			&bmp, tex.width(), tex.height(), tex.color_space(), NULL, false);
 
 		GLenum format, type;
-		ColorSpace_get_gl_format_and_type(&format, &type, tex.color_space());
+		ColorSpace_get_gl_format_and_type(NULL, &format, &type, tex.color_space());
 
 		FrameBuffer fb(tex);
 		FrameBufferBinder binder(fb.id());

data/src/opengl/color_space.cpp

@@ -10,14 +10,23 @@ namespace Rays
 
 	void
 	ColorSpace_get_gl_format_and_type (
-		GLenum* format, GLenum* type, const ColorSpace& cs)
+		GLenum* internalformat, GLenum* format, GLenum* type, const ColorSpace& cs)
 	{
-		if (!format && !type)
+		if (!internalformat && !format && !type)
 			argument_error(__FILE__, __LINE__);
 
 		if (!cs)
 			invalid_state_error(__FILE__, __LINE__);
 
+		if (internalformat)
+		{
+			if (cs.is_rgb() || cs.is_bgr()) *internalformat = cs.has_alpha() ? GL_RGBA  : GL_RGB;
+			else if (cs.is_gray())          *internalformat = GL_LUMINANCE;
+			else if (cs.is_alpha())         *internalformat = GL_ALPHA;
+			else
+				rays_error(__FILE__, __LINE__, "invalid color space.");
+		}
+
 		if (format)
 		{
 			     if (cs.is_rgb())   *format = cs.has_alpha() ? GL_RGBA  : GL_RGB;

data/src/opengl/color_space.h

@@ -13,7 +13,7 @@ namespace Rays
 
 
 	void ColorSpace_get_gl_format_and_type (
-		GLenum* format, GLenum* type, const ColorSpace& cs);
+		GLenum* internalformat, GLenum* format, GLenum* type, const ColorSpace& cs);
 
 
 }// Rays