rays 0.1.12 → 0.1.13

data/ext/rays/defs.cpp

@@ -0,0 +1,183 @@
+#include "defs.h"
+
+
+#include <assert.h>
+#include "rays/ruby/bounds.h"
+#include "rays/ruby/point.h"
+
+
+void
+get_line_args (std::vector<Rays::Point>* points, int argc, const Value* argv)
+{
+	assert(points && argv);
+
+	points->clear();
+
+	if (argc <= 0)
+		return;
+
+	if (argv[0].is_num())
+	{
+		if (argc % 2 != 0)
+			argument_error(__FILE__, __LINE__);
+
+		points->reserve(argc / 2);
+		for (int i = 0; i < argc; i += 2)
+		{
+			coord x = to<coord>(argv[i + 0]);
+			coord y = to<coord>(argv[i + 1]);
+			points->emplace_back(Rays::Point(x, y));
+		}
+	}
+	else
+	{
+		points->reserve(argc);
+		for (int i = 0; i < argc; ++i)
+			points->emplace_back(to<Rays::Point>(argv[i]));
+	}
+}
+
+static uint
+get_nsegment (Value nsegment)
+{
+	int value = nsegment ? to<int>(nsegment) : 0;
+	if (value < 0) value = 0;
+	return (uint) value;
+}
+
+void get_rect_args (
+	coord* x, coord* y, coord* w, coord* h,
+	coord* lt, coord* rt, coord* lb, coord* rb,
+	uint* nseg,
+	int argc, const Value* argv,
+	Value round, Value lefttop, Value righttop, Value leftbottom, Value rightbottom,
+	Value nsegment)
+{
+	assert(x && y && w && h && lt && rt && lb && rb && nseg && argv);
+
+	if (argc <= 0)
+		argument_error(__FILE__, __LINE__);
+
+	if (argv[0].is_kind_of(Rays::bounds_class()))
+	{
+		Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
+		*x  = b.x;
+		*y  = b.y;
+		*w  = b.w;
+		*h  = b.h;
+		*lt = argc >= 2 ? to<coord>(argv[1]) : 0;
+		*rt = argc >= 3 ? to<coord>(argv[2]) : *lt;
+		*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()))
+	{
+		if (argc < 2)
+			argument_error(__FILE__, __LINE__);
+
+		Rays::Point& p = to<Rays::Point&>(argv[0]);
+		*x  = p.x;
+		*y  = p.y;
+		*w  =             to<coord>(argv[1]);
+		*h  = argc >= 3 ? to<coord>(argv[2]) : *w;
+		*lt = argc >= 4 ? to<coord>(argv[3]) : 0;
+		*rt = argc >= 5 ? to<coord>(argv[4]) : *lt;
+		*lb = argc >= 6 ? to<coord>(argv[5]) : *lt;
+		*rb = argc >= 7 ? to<coord>(argv[6]) : *lt;
+	}
+	else if (argc <= 2)
+	{
+		*x = *y = *lt = *rt = *lb = *rb = 0;
+		*w =             to<coord>(argv[0]);
+		*h = argc >= 2 ? to<coord>(argv[1]) : *w;
+	}
+	else
+	{
+		*x  =             to<coord>(argv[0]);
+		*y  =             to<coord>(argv[1]);
+		*w  =             to<coord>(argv[2]);
+		*h  = argc >= 4 ? to<coord>(argv[3]) : *w;
+		*lt = argc >= 5 ? to<coord>(argv[4]) : 0;
+		*rt = argc >= 6 ? to<coord>(argv[5]) : *lt;
+		*lb = argc >= 7 ? to<coord>(argv[6]) : *lt;
+		*rb = argc >= 8 ? to<coord>(argv[7]) : *lt;
+	}
+
+	if (! lefttop)     lefttop    = round;
+	if (!righttop)    righttop    = round;
+	if (! leftbottom)  leftbottom = round;
+	if (!rightbottom) rightbottom = round;
+
+	if ( lefttop)    *lt = to<coord>( lefttop);
+	if (righttop)    *rt = to<coord>(righttop);
+	if ( leftbottom) *lb = to<coord>( leftbottom);
+	if (rightbottom) *rb = to<coord>(rightbottom);
+
+	*nseg = get_nsegment(nsegment);
+}
+
+void get_ellipse_args (
+	coord* x, coord* y, coord* w, coord* h,
+	Rays::Point* hole_size, float* from, float* to_,
+	uint* nseg,
+	int argc, const Value* argv,
+	Value center, Value radius, Value hole, Value angle_from, Value angle_to,
+	Value nsegment)
+{
+	assert(x && y && w && h && hole_size && from && to_ && nseg && argv);
+
+	if (argc <= 0)
+		argument_error(__FILE__, __LINE__);
+
+	if (argv[0].is_kind_of(Rays::bounds_class()))
+	{
+		const Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
+		*x = b.x;
+		*y = b.y;
+		*w = b.w;
+		*h = b.h;
+	}
+	else if (argv[0].is_kind_of(Rays::point_class()))
+	{
+		if (argc < 2)
+			argument_error(__FILE__, __LINE__);
+
+		const Rays::Point& p = to<Rays::Point&>(argv[0]);
+		*x = p.x;
+		*y = p.y;
+		*w =             to<coord>(argv[1]);
+		*h = argc >= 3 ? to<coord>(argv[2]) : *w;
+	}
+	else if (argc <= 2)
+	{
+		*x = *y = 0;
+		*w =             to<coord>(argv[0]);
+		*h = argc >= 2 ? to<coord>(argv[1]) : *w;
+	}
+	else
+	{
+		*x =             to<coord>(argv[0]);
+		*y =             to<coord>(argv[1]);
+		*w =             to<coord>(argv[2]);
+		*h = argc >= 4 ? to<coord>(argv[3]) : *w;
+	}
+
+	if (center)
+	{
+		Rays::Point p = to<Rays::Point>(center);
+		*x = p.x;
+		*y = p.y;
+	}
+
+	if (radius)
+	{
+		Rays::Point p = to<Rays::Point>(radius);
+		*w = p.x * 2;
+		*h = p.y * 2;
+	}
+
+	*hole_size = hole       ? to<Rays::Point>(hole) : 0;
+	*from      = angle_from ? to<float>(angle_from) : 0;
+	*to_       = angle_to   ? to<float>(angle_to)   : 360;
+	*nseg      = get_nsegment(nsegment);
+}

