rays 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a408fdf8bf60cb32907e9be2fe9048f0c5de133
-  data.tar.gz: 8e0ab09661a2083e27f9770d7ad8d23c2482fe0f
+  metadata.gz: 2f2deaef2e58ab1e422ce210d1f41f96e7560c1a
+  data.tar.gz: d6d88f2c02d8220016a4091d349aa94d9a185334
 SHA512:
-  metadata.gz: d9d66ab38417be7291948a5003b71836f74cc6d19e9c1163b0156032784d4677bc666afde3551644992180523af55bf501e0bba2435c2080ba90891d3cc7badd
-  data.tar.gz: 3f52a64943eb855b4cfbb5cd0ebeb7a337fde08d771eca0f42e3272ea6668af9cd16d5a675df426381b70da25493c79c049cc0fde56a3723c96a3e6aa8febae5
+  metadata.gz: e6c083d3c3a6c0243e891f6e20156bf1269eeb27dcbf2c9ecd98d4582c997d31de2acbd7fd0ddf898bc3778ebe3d609c176c0dad11c887b5c01b310cf342816b
+  data.tar.gz: 2e71710878a684da44a4da37dbc9c283e8fbdd6e6dfcd7312ae7d9af4237044f09775f271495b664da2aaad842f5480beb38c899f65aa0a352479b1d6ea02ac2

data/.doc/ext/rays/bitmap.cpp

@@ -18,13 +18,11 @@ using Rays::uint;
 using Rays::coord;
 
 
-static Class cBitmap;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Bitmap, cBitmap)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Bitmap)
 
 #define THIS  to<Rays::Bitmap*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Bitmap, cBitmap, self)
+#define CHECK RUCY_CHECK_OBJECT(Rays::Bitmap, self)
 
 
 static
@@ -36,7 +34,7 @@ VALUE alloc(VALUE klass)
 static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
-	RUCY_CHECK_OBJ(Rays::Bitmap, cBitmap, self);
+	RUCY_CHECK_OBJ(Rays::Bitmap, self);
 
 	*THIS = to<Rays::Bitmap&>(obj).copy();
 	return self;
@@ -45,7 +43,7 @@ VALUE initialize_copy(VALUE self, VALUE obj)
 static
 VALUE setup(VALUE self, VALUE width, VALUE height, VALUE color_space)
 {
-	RUCY_CHECK_OBJ(Rays::Bitmap, cBitmap, self);
+	RUCY_CHECK_OBJ(Rays::Bitmap, self);
 
 	Rays::ColorSpace* cs = to<Rays::ColorSpace*>(color_space);
 	if (!cs)
@@ -143,6 +141,8 @@ VALUE load(VALUE self, VALUE path)
 }
 
 
+static Class cBitmap;
+
 void
 Init_bitmap ()
 {

data/.doc/ext/rays/bounds.cpp

@@ -11,13 +11,11 @@ using namespace Rucy;
 using Rays::coord;
 
 
-static Class cBounds;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Bounds, cBounds)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Bounds)
 
 #define THIS  to<Rays::Bounds*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::Bounds, cBounds, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Bounds, self)
 
 
 static
@@ -548,6 +546,8 @@ VALUE inspect(VALUE self)
 }
 
 
+static Class cBounds;
+
 void
 Init_bounds ()
 {

data/.doc/ext/rays/color.cpp

@@ -8,13 +8,11 @@
 using namespace Rucy;
 
 
-static Class cColor;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Color, cColor)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Color)
 
 #define THIS  to<Rays::Color*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::Color, cColor, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Color, self)
 
 
 static
@@ -129,6 +127,8 @@ VALUE get_alpha(VALUE self)
 }
 
 
+static Class cColor;
+
 void
 Init_color ()
 {

data/.doc/ext/rays/color_space.cpp

@@ -8,13 +8,11 @@
 using namespace Rucy;
 
 
-static Class cColorSpace;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::ColorSpace, cColorSpace)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::ColorSpace)
 
 #define THIS  to<Rays::ColorSpace*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::ColorSpace, cColorSpace, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::ColorSpace, self)
 
 
 static
@@ -107,6 +105,8 @@ VALUE is_premult(VALUE self)
 }
 
 
+static Class cColorSpace;
+
 void
 Init_color_space ()
 {

data/.doc/ext/rays/font.cpp

@@ -10,13 +10,11 @@ using namespace Rucy;
 using Rays::coord;
 
 
-static Class cFont;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Font, cFont)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Font)
 
 #define THIS  to<Rays::Font*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Font, cFont, self)
+#define CHECK RUCY_CHECK_OBJECT(Rays::Font, self)
 
 
 static
