rays 0.1.14 → 0.1.15

data/ext/rays/painter.cpp

@@ -153,6 +153,38 @@ RUCY_DEF6(ellipse, args, center, radius, hole, angle_from, angle_to)
 }
 RUCY_END
 
+static
+RUCY_DEF2(curve, args, loop)
+{
+	CHECK;
+
+	if (args.empty())
+		argument_error(__FILE__, __LINE__);
+
+	std::vector<Rays::Point> points;
+	get_line_args(&points, args.size(), args.as_array());
+
+	THIS->curve(&points[0], points.size(), loop);
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF2(bezier, args, loop)
+{
+	CHECK;
+
+	if (args.empty())
+		argument_error(__FILE__, __LINE__);
+
+	std::vector<Rays::Point> points;
+	get_line_args(&points, args.size(), args.as_array());
+
+	THIS->bezier(&points[0], points.size(), loop);
+	return self;
+}
+RUCY_END
+
 static
 RUCY_DEFN(image)
 {
@@ -317,6 +349,67 @@ RUCY_DEF0(get_stroke_width)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_stroke_cap, cap)
+{
+	CHECK;
+
+	int type = to<int>(cap);
+	if (type < 0 || Rays::CAP_MAX <= type)
+		argument_error(__FILE__, __LINE__, "invalid stroke cap -- %d", type);
+
+	THIS->set_stroke_cap((Rays::CapType) type);
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_stroke_cap)
+{
+	CHECK;
+	return value(THIS->stroke_cap());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_stroke_join, join)
+{
+	CHECK;
+
+	int type = to<int>(join);
+	if (type < 0 || Rays::JOIN_MAX <= type)
+		argument_error(__FILE__, __LINE__, "invalid stroke join -- %d", type);
+
+	THIS->set_stroke_join((Rays::JoinType) type);
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_stroke_join)
+{
+	CHECK;
+	return value(THIS->stroke_join());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_miter_limit, limit)
+{
+	CHECK;
+	THIS->set_miter_limit(to<coord>(limit));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_miter_limit)
+{
+	CHECK;
+	return value(THIS->miter_limit());
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_nsegment, nsegment)
 {
@@ -534,6 +627,8 @@ Init_painter ()
 	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);
 
@@ -543,11 +638,17 @@ Init_painter ()
 	cPainter.define_method(   "fill=", set_fill);
 	cPainter.define_method(   "fill",  get_fill);
 	cPainter.define_method("no_fill",   no_fill);
-	cPainter.define_method(   "stroke=", set_stroke);
-	cPainter.define_method(   "stroke",  get_stroke);
-	cPainter.define_method("no_stroke",   no_stroke);
+	cPainter.define_method(   "stroke=",       set_stroke);
+	cPainter.define_method(   "stroke",        get_stroke);
+	cPainter.define_method("no_stroke",         no_stroke);
 	cPainter.define_method(   "stroke_width=", set_stroke_width);
 	cPainter.define_method(   "stroke_width",  get_stroke_width);
+	cPainter.define_method(   "stroke_cap=",   set_stroke_cap);
+	cPainter.define_method(   "stroke_cap",    get_stroke_cap);
+	cPainter.define_method(   "stroke_join=",  set_stroke_join);
+	cPainter.define_method(   "stroke_join",   get_stroke_join);
+	cPainter.define_method("miter_limit=", set_miter_limit);
+	cPainter.define_method("miter_limit",  get_miter_limit);
 	cPainter.define_method("nsegment=", set_nsegment);
 	cPainter.define_method("nsegment",  get_nsegment);
 	cPainter.define_method(   "clip=", set_clip);

data/ext/rays/polygon.cpp

@@ -27,7 +27,7 @@ RUCY_DEF2(setup, args, loop)
 {
 	CHECK;
 
-	if (loop)
+	if (args[0].is_kind_of(Rays::polyline_class()))
 		*THIS = to<Rays::Polygon>(args.size(), args.as_array());
 	else
 	{
@@ -39,12 +39,18 @@ RUCY_DEF2(setup, args, loop)
 RUCY_END
 
 static
-RUCY_DEF1(expand, width)
+RUCY_DEFN(expand)
 {
 	CHECK;
+	check_arg_count(__FILE__, __LINE__, "Polygon#expand", argc, 1, 2, 3, 4);
+
+	coord width         =             to<coord>         (argv[0]);
+	Rays::CapType cap   = argc >= 2 ? to<Rays::CapType> (argv[1]) : Rays::CAP_DEFAULT;
+	Rays::JoinType join = argc >= 3 ? to<Rays::JoinType>(argv[2]) : Rays::JOIN_DEFAULT;
+	coord ml            = argc >= 4 ? to<coord>         (argv[3]) : Rays::JOIN_DEFAULT_MITER_LIMIT;
 
 	Rays::Polygon polygon;
-	THIS->expand(&polygon, to<coord>(width));
+	THIS->expand(&polygon, width, cap, join, ml);
 	return value(polygon);
 }
 RUCY_END
@@ -219,6 +225,26 @@ RUCY_DEF7(create_ellipse,
 }
 RUCY_END
 
+static
+RUCY_DEF2(create_curve, args, loop)
+{
+	std::vector<Rays::Point> points;
+	get_line_args(&points, args.size(), args.as_array());
+
+	return value(Rays::create_curve(&points[0], points.size(), loop));
+}
+RUCY_END
+
+static
+RUCY_DEF2(create_bezier, args, loop)
+{
+	std::vector<Rays::Point> points;
+	get_line_args(&points, args.size(), args.as_array());
+
+	return value(Rays::create_bezier(&points[0], points.size(), loop));
+}
+RUCY_END
+
 
 static Class cPolygon;
 
@@ -243,6 +269,8 @@ Init_polygon ()
 	cPolygon.define_method("^", op_xor);
 	cPolygon.define_singleton_method("create_rect",    create_rect);
 	cPolygon.define_singleton_method("create_ellipse", create_ellipse);
+	cPolygon.define_singleton_method("create_curve",   create_curve);
+	cPolygon.define_singleton_method("create_bezier",  create_bezier);
 }
 
 

data/ext/rays/polyline.cpp

@@ -34,12 +34,18 @@ RUCY_DEF2(setup, points, loop)
 RUCY_END
 
 static
-RUCY_DEF1(expand, width)
+RUCY_DEFN(expand)
 {
 	CHECK;
+	check_arg_count(__FILE__, __LINE__, "Polyline#expand", argc, 1, 2, 3, 4);
+
+	coord width         =             to<coord>         (argv[0]);
+	Rays::CapType cap   = argc >= 2 ? to<Rays::CapType> (argv[1]) : Rays::CAP_DEFAULT;
+	Rays::JoinType join = argc >= 3 ? to<Rays::JoinType>(argv[2]) : Rays::JOIN_DEFAULT;
+	coord ml            = argc >= 4 ? to<coord>         (argv[3]) : Rays::JOIN_DEFAULT_MITER_LIMIT;
 
 	Rays::Polygon polygon;
-	THIS->expand(&polygon, to<coord>(width));
+	THIS->expand(&polygon, width, cap, join, ml);
 	return value(polygon);
 }
 RUCY_END

data/ext/rays/rays.cpp

@@ -1,7 +1,45 @@
-#include "rays/rays.h"
+#include "rays/ruby/rays.h"
+
+
 #include "defs.h"
 
 
+RUCY_DEFINE_VALUE_OR_ARRAY_TO(Rays::CapType)
+RUCY_DEFINE_VALUE_OR_ARRAY_TO(Rays::JoinType)
+
+
+static struct CapTypeEnum
+{
+	const char* name;
+	Rays::CapType type;
+}
+CAP_TYPES[] =
+{
+	{"CAP_BUTT",   Rays::CAP_BUTT},
+	{"CAP_ROUND",  Rays::CAP_ROUND},
+	{"CAP_SQUARE", Rays::CAP_SQUARE},
+};
+
+static const size_t CAP_TYPES_SIZE =
+	sizeof(CAP_TYPES) / sizeof(CAP_TYPES[0]);
+
+
+static struct JoinTypeEnum
+{
+	const char* name;
+	Rays::JoinType type;
+}
+JOIN_TYPES[] =
+{
+	{"JOIN_MITER",  Rays::JOIN_MITER},
+	{"JOIN_ROUND",  Rays::JOIN_ROUND},
+	{"JOIN_SQUARE", Rays::JOIN_SQUARE},
+};
+
+static const size_t JOIN_TYPES_SIZE =
+	sizeof(JOIN_TYPES) / sizeof(JOIN_TYPES[0]);
+
+
 static
 RUCY_DEF0(init)
 {
@@ -25,11 +63,77 @@ void
 Init_rays ()
 {
 	mRays = define_module("Rays");
+
 	mRays.define_singleton_method("init!", init);
 	mRays.define_singleton_method("fin!", fin);
+
+	for (size_t i = 0; i < CAP_TYPES_SIZE; ++i)
+		mRays.define_const(CAP_TYPES[i].name, CAP_TYPES[i].type);
+
+	for (size_t i = 0; i < JOIN_TYPES_SIZE; ++i)
+		mRays.define_const(JOIN_TYPES[i].name, JOIN_TYPES[i].type);
 }
 
 
+namespace Rucy
+{
+
+
+	template <> Rays::CapType
+	value_to<Rays::CapType> (int argc, const Value* argv, bool convert)
+	{
+		assert(argc > 0 && argv);
+
+		if (convert)
+		{
+			if (argv->is_s() || argv->is_sym())
+			{
+				const char* str = argv->c_str();
+				for (size_t i = 0; i < CAP_TYPES_SIZE; ++i)
+				{
+					if (strcasecmp(str, CAP_TYPES[i].name) == 0)
+						return CAP_TYPES[i].type;
+				}
+			}
+		}
+
+		uint type = value_to<uint>(*argv, convert);
+		if (type >= Rays::CAP_MAX)
+			argument_error(__FILE__, __LINE__, "invalid cap type -- %d", type);
+
+		return (Rays::CapType) type;
+	}
+
+
+	template <> Rays::JoinType
+	value_to<Rays::JoinType> (int argc, const Value* argv, bool convert)
+	{
+		assert(argc > 0 && argv);
+
+		if (convert)
+		{
+			if (argv->is_s() || argv->is_sym())
+			{
+				const char* str = argv->c_str();
+				for (size_t i = 0; i < JOIN_TYPES_SIZE; ++i)
+				{
+					if (strcasecmp(str, JOIN_TYPES[i].name) == 0)
+						return JOIN_TYPES[i].type;
+				}
+			}
+		}
+
+		uint type = value_to<uint>(*argv, convert);
+		if (type >= Rays::JOIN_MAX)
+			argument_error(__FILE__, __LINE__, "invalid join type -- %d", type);
+
+		return (Rays::JoinType) type;
+	}
+
+
+}// Rucy
+
+
 namespace Rays
 {
 

data/include/rays/color_space.h

@@ -14,7 +14,7 @@ namespace Rays
 	enum ColorSpaceType
 	{
 
-		COLORSPACE_UNKNOWN = Xot::UNKNOWN,
+		COLORSPACE_UNKNOWN = 0,
 
 		 GRAY_8,  GRAY_16,  GRAY_24,  GRAY_32,  GRAY_float,
 
@@ -28,7 +28,7 @@ namespace Rays
 
 		BGR_float, BGRA_float, ABGR_float,
 
-		COLORSPACE_LAST,
+		COLORSPACE_MAX,
 
 		GRAY  =  GRAY_8,
 
@@ -40,6 +40,8 @@ namespace Rays
 
 		BGRA  = BGRA_8888, BGRX = BGRX_8888, ABGR = ABGR_8888, XBGR = XBGR_8888,
 
+		DEFAULT_COLOR_SPACE = RGBA
+
 	};// ColorSpaceType
 
 

data/include/rays/defs.h

@@ -23,6 +23,39 @@ namespace Rays
 	typedef float coord;
 
 
+	enum CapType
+	{
+
+		CAP_BUTT = 0,
+
+		CAP_ROUND,
+
+		CAP_SQUARE,
+
+		CAP_MAX,
+
+		CAP_DEFAULT = CAP_BUTT
+
+	};// CapType
+
+
+	enum JoinType
+	{
+
+		JOIN_MITER = 0,
+
+		JOIN_ROUND,
+
+		JOIN_SQUARE,
+
+		JOIN_MAX,
+
+		JOIN_DEFAULT             = JOIN_MITER,
+		JOIN_DEFAULT_MITER_LIMIT = 2
+
+	};// JoinType
+
+
 }// Rays
 
 

data/include/rays/image.h

@@ -26,7 +26,7 @@ namespace Rays
 			Image ();
 
 			Image (
-				int width, int height, const ColorSpace& cs = RGBA,
+				int width, int height, const ColorSpace& cs = DEFAULT_COLOR_SPACE,
 				float pixel_density = 1);
 
 			Image (const Bitmap& bitmap, float pixel_density = 1);

data/include/rays/painter.h

@@ -106,6 +106,32 @@ namespace Rays
 				const Point& hole_radius = 0,
 				float angle_from = 0, float angle_to = 360);
 
+			void curve (
+				coord x1, coord y1, coord x2, coord y2,
+				coord x3, coord y3, coord x4, coord y4,
+				bool loop = false);
+
+			void curve (
+				const Point& p1, const Point& p2, const Point& p3, const Point& p4,
+				bool loop = false);
+
+			void curve (
+				const Point* points, size_t size,
+				bool loop = false);
+
+			void bezier (
+				coord x1, coord y1, coord x2, coord y2,
+				coord x3, coord y3, coord x4, coord y4,
+				bool loop = false);
+
+			void bezier (
+				const Point& p1, const Point& p2, const Point& p3, const Point& p4,
+				bool loop = false);
+
+			void bezier (
+				const Point* points, size_t size,
+				bool loop = false);
+
 			void image (
 				const Image& image, coord x = 0, coord y = 0);
 
@@ -176,6 +202,18 @@ namespace Rays
 
 			coord    stroke_width () const;
 
+			void set_stroke_cap (CapType cap);
+
+			CapType  stroke_cap () const;
+
+			void set_stroke_join (JoinType join);
+
+			JoinType stroke_join () const;
+
+			void set_miter_limit (coord limit);
+
+			coord    miter_limit () const;
+
 			void set_nsegment (int nsegment);
 
 			uint     nsegment () const;