data/ext/rays/defs.h

@@ -4,10 +4,34 @@
 #define __RAYS_EXT_DEFS_H__
 
 
-#include <rays/exception.h>
+#include <vector>
+#include <rucy.h>
+#include <rays/defs.h>
+#include <rays/point.h>
 
 
-using Rays::rays_error;
+using namespace Rucy;
+
+using Rays::coord;
+
+
+void get_line_args (
+	std::vector<Rays::Point>* points,
+	int argc, const Value* argv);
+
+void get_rect_args (
+	coord* x,  coord* y,  coord* w,  coord* h,
+	coord* lt, coord* rt, coord* lb, coord* rb, uint* nseg,
+	int argc, const Value* argv,
+	Value round, Value lefttop, Value righttop, Value leftbottom, Value rightbottom,
+	Value nsegment);
+
+void get_ellipse_args (
+	coord* x, coord* y, coord* w, coord* h,
+	Rays::Point* hole_size, float* from, float* to, uint* nseg,
+	int argc, const Value* argv,
+	Value center, Value radius, Value hole, Value angel_from, Value angle_to,
+	Value nsegment);
 
 
 #endif//EOH

data/ext/rays/extconf.rb

@@ -14,13 +14,12 @@ require 'rays/module'
 
 Xot::ExtConf.new Xot, Rucy, Rays do
   setup do
-    headers    << 'boost/noncopyable.hpp' << 'ruby.h'
+    headers    << 'ruby.h'
     local_libs << 'rucy'
     libs.unshift 'gdi21', 'opengl32' if win32?
     frameworks << 'AppKit' << 'OpenGL' if osx?
     $LDFLAGS   << ' -Wl,--out-implib=native.dll.a' if cygwin?
   end
 
-  dir_config 'boost'
   create_makefile 'rays/native'
 end

data/ext/rays/font.cpp

@@ -1,16 +1,10 @@
 #include "rays/ruby/font.h"
 
 
-#include <rucy.h>
 #include "defs.h"
 
 
-using namespace Rucy;
-
-using Rays::coord;
-
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Font)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::Font)
 
 #define THIS  to<Rays::Font*>(self)
 
@@ -30,20 +24,7 @@ RUCY_DEFN(initialize)
 	RUCY_CHECK_OBJ(Rays::Font, self);
 	check_arg_count(__FILE__, __LINE__, "Font#initialize", argc, 0, 1, 2);
 
-	const char* name = (argc >= 1) ? argv[0].c_str()    : NULL;
-	float size       = (argc >= 2) ? to<float>(argv[1]) : 0;
-	*THIS = Rays::Font(name, size);
-
-	return self;
-}
-RUCY_END
-
-static
-RUCY_DEF1(initialize_copy, obj)
-{
-	RUCY_CHECK_OBJ(Rays::Font, self);
-
-	*THIS = to<Rays::Font&>(obj).copy();
+	*THIS = to<Rays::Font>(argc, argv);
 	return self;
 }
 RUCY_END
@@ -91,7 +72,6 @@ Init_font ()
 	cFont = mRays.define_class("Font");
 	cFont.define_alloc_func(alloc);
 	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("width", width);
@@ -99,6 +79,43 @@ Init_font ()
 }
 
 
