rays 0.1.47 → 0.1.48

data/ext/rays/defs.h

@@ -7,6 +7,7 @@
 #include <vector>
 #include <rucy.h>
 #include "rays/defs.h"
+#include "rays/color.h"
 #include "rays/point.h"
 #include "rays/ruby/defs.h"
 
@@ -16,9 +17,9 @@ using namespace Rucy;
 using Rays::coord;
 
 
-void get_line_args (
-	std::vector<Rays::Point>* points,
-	int argc, const Value* argv);
+void get_points (std::vector<Rays::Point>* points, int argc, const Value* argv);
+
+void get_colors (std::vector<Rays::Color>* colors, int argc, const Value* argv);
 
 void get_rect_args (
 	coord* x,  coord* y,  coord* w,  coord* h,
@@ -35,4 +36,56 @@ void get_ellipse_args (
 	Value nsegment);
 
 
+struct CreateParams
+{
+
+	std::vector<Rays::Point> points;
+
+	std::vector<Rays::Color> colors;
+
+	std::vector<Rays::Point> texcoords;
+
+	CreateParams (
+		const Value& points_, const Value& colors_, const Value& texcoords_)
+	{
+		get_points(&points, points_.size(), points_.as_array());
+
+		if (colors_)
+		{
+			get_colors(&colors, colors_.size(), colors_.as_array());
+			if (colors.size() != points.size())
+				argument_error(__FILE__, __LINE__, "colors.size() != points.size()");
+		}
+
+		if (texcoords_)
+		{
+			get_points(&texcoords, texcoords_.size(), texcoords_.as_array());
+			if (texcoords.size() != points.size())
+				argument_error(__FILE__, __LINE__, "texcoords.size() != points.size()");
+		}
+	}
+
+	const Rays::Point* ppoints () const
+	{
+		return points.empty() ? NULL : &points[0];
+	}
+
+	const Rays::Color* pcolors () const
+	{
+		return colors.empty() ? NULL : &colors[0];
+	}
+
+	const Rays::Point* ptexcoords () const
+	{
+		return texcoords.empty() ? NULL : &texcoords[0];
+	}
+
+	size_t size () const
+	{
+		return points.size();
+	}
+
+};// CreateParams
+
+
 #endif//EOH

data/ext/rays/font.cpp

@@ -30,6 +30,16 @@ RUCY_DEFN(initialize)
 }
 RUCY_END
 
+static
+RUCY_DEF1(initialize_copy, obj)
+{
+	RUCY_CHECK_OBJ(Rays::Font, self);
+
+	*THIS = to<Rays::Font&>(obj).dup();
+	return self;
+}
+RUCY_END
+
 static
 RUCY_DEF0(name)
 {
@@ -38,6 +48,15 @@ RUCY_DEF0(name)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_size, size)
+{
+	CHECK;
+	THIS->set_size(to<coord>(size));
+	return size;
+}
+RUCY_END
+
 static
 RUCY_DEF0(size)
 {
@@ -92,6 +111,35 @@ RUCY_DEF0(leading)
 }
 RUCY_END
 
+static
+RUCY_DEF0(families)
+{
+	Hash hash;
+	for (const auto& family : Rays::get_font_families())
+	{
+		std::vector<Value> members;
+		for (const auto& member : family.second)
+			members.emplace_back(member.c_str());
+		hash.set(family.first.c_str(), value(members.size(), &members[0]));
+	}
+	return hash;
+}
+RUCY_END
+
+static
+RUCY_DEFN(load)
+{
+	check_arg_count(__FILE__, __LINE__, "Font.load", argc, 1, 2);
+
+	const char* path = argv[0].c_str();
+
+	if (argc >= 2)
+		return value(Rays::load_font(path, to<Rays::coord>(argv[1])));
+	else
+		return value(Rays::load_font(path));
+}
+RUCY_END
+
 
 static Class cFont;
 
@@ -102,14 +150,18 @@ Init_rays_font ()
 
 	cFont = mRays.define_class("Font");
 	cFont.define_alloc_func(alloc);
-	cFont.define_private_method("initialize", initialize);
+	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("size=", set_size);
+	cFont.define_method("size",      size);
 	cFont.define_method("width",   width);
 	cFont.define_method("height",  height);
 	cFont.define_method("ascent",  ascent);
 	cFont.define_method("descent", descent);
 	cFont.define_method("leading", leading);
+	cFont.define_module_function("families", families);
+	cFont.define_module_function("load", load);
 }
 
 