@@ -28,7 +26,7 @@ VALUE alloc(VALUE klass)
 static
 VALUE initialize(VALUE self)
 {
-	RUCY_CHECK_OBJ(Rays::Font, cFont, self);
+	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;
@@ -41,7 +39,7 @@ VALUE initialize(VALUE self)
 static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
-	RUCY_CHECK_OBJ(Rays::Font, cFont, self);
+	RUCY_CHECK_OBJ(Rays::Font, self);
 
 	*THIS = to<Rays::Font&>(obj).copy();
 	return self;
@@ -76,6 +74,8 @@ VALUE height(VALUE self)
 }
 
 
+static Class cFont;
+
 void
 Init_font ()
 {

data/.doc/ext/rays/image.cpp

@@ -14,13 +14,11 @@ using namespace Rucy;
 using Rays::coord;
 
 
-static Class cImage;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Image, cImage)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Image)
 
 #define THIS  to<Rays::Image*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Image, cImage, self)
+#define CHECK RUCY_CHECK_OBJECT(Rays::Image, self)
 
 
 static
@@ -32,7 +30,7 @@ VALUE alloc(VALUE klass)
 static
 VALUE initialize(VALUE self)
 {
-	RUCY_CHECK_OBJ(Rays::Image, cImage, self);
+	RUCY_CHECK_OBJ(Rays::Image, self);
 	check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2, 3);
 
 	if (argc == 0) return self;
@@ -61,7 +59,7 @@ VALUE initialize(VALUE self)
 static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
-	RUCY_CHECK_OBJ(Rays::Image, cImage, self);
+	RUCY_CHECK_OBJ(Rays::Image, self);
 
 	*THIS = to<Rays::Image&>(obj).copy();
 	return self;
@@ -132,6 +130,8 @@ VALUE load(VALUE self, VALUE path, VALUE alpha_only)
 }
 
 
+static Class cImage;
+
 void
 Init_image ()
 {

data/.doc/ext/rays/matrix.cpp

@@ -8,13 +8,11 @@
 using namespace Rucy;
 
 
-static Class cMatrix;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Matrix, cMatrix)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Matrix)
 
 #define THIS  to<Rays::Matrix*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::Matrix, cMatrix, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Matrix, self)
 
 
 static
@@ -93,6 +91,8 @@ VALUE at(VALUE self, VALUE row, VALUE column)
 }
 
 
+static Class cMatrix;
+
 void
 Init_matrix ()
 {

data/.doc/ext/rays/painter.cpp

@@ -1,6 +1,7 @@
 #include "rays/ruby/painter.h"
 
 
+#include <vector>
 #include <rucy.h>
 #include "rays/ruby/point.h"
 #include "rays/ruby/bounds.h"
@@ -17,13 +18,11 @@ using namespace Rucy;
 using Rays::coord;
 
 
-static Class cPainter;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Painter, cPainter)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Painter)
 
 #define THIS  to<Rays::Painter*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Painter, cPainter, self)
+#define CHECK RUCY_CHECK_OBJECT(Rays::Painter, self)
 
 
 static
@@ -46,6 +45,14 @@ VALUE canvas(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 	return self;
 }
 
+static
+VALUE bounds(VALUE self)
+{
+	CHECK;
+	return value(THIS->bounds());
+}
+
+
 static
 VALUE begin_paint(VALUE self)
 {
@@ -62,6 +69,12 @@ VALUE end_paint(VALUE self)
 	return self;
 }
 
+static
+VALUE clear(VALUE self)
+{
+	CHECK;
+	THIS->clear();
+}
 
 static
 VALUE line(VALUE self)
@@ -83,6 +96,38 @@ VALUE line(VALUE self)
 	return self;
 }
 
+static
+VALUE lines(VALUE self)
+{
+	CHECK;
+	if (argc <= 0)
+		argument_error(__FILE__, __LINE__, "Painter#lines");
+
+	std::vector<Rays::Coord3> points;
+	points.reserve(argc);
+	for (int i = 0; i < argc; ++i)
+		points.push_back(to<Rays::Point&>(argv[i]));
+
+	THIS->lines((Rays::Point*) &points[0], points.size());
+	return self;
+}
+
+static
+VALUE polygon(VALUE self)
+{
+	CHECK;
+	if (argc <= 0)
+		argument_error(__FILE__, __LINE__, "Painter#polygon");
+
+	std::vector<Rays::Coord3> points;
+	points.reserve(argc);
+	for (int i = 0; i < argc; ++i)
+		points.push_back(to<Rays::Point&>(argv[i]));
+
+	THIS->polygon((Rays::Point*) &points[0], points.size());
+	return self;
+}
+
 static
 VALUE rect(VALUE self)
 {
@@ -246,20 +291,6 @@ VALUE text(VALUE self)
 	return self;
 }
 