+namespace Rucy
+{
+
+
+	template <> Rays::Font
+	value_to<Rays::Font> (int argc, const Value* argv, bool convert)
+	{
+		if (argc == 1 && argv->is_array())
+		{
+			argc = argv->size();
+			argv = argv->as_array();
+		}
+
+		assert(argc == 0 || (argc > 0 && argv));
+
+		if (convert)
+		{
+			if (argc == 0)
+				return Rays::default_font();
+
+			coord size = argc >= 2 ? to<coord>(argv[1]) : 0;
+			if (argv->is_nil())
+				return Rays::Font(NULL, size);
+			else if (argv->is_s() || argv->is_sym())
+				return Rays::Font(argv[0].c_str(), size);
+		}
+
+		if (argc != 1)
+			argument_error(__FILE__, __LINE__);
+
+		return value_to<Rays::Font&>(*argv, convert);
+	}
+
+
+}// Rucy
+
+
 namespace Rays
 {
 

data/ext/rays/image.cpp

@@ -1,19 +1,12 @@
 #include "rays/ruby/image.h"
 
 
-#include <rucy.h>
 #include "rays/ruby/color_space.h"
 #include "rays/ruby/bitmap.h"
-#include "rays/ruby/texture.h"
 #include "rays/ruby/painter.h"
 #include "defs.h"
 
 
-using namespace Rucy;
-
-using Rays::coord;
-
-
 RUCY_DEFINE_VALUE_FROM_TO(Rays::Image)
 
 #define THIS  to<Rays::Image*>(self)
@@ -32,26 +25,28 @@ static
 RUCY_DEFN(initialize)
 {
 	RUCY_CHECK_OBJ(Rays::Image, self);
-	check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2, 3);
-
-	if (argc == 0) return 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);
 
 		const Rays::Bitmap* bitmap = to<Rays::Bitmap*>(argv[0]);
-		if (!bitmap) argument_error(__FILE__, __LINE__);
+		if (!bitmap)
+			argument_error(__FILE__, __LINE__);
 
-		bool alpha_only = (argc == 2) ? to<bool>(argv[1]) : false;
-		*THIS = Rays::Image(*bitmap, alpha_only);
+		float pixel_density = (argc >= 2) ? to<float>(argv[1]) : 1;
+		*THIS = Rays::Image(*bitmap, pixel_density);
 	}
 	else
 	{
-		int width  = to<int>(argv[0]);
-		int height = to<int>(argv[1]);
-		uint colorspace = (argc == 3) ? to<uint>(argv[2]) : (uint) Rays::RGBA;
-		*THIS = Rays::Image(width, height, (Rays::ColorSpaceType) colorspace);
+		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);
 	}
 
 	return self;
@@ -63,19 +58,11 @@ RUCY_DEF1(initialize_copy, obj)
 {
 	RUCY_CHECK_OBJ(Rays::Image, self);
 
-	*THIS = to<Rays::Image&>(obj).copy();
+	*THIS = to<Rays::Image&>(obj).dup();
 	return self;
 }
 RUCY_END
 
-static
-RUCY_DEF0(painter)
-{
-	CHECK;
-	return value(THIS->painter());
-}
-RUCY_END
-
 static
 RUCY_DEF0(width)
 {
@@ -101,26 +88,26 @@ RUCY_DEF0(color_space)
 RUCY_END
 
 static
-RUCY_DEF0(alpha_only)
+RUCY_DEF0(pixel_density)
 {
 	CHECK;
-	return value(THIS->alpha_only());
+	return value(THIS->pixel_density());
 }
 RUCY_END
 
 static
-RUCY_DEF0(bitmap)
+RUCY_DEF0(painter)
 {
 	CHECK;
-	return value(THIS->bitmap());
+	return value(THIS->painter());
 }
 RUCY_END
 
 static
-RUCY_DEF0(texture)
+RUCY_DEF0(bitmap)
 {
 	CHECK;
-	return value(THIS->texture());
+	return value(THIS->bitmap());
 }
 RUCY_END
 
@@ -135,9 +122,11 @@ RUCY_END
 
 
 static
-RUCY_DEF2(load, path, alpha_only)
+RUCY_DEFN(load)
 {
-	return value(Rays::load_image(path.c_str(), to<bool>(alpha_only)));
+	check_arg_count(__FILE__, __LINE__, "Image.load", argc, 1);
+
+	return value(Rays::load_image(argv[0].c_str()));
 }
 RUCY_END
 
@@ -151,17 +140,16 @@ Init_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("painter", painter);
 	cImage.define_method("width", width);
 	cImage.define_method("height", height);
 	cImage.define_method("color_space", color_space);
-	cImage.define_method("alpha_only", alpha_only);
+	cImage.define_method("pixel_density", pixel_density);
+	cImage.define_method("painter", painter);
 	cImage.define_method("bitmap", bitmap);
-	cImage.define_method("texture", texture);
 	cImage.define_method("save", save);
-	cImage.define_function("load_image", load);
+	cImage.define_function("load", load);
 }