rays 0.1.7 → 0.1.8

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

@@ -12,13 +12,11 @@ using namespace Rucy;
 using Rays::coord;
 
 
-static Class cTexture;
-
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Texture, cTexture)
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Texture)
 
 #define THIS  to<Rays::Texture*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Texture, cTexture, self)
+#define CHECK RUCY_CHECK_OBJECT(Rays::Texture, self)
 
 
 static
@@ -30,7 +28,7 @@ VALUE alloc(VALUE klass)
 static
 VALUE setup(VALUE self, VALUE width, VALUE height, VALUE color_space, VALUE alpha_only)
 {
-	RUCY_CHECK_OBJ(Rays::Texture, cTexture, self);
+	RUCY_CHECK_OBJ(Rays::Texture, self);
 
 	Rays::ColorSpace* cs = to<Rays::ColorSpace*>(color_space);
 	if (!cs) argument_error(__FILE__, __LINE__);
@@ -104,6 +102,8 @@ VALUE to_bitmap(VALUE self)
 }
 
 
+static Class cTexture;
+
 void
 Init_texture ()
 {

data/README.md

@@ -1,4 +1,4 @@
 
-= Rays - A Drawing Engine using OpenGL
+# Rays - A Drawing Engine using OpenGL
 
-== by snori@xord.org
+## by snori@xord.org

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/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
@@ -37,7 +35,7 @@ RUCY_END
 static
 RUCY_DEF1(initialize_copy, obj)
 {
-	RUCY_CHECK_OBJ(Rays::Bitmap, cBitmap, self);
+	RUCY_CHECK_OBJ(Rays::Bitmap, self);
 
 	*THIS = to<Rays::Bitmap&>(obj).copy();
 	return self;
@@ -47,7 +45,7 @@ RUCY_END
 static
 RUCY_DEF3(setup, width, height, 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)
@@ -155,6 +153,8 @@ RUCY_DEF1(load, path)
 RUCY_END
 
 
+static Class cBitmap;
+
 void
 Init_bitmap ()
 {

data/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
@@ -593,6 +591,8 @@ RUCY_DEF0(inspect)
 RUCY_END
 
 
+static Class cBounds;
+
 void
 Init_bounds ()
 {

data/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
@@ -140,6 +138,8 @@ RUCY_DEF0(get_alpha)
 RUCY_END
 
 
+static Class cColor;
+
 void
 Init_color ()
 {

data/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
@@ -118,6 +116,8 @@ RUCY_DEF0(is_premult)
 RUCY_END
 
 
+static Class cColorSpace;
+
 void
 Init_color_space ()
 {

data/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
@@ -29,7 +27,7 @@ RUCY_END
 static
 RUCY_DEFN(initialize)
 {
-	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;
@@ -43,7 +41,7 @@ RUCY_END
 static
 RUCY_DEF1(initialize_copy, obj)
 {
-	RUCY_CHECK_OBJ(Rays::Font, cFont, self);
+	RUCY_CHECK_OBJ(Rays::Font, self);
 
 	*THIS = to<Rays::Font&>(obj).copy();
 	return self;
@@ -83,6 +81,8 @@ RUCY_DEF0(height)
 RUCY_END
 
 
+static Class cFont;
+
 void
 Init_font ()
 {

data/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
@@ -33,7 +31,7 @@ RUCY_END
 static
 RUCY_DEFN(initialize)
 {
-	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;
@@ -63,7 +61,7 @@ RUCY_END
 static
 RUCY_DEF1(initialize_copy, obj)
 {
-	RUCY_CHECK_OBJ(Rays::Image, cImage, self);
+	RUCY_CHECK_OBJ(Rays::Image, self);
 
 	*THIS = to<Rays::Image&>(obj).copy();
 	return self;
@@ -144,6 +142,8 @@ RUCY_DEF2(load, path, alpha_only)
 RUCY_END
 
 
+static Class cImage;
+
 void
 Init_image ()
 {

data/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
@@ -98,6 +96,8 @@ RUCY_DEF2(at, row, column)
 RUCY_END
 
 
+static Class cMatrix;
+
 void
 Init_matrix ()
 {

data/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
@@ -48,6 +47,15 @@ RUCY_DEF4(canvas, x, y, width, height)
 }
 RUCY_END
 
+static
+RUCY_DEF0(bounds)
+{
+	CHECK;
+	return value(THIS->bounds());
+}
+RUCY_END
+
+
 static
 RUCY_DEF0(begin_paint)
 {
@@ -66,6 +74,13 @@ RUCY_DEF0(end_paint)
 }
 RUCY_END
 
+static
+RUCY_DEF0(clear)
+{
+	CHECK;
+	THIS->clear();
+}
+RUCY_END
 
 static
 RUCY_DEFN(line)
@@ -88,6 +103,40 @@ RUCY_DEFN(line)
 }
 RUCY_END
 
+static
+RUCY_DEFN(lines)
+{
+	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;
+}
+RUCY_END
+
+static
+RUCY_DEFN(polygon)
+{
+	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;
+}
+RUCY_END
+
 static
 RUCY_DEFN(rect)
 {
@@ -256,22 +305,6 @@ RUCY_DEFN(text)
 }
 RUCY_END
 
-static
-RUCY_DEF0(clear)
-{
-	CHECK;
-	THIS->clear();
-}
-RUCY_END
-
-static
-RUCY_DEF0(bounds)
-{
-	CHECK;
-	return value(THIS->bounds());
-}
-RUCY_END
-
 static
 RUCY_DEFN(set_background)
 {
@@ -659,27 +692,31 @@ RUCY_DEF0(pop_matrix)
 RUCY_END
 
 
+static Class cPainter;
+
 void
 Init_painter ()
 {
 	Module mRays = define_module("Rays");
 
-	cPainter= mRays.define_class("Painter");
+	cPainter = mRays.define_class("Painter");
 	cPainter.define_alloc_func(alloc);
 
 	cPainter.define_method("canvas", canvas);
-	cPainter.define_private_method("begin_paint", begin_paint);
-	cPainter.define_private_method("end_paint", end_paint);
+	cPainter.define_method("bounds", bounds);
 
-	cPainter.define_method("line", line);
-	cPainter.define_method("rect", rect);
+	cPainter.define_private_method("begin_paint", begin_paint);
+	cPainter.define_private_method(  "end_paint",   end_paint);
+	cPainter.define_method("clear",   clear);
+	cPainter.define_method("line",    line);
+	cPainter.define_method("lines",   lines);
+	cPainter.define_method("polygon", polygon);
+	cPainter.define_method("rect",    rect);
 	cPainter.define_method("ellipse", ellipse);
-	cPainter.define_method("arc", arc);
-	cPainter.define_method("image", image);
-	cPainter.define_method("text", text);
+	cPainter.define_method("arc",     arc);
+	cPainter.define_method("image",   image);
+	cPainter.define_method("text",    text);
 
-	cPainter.define_method("clear", clear);
-	cPainter.define_method("bounds", bounds);
 	cPainter.define_private_method("set_background", set_background);
 	cPainter.define_private_method("get_background", get_background);
 	cPainter.define_method(         "no_background",  no_background);
@@ -695,21 +732,21 @@ Init_painter ()
 	cPainter.define_private_method("set_font", set_font);
 	cPainter.define_private_method("get_font", get_font);
 	cPainter.define_method("push_attr", push_attr);
-	cPainter.define_method("pop_attr", pop_attr);
+	cPainter.define_method( "pop_attr",  pop_attr);
 
 	cPainter.define_private_method("attach_shader", attach_shader);
 	cPainter.define_private_method("detach_shader", detach_shader);
 	cPainter.define_private_method("set_uniform", set_uniform);
 	cPainter.define_method("push_shader", push_shader);
-	cPainter.define_method("pop_shader", pop_shader);
+	cPainter.define_method( "pop_shader",  pop_shader);
 
 	cPainter.define_method("translate", translate);
-	cPainter.define_method("scale", scale);
-	cPainter.define_method("rotate", rotate);
+	cPainter.define_method("scale",     scale);
+	cPainter.define_method("rotate",    rotate);
 	cPainter.define_private_method("set_matrix", set_matrix);
 	cPainter.define_private_method("get_matrix", get_matrix);
 	cPainter.define_method("push_matrix", push_matrix);
-	cPainter.define_method("pop_matrix", pop_matrix);
+	cPainter.define_method( "pop_matrix",  pop_matrix);
 }