-static
-VALUE clear(VALUE self)
-{
-	CHECK;
-	THIS->clear();
-}
-
-static
-VALUE bounds(VALUE self)
-{
-	CHECK;
-	return value(THIS->bounds());
-}
-
 static
 VALUE set_background(VALUE self)
 {
@@ -619,6 +650,8 @@ VALUE pop_matrix(VALUE self)
 }
 
 
+static Class cPainter;
+
 void
 Init_painter ()
 {
@@ -628,18 +661,20 @@ Init_painter ()
 	rb_define_alloc_func(cPainter, alloc);
 
 	rb_define_method(cPainter, "canvas", RUBY_METHOD_FUNC(canvas), 4);
+	rb_define_method(cPainter, "bounds", RUBY_METHOD_FUNC(bounds), 0);
+
 	rb_define_private_method(cPainter, "begin_paint", RUBY_METHOD_FUNC(begin_paint), 0);
 	rb_define_private_method(cPainter, "end_paint", RUBY_METHOD_FUNC(end_paint), 0);
-
+	rb_define_method(cPainter, "clear", RUBY_METHOD_FUNC(clear), 0);
 	rb_define_method(cPainter, "line", RUBY_METHOD_FUNC(line), -1);
+	rb_define_method(cPainter, "lines", RUBY_METHOD_FUNC(lines), -1);
+	rb_define_method(cPainter, "polygon", RUBY_METHOD_FUNC(polygon), -1);
 	rb_define_method(cPainter, "rect", RUBY_METHOD_FUNC(rect), -1);
 	rb_define_method(cPainter, "ellipse", RUBY_METHOD_FUNC(ellipse), -1);
 	rb_define_method(cPainter, "arc", RUBY_METHOD_FUNC(arc), -1);
 	rb_define_method(cPainter, "image", RUBY_METHOD_FUNC(image), -1);
 	rb_define_method(cPainter, "text", RUBY_METHOD_FUNC(text), -1);
 
-	rb_define_method(cPainter, "clear", RUBY_METHOD_FUNC(clear), 0);
-	rb_define_method(cPainter, "bounds", RUBY_METHOD_FUNC(bounds), 0);
 	rb_define_private_method(cPainter, "set_background", RUBY_METHOD_FUNC(set_background), -1);
 	rb_define_private_method(cPainter, "get_background", RUBY_METHOD_FUNC(get_background), 0);
 	rb_define_method(cPainter, "no_background", RUBY_METHOD_FUNC(no_background), 0);

data/.doc/ext/rays/point.cpp

@@ -10,13 +10,11 @@ using namespace Rucy;
 using Rays::coord;
 
 
-static Class cPoint;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Point, cPoint)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Point)
 
 #define THIS  to<Rays::Point*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::Point, cPoint, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Point, self)
 
 
 static
@@ -211,6 +209,9 @@ VALUE inspect(VALUE self)
 	return value(Xot::stringf("#<Rays::Point %s>", THIS->inspect().c_str()));
 }
 
+
+static Class cPoint;
+
 void
 Init_point ()
 {

data/.doc/ext/rays/rays.cpp

@@ -7,9 +7,6 @@
 using namespace Rucy;
 
 
-static Module mRays;
-
-
 static
 VALUE init(VALUE self)
 {
@@ -32,6 +29,8 @@ VALUE init_offscreen_context(VALUE self)
 }
 
 
+static Module mRays;
+
 void
 Init_rays ()
 {

data/.doc/ext/rays/shader.cpp

@@ -8,13 +8,11 @@
 using namespace Rucy;
 
 
-static Class cShader;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Shader, cShader)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Shader)
 
 #define THIS  to<Rays::Shader*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Shader, cShader, self)
+#define CHECK RUCY_CHECK_OBJECT(Rays::Shader, self)
 
 
 static
@@ -26,7 +24,7 @@ VALUE alloc(VALUE klass)
 static
 VALUE initialize(VALUE self, VALUE source)
 {
-	RUCY_CHECK_OBJ(Rays::Shader, cShader, self);
+	RUCY_CHECK_OBJ(Rays::Shader, self);
 
 	if (!source.is_s())
 		argument_error(__FILE__, __LINE__);
@@ -36,6 +34,8 @@ VALUE initialize(VALUE self, VALUE source)
 }
 
 
+static Class cShader;
+
 void
 Init_shader ()
 {