@@ -131,9 +183,9 @@ namespace Rucy
 		if (convert)
 		{
 			if (argc == 0)
-				return Rays::default_font();
+				return Rays::get_default_font();
 
-			coord size = argc >= 2 ? to<coord>(argv[1]) : 0;
+			coord size = argc >= 2 ? to<coord>(argv[1]) : Rays::Font::DEFAULT_SIZE;
 			if (argv->is_nil())
 				return Rays::Font(NULL, size);
 			else if (argv->is_s() || argv->is_sym())

data/ext/rays/native.cpp

@@ -12,7 +12,6 @@ void Init_rays_matrix ();
 
 void Init_rays_painter ();
 void Init_rays_polyline ();
-void Init_rays_polygon_line ();
 void Init_rays_polygon ();
 void Init_rays_bitmap ();
 void Init_rays_image ();
@@ -20,7 +19,7 @@ void Init_rays_font ();
 void Init_rays_shader ();
 void Init_rays_camera ();
 
-void Init_rays_noise ();
+void Init_rays_util ();
 
 
 extern "C" void
@@ -45,7 +44,6 @@ extern "C" void
 
 	Init_rays_painter();
 	Init_rays_polyline();
-	Init_rays_polygon_line();
 	Init_rays_polygon();
 	Init_rays_bitmap();
 	Init_rays_image();
@@ -53,7 +51,7 @@ extern "C" void
 	Init_rays_shader();
 	Init_rays_camera();
 
-	Init_rays_noise();
+	Init_rays_util();
 
 	RUCY_CATCH
 }

data/ext/rays/painter.cpp

@@ -162,7 +162,7 @@ RUCY_DEF2(line, args, loop)
 	CHECK;
 
 	std::vector<Rays::Point> points;
-	get_line_args(&points, args.size(), args.as_array());
+	get_points(&points, args.size(), args.as_array());
 
 	THIS->line(&points[0], points.size(), loop);
 	return self;
@@ -224,7 +224,7 @@ RUCY_DEF2(curve, args, loop)
 		argument_error(__FILE__, __LINE__);
 
 	std::vector<Rays::Point> points;
-	get_line_args(&points, args.size(), args.as_array());
+	get_points(&points, args.size(), args.as_array());
 
 	THIS->curve(&points[0], points.size(), loop);
 	return self;
@@ -240,7 +240,7 @@ RUCY_DEF2(bezier, args, loop)
 		argument_error(__FILE__, __LINE__);
 
 	std::vector<Rays::Point> points;
-	get_line_args(&points, args.size(), args.as_array());
+	get_points(&points, args.size(), args.as_array());
 
 	THIS->bezier(&points[0], points.size(), loop);
 	return self;
@@ -558,6 +558,76 @@ RUCY_DEF0(get_font)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_texture, image)
+{
+	CHECK;
+
+	if (!image)
+		THIS->no_texture();
+	else
+		THIS->set_texture(to<Rays::Image&>(image));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_texture)
+{
+	CHECK;
+
+	const Rays::Image& image = THIS->texture();
+	return image ? value(image) : nil();
+}
+RUCY_END
+
+static
+RUCY_DEF0(no_texture)
+{
+	CHECK;
+	THIS->no_texture();
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_texcoord_mode, mode)
+{
+	CHECK;
+
+	THIS->set_texcoord_mode(to<Rays::TexCoordMode>(mode));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_texcoord_mode)
+{
+	CHECK;
+
+	return value(THIS->texcoord_mode());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_texcoord_wrap, wrap)
+{
+	CHECK;
+
+	THIS->set_texcoord_wrap(to<Rays::TexCoordWrap>(wrap));
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_texcoord_wrap)
+{
+	CHECK;
+
+	return value(THIS->texcoord_wrap());
+}
+RUCY_END
+
 static
 RUCY_DEFN(set_shader)
 {
@@ -752,6 +822,13 @@ Init_rays_painter ()
 	cPainter.define_method("no_clip",   no_clip);
 	cPainter.define_method("font=", set_font);
 	cPainter.define_method("font",  get_font);
+	cPainter.define_method(   "texture=", set_texture);
+	cPainter.define_method(   "texture",  get_texture);
+	cPainter.define_method("no_texture",   no_texture);
+	cPainter.define_method("texcoord_mode=", set_texcoord_mode);
+	cPainter.define_method("texcoord_mode",  get_texcoord_mode);
+	cPainter.define_method("texcoord_wrap=", set_texcoord_wrap);
+	cPainter.define_method("texcoord_wrap",  get_texcoord_wrap);
 	cPainter.define_private_method("set_shader", set_shader);
 	cPainter.define_method(            "shader", get_shader);
 	cPainter.define_method(         "no_shader",  no_shader);