rays 0.1.3 → 0.1.4

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

@@ -6,6 +6,9 @@ using namespace Rucy;
 
 
 void Init_rays ();
+void Init_point ();
+void Init_bounds ();
+void Init_color ();
 void Init_bitmap ();
 void Init_texture ();
 void Init_image ();
@@ -20,6 +23,9 @@ Init_native ()
 		raise(rb_eLoadError, "Rucy::init() failed.");
 
 	Init_rays();
+	Init_point();
+	Init_bounds();
+	Init_color();
 	Init_bitmap();
 	Init_texture();
 	Init_image();

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

@@ -2,8 +2,11 @@
 
 
 #include <rucy.h>
-#include <rays/ruby/image.h>
+#include <rays/ruby/bounds.h>
+#include <rays/ruby/color.h>
+#include <rays/ruby/matrix.h>
 #include <rays/ruby/font.h>
+#include <rays/ruby/image.h>
 #include "defs.h"
 
 
@@ -12,12 +15,13 @@ using namespace Rucy;
 using Rays::coord;
 
 
+static Class cPainter;
+
+
 namespace Rays
 {
 
 
-	static Class cPainter;
-
 	Class
 	painter_class ()
 	{
@@ -33,25 +37,30 @@ namespace Rucy
 
 
 	Value
-	value (const Rays::Painter& painter)
+	value (const Rays::Painter& obj)
+	{
+		return new_type(cPainter, new Rays::Painter(obj));
+	}
+
+	Value
+	value (const Rays::Painter* obj)
 	{
-		return new_type<Rays::Painter>(
-			Rays::painter_class(), new Rays::Painter(painter));
+		return obj ? value(*obj) : nil();
 	}
 
 
 }// Rucy
 
 
-#define this to<Rays::Painter*>(self)
+#define THIS to<Rays::Painter*>(self)
 
-#define CHECK CHECK_OBJECT(self, Rays::Painter, Rays::painter_class())
+#define CHECK RUCY_CHECK_OBJECT(self, Rays::Painter, cPainter)
 
 
 static
 VALUE alloc(VALUE klass)
 {
-	return new_type<Rays::Painter>(klass, new Rays::Painter);
+	return new_type<Rays::Painter>(klass);
 }
 
 static
@@ -63,52 +72,30 @@ VALUE canvas(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 	coord yy = to<coord>(y);
 	coord ww = to<coord>(width);
 	coord hh = to<coord>(height);
-	if (!this->canvas(xx, yy, ww, hh))
-		error("Painter#canvas(%f, %f, %f, %f) failed.", xx, yy, ww, hh);
+	if (!THIS->canvas(xx, yy, ww, hh))
+		rays_error("Painter#canvas(%f, %f, %f, %f) failed.", xx, yy, ww, hh);
 
 	return self;
 }
 
 static
-VALUE begin(VALUE self)
+VALUE begin_paint(VALUE self)
 {
 	CHECK;
 
-	if (!this->begin())
-		error("Painter#begin() failed.");
+	if (!THIS->begin())
+		rays_error("Painter#begin_paint() failed.");
 
 	return self;
 }
 
 static
-VALUE end(VALUE self)
+VALUE end_paint(VALUE self)
 {
 	CHECK;
 
-	if (!this->end())
-		error("Painter#end() failed.");
-
-	return self;
-}
-
-static
-VALUE push_matrix(VALUE self)
-{
-	CHECK;
-
-	if (!this->push_matrix())
-		error("Painter#push_matrix() failed.");
-
-	return self;
-}
-
-static
-VALUE pop_matrix(VALUE self)
-{
-	CHECK;
-
-	if (!this->pop_matrix())
-		error("Painter#pop_matrix() failed.");
+	if (!THIS->end())
+		rays_error("Painter#end_paint() failed.");
 
 	return self;
 }
@@ -123,8 +110,8 @@ VALUE line(VALUE self, VALUE x1_, VALUE y1_, VALUE x2_, VALUE y2_)
 	coord y1 = to<coord>(y1_);
 	coord x2 = to<coord>(x2_);
 	coord y2 = to<coord>(y2_);
-	if (!this->line(x1, y1, x2, y2))
-		error("Painter#line(%f, %f, %f, %f) failed.", x1, y1, x2, y2);
+	if (!THIS->line(x1, y1, x2, y2))
+		rays_error("Painter#line(%f, %f, %f, %f) failed.", x1, y1, x2, y2);
 
 	return self;
 }
@@ -138,8 +125,8 @@ VALUE rect(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 	coord yy = to<coord>(y);
 	coord ww = to<coord>(width);
 	coord hh = to<coord>(height);
-	if (!this->rect(xx, yy, ww, hh))
-		error("Painter#rect(%f, %f, %f, %f) failed.", xx, yy, ww, hh);
+	if (!THIS->rect(xx, yy, ww, hh))
+		rays_error("Painter#rect(%f, %f, %f, %f) failed.", xx, yy, ww, hh);
 
 	return self;
 }
@@ -157,9 +144,9 @@ VALUE ellipse(VALUE self)
 	coord hh   = (argc >= 4) ? to<coord>(argv[3]) : 0;
 	coord min_ = (argc >= 5) ? to<coord>(argv[4]) : 0;
 	uint nseg  = (argc >= 6) ? to<uint>(argv[5])  : 0;
-	if (!this->ellipse(xx, yy, ww, hh, min_, nseg))
+	if (!THIS->ellipse(xx, yy, ww, hh, min_, nseg))
 	{
-		error(
+		rays_error(
 			"Painter#ellipse(%f, %f, %f, %f, %f, %d) failed.",
 			xx, yy, ww, hh, min_, nseg);
 	}
@@ -182,9 +169,9 @@ VALUE arc(VALUE self)
 	float to_  = (argc >= 6) ? to<float>(argv[5]) : 360;
 	coord min_ = (argc >= 7) ? to<coord>(argv[6]) : 0;
 	uint nseg  = (argc >= 8) ? to<uint>(argv[7])  : 0;
-	if (!this->arc(xx, yy, ww, hh, from, to_, min_, nseg))
+	if (!THIS->arc(xx, yy, ww, hh, from, to_, min_, nseg))
 	{
-		error(
+		rays_error(
 			"Painter#arc(%f, %f, %f, %f, %f, %f, %f, %d) failed.",
 			xx, yy, ww, hh, from, to_, min_, nseg);
 	}
@@ -205,15 +192,15 @@ VALUE image(VALUE self)
 
 	if (argc == 1)
 	{
-		if (!this->image(*image))
-			error("Painter#image(%s) failed.", argv[0].inspect().c_str());
+		if (!THIS->image(*image))
+			rays_error("Painter#image(%s) failed.", argv[0].inspect().c_str());
 	}
 	else if (argc == 3)
 	{
 		coord x = to<coord>(argv[1]), y = to<coord>(argv[2]);
-		if (!this->image(*image, x, y))
+		if (!THIS->image(*image, x, y))
 		{
-			error(
+			rays_error(
 				"Painter#image(%s, %f, %f) failed.",
 				argv[0].inspect().c_str(), x, y);
 		}
@@ -222,9 +209,9 @@ VALUE image(VALUE self)
 	{
 		coord x = to<coord>(argv[1]), w = to<coord>(argv[3]);
 		coord y = to<coord>(argv[2]), h = to<coord>(argv[4]);
-		if (!this->image(*image, x, y, w, h))
+		if (!THIS->image(*image, x, y, w, h))
 		{
-			error(
+			rays_error(
 				"Painter#image(%s, %f, %f, %f, %f) failed.",
 				argv[0].inspect().c_str(), x, y, w, h);
 		}
@@ -235,9 +222,9 @@ VALUE image(VALUE self)
 		coord sy = to<coord>(argv[2]), dy = to<coord>(argv[6]);
 		coord sw = to<coord>(argv[3]);
 		coord sh = to<coord>(argv[4]);
-		if (!this->image(*image, sx, sy, sw, sh, dx, dy))
+		if (!THIS->image(*image, sx, sy, sw, sh, dx, dy))
 		{
-			error(
+			rays_error(
 				"Painter#image(%s, %f, %f, %f, %f, %f, %f) failed.",
 				argv[0].inspect().c_str(), sx, sy, sw, sh, dx, dy);
 		}
@@ -248,9 +235,9 @@ VALUE image(VALUE self)
 		coord sy = to<coord>(argv[2]), dy = to<coord>(argv[6]);
 		coord sw = to<coord>(argv[3]), dw = to<coord>(argv[7]);
 		coord sh = to<coord>(argv[4]), dh = to<coord>(argv[8]);
-		if (!this->image(*image, sx, sy, sw, sh, dx, dy, dw, dh))
+		if (!THIS->image(*image, sx, sy, sw, sh, dx, dy, dw, dh))
 		{
-			error(
+			rays_error(
 				"Painter#image(%s, %f, %f, %f, %f, %f, %f, %f, %f) failed.",
 				argv[0].inspect().c_str(), sx, sy, sw, sh, dx, dy, dw, dh);
 		}
@@ -268,15 +255,15 @@ VALUE text(VALUE self)
 
 	if (argc == 1)
 	{
-		if (!this->text(argv[0].c_str()))
-			error("Painter#text(%s) failed.", argv[0].inspect().c_str());
+		if (!THIS->text(argv[0].c_str()))
+			rays_error("Painter#text(%s) failed.", argv[0].inspect().c_str());
 	}
 	else if (argc == 3)
 	{
 		coord x = to<coord>(argv[1]), y = to<coord>(argv[2]);
-		if (!this->text(argv[0].c_str(), x, y))
+		if (!THIS->text(argv[0].c_str(), x, y))
 		{
-			error(
+			rays_error(
 				"Painter#text(%s, %f, %f) failed.",
 				argv[0].inspect().c_str(), x, y);
 		}
@@ -285,12 +272,12 @@ VALUE text(VALUE self)
 	{
 		const Rays::Font* font = to<Rays::Font*>(argv[3]);
 		if (!font || !*font)
-			error("Painter#text: invalid font.");
+			rays_error("Painter#text: invalid font.");
 
 		coord x = to<coord>(argv[1]), y = to<coord>(argv[2]);
-		if (!this->text(argv[0].c_str(), x, y, *font))
+		if (!THIS->text(argv[0].c_str(), x, y, font))
 		{
-			error(
+			rays_error(
 				"Painter#image(%s, %f, %f, %s) failed.",
 				argv[0].inspect().c_str(), x, y, argv[3].inspect().c_str());
 		}
@@ -299,9 +286,9 @@ VALUE text(VALUE self)
 	{
 		coord x = to<coord>(argv[1]), w = to<coord>(argv[3]);
 		coord y = to<coord>(argv[2]), h = to<coord>(argv[4]);
-		if (!this->text(argv[0].c_str(), x, y, w, h))
+		if (!THIS->text(argv[0].c_str(), x, y, w, h))
 		{
-			error(
+			rays_error(
 				"Painter#text(%s, %f, %f, %f, %f) failed.",
 				argv[0].inspect().c_str(), x, y, w, h);
 		}
@@ -310,13 +297,13 @@ VALUE text(VALUE self)
 	{
 		const Rays::Font* font = to<Rays::Font*>(argv[3]);
 		if (!font || !*font)
-			error("Painter#text: invalid font.");
+			rays_error("Painter#text: invalid font.");
 
 		coord x = to<coord>(argv[1]), w = to<coord>(argv[3]);
 		coord y = to<coord>(argv[2]), h = to<coord>(argv[4]);
-		if (!this->text(argv[0].c_str(), x, y, w, h, *font))
+		if (!THIS->text(argv[0].c_str(), x, y, w, h, font))
 		{
-			error(
+			rays_error(
 				"Painter#image(%s, %f, %f, %f, %f, %s) failed.",
 				argv[0].inspect().c_str(), x, y, w, h, argv[3].inspect().c_str());
 		}
@@ -326,31 +313,18 @@ VALUE text(VALUE self)
 }
 
 static
-VALUE get_clear(VALUE self)
-{
-	CHECK;
-
-	coord red = 0, green = 0, blue = 0, alpha = 0;
-	if (!this->get_clear(&red, &green, &blue, &alpha))
-		error("failed to get color for clear.");
-
-	Value ret[] = {red, green, blue, alpha};
-	return value(4, ret);
-}
-
-static
-VALUE set_clear(VALUE self)
+VALUE set_background(VALUE self)
 {
 	CHECK;
 	if (argc < 1 || 4 < argc)
-		arg_count_error("Painter#set_clear", argc, 1, 2, 3, 4);
+		arg_count_error("Painter#set_background", argc, 1, 2, 3, 4);
 
 	if (argc == 1 || argc == 2)
 	{
 		float v = to<float>(argv[0]);
 		float a = (argc >= 2) ? to<float>(argv[1]) : 1;
-		if (!this->set_clear(v, v, v, a))
-			error("Painter#set_clear(%f, %f) failed.", v, a);
+		if (!THIS->set_background(v, v, v, a))
+			rays_error("Painter#set_background(%f, %f) failed.", v, a);
 	}
 	else
 	{
@@ -358,35 +332,30 @@ VALUE set_clear(VALUE self)
 		float g = to<float>(argv[1]);
 		float b = to<float>(argv[2]);
 		float a = (argc == 4) ? to<float>(argv[3]) : 1;
-		if (!this->set_clear(r, g, b, a))
-			error("Painter#set_clear(%f, %f, %f, %f) failed.", r, g, b, a);
+		if (!THIS->set_background(r, g, b, a))
+			rays_error("Painter#set_background(%f, %f, %f, %f) failed.", r, g, b, a);
 	}
 
 	return self;
 }
 
 static
-VALUE no_clear(VALUE self)
+VALUE no_background(VALUE self)
 {
 	CHECK;
 
-	if (!this->no_clear())
-		error("Painter#no_clear() failed.");
+	if (!THIS->no_background())
+		rays_error("Painter#no_clear() failed.");
 
 	return self;
 }
 
 static
-VALUE get_fill(VALUE self)
+VALUE get_background(VALUE self)
 {
 	CHECK;
 
-	coord red = 0, green = 0, blue = 0, alpha = 0;
-	if (!this->get_fill(&red, &green, &blue, &alpha))
-		error("failed to get color for fill.");
-
-	Value ret[] = {red, green, blue, alpha};
-	return value(4, ret);
+	return value(THIS->background());
 }
 
 static
@@ -400,8 +369,8 @@ VALUE set_fill(VALUE self)
 	{
 		float v = to<float>(argv[0]);
 		float a = (argc >= 2) ? to<float>(argv[1]) : 1;
-		if (!this->set_fill(v, v, v, a))
-			error("Painter#set_fill(%f, %f) failed.", v, a);
+		if (!THIS->set_fill(v, v, v, a))
+			rays_error("Painter#set_fill(%f, %f) failed.", v, a);
 	}
 	else
 	{
@@ -409,8 +378,8 @@ VALUE set_fill(VALUE self)
 		float g = to<float>(argv[1]);
 		float b = to<float>(argv[2]);
 		float a = (argc == 4) ? to<float>(argv[3]) : 1;
-		if (!this->set_fill(r, g, b, a))
-			error("Painter#set_fill(%f, %f, %f, %f) failed.", r, g, b, a);
+		if (!THIS->set_fill(r, g, b, a))
+			rays_error("Painter#set_fill(%f, %f, %f, %f) failed.", r, g, b, a);
 	}
 
 	return self;
@@ -421,23 +390,18 @@ VALUE no_fill(VALUE self)
 {
 	CHECK;
 
-	if (!this->no_fill())
-		error("Painter#no_fill() failed.");
+	if (!THIS->no_fill())
+		rays_error("Painter#no_fill() failed.");
 
 	return self;
 }
 
 static
-VALUE get_stroke(VALUE self)
+VALUE get_fill(VALUE self)
 {
 	CHECK;
 
-	coord red = 0, green = 0, blue = 0, alpha = 0;
-	if (!this->get_stroke(&red, &green, &blue, &alpha))
-		error("failed to get color for stroke.");
-
-	Value ret[] = {red, green, blue, alpha};
-	return value(4, ret);
+	return value(THIS->fill());
 }
 
 static
@@ -451,8 +415,8 @@ VALUE set_stroke(VALUE self)
 	{
 		float v = to<float>(argv[0]);
 		float a = (argc >= 2) ? to<float>(argv[1]) : 1;
-		if (!this->set_stroke(v, v, v, a))
-			error("Painter#set_stroke(%f, %f) failed.", v, a);
+		if (!THIS->set_stroke(v, v, v, a))
+			rays_error("Painter#set_stroke(%f, %f) failed.", v, a);
 	}
 	else
 	{
@@ -460,8 +424,8 @@ VALUE set_stroke(VALUE self)
 		float g = to<float>(argv[1]);
 		float b = to<float>(argv[2]);
 		float a = (argc == 4) ? to<float>(argv[3]) : 1;
-		if (!this->set_stroke(r, g, b, a))
-			error("Painter#set_stroke(%f, %f, %f, %f) failed.", r, g, b, a);
+		if (!THIS->set_stroke(r, g, b, a))
+			rays_error("Painter#set_stroke(%f, %f, %f, %f) failed.", r, g, b, a);
 	}
 
 	return self;
@@ -472,23 +436,18 @@ VALUE no_stroke(VALUE self)
 {
 	CHECK;
 
-	if (!this->no_stroke())
-		error("Painter#no_stroke() failed.");
+	if (!THIS->no_stroke())
+		rays_error("Painter#no_stroke() failed.");
 
 	return self;
 }
 
 static
-VALUE get_clip(VALUE self)
+VALUE get_stroke(VALUE self)
 {
 	CHECK;
 
-	coord x = 0, y = 0, width = 0, height = 0;
-	if (!this->get_clip(&x, &y, &width, &height))
-		error("failed to get clip rect.");
-
-	Value ret[] = {x, y, width, height};
-	return value(4, ret);
+	return value(THIS->stroke());
 }
 
 static
@@ -498,8 +457,8 @@ VALUE set_clip(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 
 	coord xx = to<coord>(x), ww = to<coord>(width);
 	coord yy = to<coord>(y), hh = to<coord>(height);
-	if (!this->set_clip(xx, yy, ww, hh))
-		error("Painter#set_clip(%f, %f, %f, %f) failed.", xx, yy, ww, hh);
+	if (!THIS->set_clip(xx, yy, ww, hh))
+		rays_error("Painter#set_clip(%f, %f, %f, %f) failed.", xx, yy, ww, hh);
 
 	return self;
 }
@@ -509,8 +468,157 @@ VALUE no_clip(VALUE self)
 {
 	CHECK;
 
-	if (!this->no_clip())
-		error("Painter#no_clip() failed.");
+	if (!THIS->no_clip())
+		rays_error("Painter#no_clip() failed.");
+
+	return self;
+}
+
+static
+VALUE get_clip(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->clip());
+}
+
+static
+VALUE set_font(VALUE self, VALUE font)
+{
+	CHECK;
+
+	const Rays::Font* f = font.is_nil()
+		? &Rays::default_font()
+		: to<Rays::Font*>(font);
+	if (!f || !*f) argument_error();
+
+	if (!THIS->set_font(*f))
+		rays_error("Painter#set_font(%s) failed.", font.inspect().c_str());
+
+	return self;
+}
+
+static
+VALUE get_font(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->font());
+}
+
+static
+VALUE push_attrs(VALUE self)
+{
+	CHECK;
+
+	if (!THIS->push_attrs())
+		rays_error("Painter#push_attrs() failed.");
+
+	return self;
+}
+
+static
+VALUE pop_attrs(VALUE self)
+{
+	CHECK;
+
+	if (!THIS->pop_attrs())
+		rays_error("Painter#pop_attrs() failed.");
+
+	return self;
+}
+
+
+static
+VALUE translate(VALUE self)
+{
+	CHECK;
+	if (argc < 2 || 3 < argc)
+		arg_count_error("Painter#translate", argc, 2, 3);
+
+	coord xx = to<coord>(argv[0]);
+	coord yy = to<coord>(argv[1]);
+	coord zz = (argc >= 3) ? to<coord>(argv[2]) : 0;
+	if (!THIS->translate(xx, yy, zz))
+		rays_error("Painter#translate(%f %f %f) failed.", xx, yy, zz);
+
+	return self;
+}
+
+static
+VALUE scale(VALUE self)
+{
+	CHECK;
+	if (argc < 2 || 3 < argc)
+		arg_count_error("Painter#scale", argc, 2, 3);
+
+	coord xx = to<coord>(argv[0]);
+	coord yy = to<coord>(argv[1]);
+	coord zz = (argc >= 3) ? to<coord>(argv[2]) : 1;
+	if (!THIS->scale(xx, yy, zz))
+		rays_error("Painter#scale(%f %f %f) failed.", xx, yy, zz);
+
+	return self;
+}
+
+static
+VALUE rotate(VALUE self)
+{
+	CHECK;
+	if (argc != 1 && argc != 3 && argc != 4)
+		arg_count_error("Painter#rotate", argc, 1, 3, 4);
+
+	coord aa = to<coord>(argv[0]), xx = 0, yy = 0, zz = 1;
+	if (argc >= 3)
+	{
+		xx = to<coord>(argv[1]);
+		yy = to<coord>(argv[2]);
+		zz = argc >= 4 ? to<coord>(argv[3]) : 0;
+	}
+
+	if (!THIS->rotate(aa, xx, yy, zz))
+		rays_error("Painter#rotate(%f %f %f %f) failed.", aa, xx, yy, zz);
+
+	return self;
+}
+
+static
+VALUE set_matrix(VALUE self)
+{
+	CHECK;
+
+	if (!THIS->set_matrix())
+		rays_error("Painter#set_matrix() failed.");
+
+	return self;
+}
+
+static
+VALUE get_matrix(VALUE self)
+{
+	CHECK;
+
+	return value(THIS->matrix());
+}
+
+static
+VALUE push_matrix(VALUE self)
+{
+	CHECK;
+
+	if (!THIS->push_matrix())
+		rays_error("Painter#push_matrix() failed.");
+
+	return self;
+}
+
+static
+VALUE pop_matrix(VALUE self)
+{
+	CHECK;
+
+	if (!THIS->pop_matrix())
+		rays_error("Painter#pop_matrix() failed.");
 
 	return self;
 }
@@ -519,36 +627,44 @@ VALUE no_clip(VALUE self)
 void
 Init_painter ()
 {
-	Module m = rb_define_module("Rays");
-
-	Class c = rb_define_class_under(m, "Painter", rb_cObject);
-	Rays::cPainter = c;
-
-	rb_define_alloc_func(c, alloc);
-
-	rb_define_method(c, "canvas", RUBY_METHOD_FUNC(canvas), 4);
-	rb_define_method(c, "begin", RUBY_METHOD_FUNC(begin), 0);
-	rb_define_method(c, "end", RUBY_METHOD_FUNC(end), 0);
-	rb_define_method(c, "push_matrix", RUBY_METHOD_FUNC(push_matrix), 0);
-	rb_define_method(c, "pop_matrix", RUBY_METHOD_FUNC(pop_matrix), 0);
-
-	rb_define_private_method(c, "draw_line", RUBY_METHOD_FUNC(line), 4);
-	rb_define_private_method(c, "draw_rect", RUBY_METHOD_FUNC(rect), 4);
-	rb_define_private_method(c, "draw_ellipse", RUBY_METHOD_FUNC(ellipse), -1);
-	rb_define_private_method(c, "draw_arc", RUBY_METHOD_FUNC(arc), -1);
-	rb_define_private_method(c, "draw_image", RUBY_METHOD_FUNC(image), -1);
-	rb_define_private_method(c, "draw_text", RUBY_METHOD_FUNC(text), -1);
-
-	rb_define_method(c, "get_fill", RUBY_METHOD_FUNC(get_fill), 0);
-	rb_define_method(c, "set_fill", RUBY_METHOD_FUNC(set_fill), -1);
-	rb_define_method(c, "no_fill", RUBY_METHOD_FUNC(no_fill), 0);
-	rb_define_method(c, "get_stroke", RUBY_METHOD_FUNC(get_stroke), 0);
-	rb_define_method(c, "set_stroke", RUBY_METHOD_FUNC(set_stroke), -1);
-	rb_define_method(c, "no_stroke", RUBY_METHOD_FUNC(no_stroke), 0);
-	rb_define_method(c, "get_clear", RUBY_METHOD_FUNC(get_clear), 0);
-	rb_define_method(c, "set_clear", RUBY_METHOD_FUNC(set_clear), -1);
-	rb_define_method(c, "no_clear", RUBY_METHOD_FUNC(no_clear), 0);
-	rb_define_method(c, "get_clip", RUBY_METHOD_FUNC(get_clip), 0);
-	rb_define_method(c, "set_clip", RUBY_METHOD_FUNC(set_clip), 4);
-	rb_define_method(c, "no_clip", RUBY_METHOD_FUNC(no_clip), 0);
+	Module mRays = rb_define_module("Rays");
+
+	cPainter = rb_define_class_under(mRays, "Painter", rb_cObject);
+	rb_define_alloc_func(cPainter, alloc);
+
+	rb_define_method(cPainter, "canvas", RUBY_METHOD_FUNC(canvas), 4);
+	rb_define_method(cPainter, "begin_paint", RUBY_METHOD_FUNC(begin_paint), 0);
+	rb_define_method(cPainter, "end_paint", RUBY_METHOD_FUNC(end_paint), 0);
+
+	rb_define_method(cPainter, "line", RUBY_METHOD_FUNC(line), 4);
+	rb_define_method(cPainter, "rect", RUBY_METHOD_FUNC(rect), 4);
+	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, "set_background", RUBY_METHOD_FUNC(set_background), -1);
+	rb_define_method(cPainter, "no_background", RUBY_METHOD_FUNC(no_background), 0);
+	rb_define_method(cPainter, "get_background", RUBY_METHOD_FUNC(get_background), 0);
+	rb_define_method(cPainter, "set_fill", RUBY_METHOD_FUNC(set_fill), -1);
+	rb_define_method(cPainter, "no_fill", RUBY_METHOD_FUNC(no_fill), 0);
+	rb_define_method(cPainter, "get_fill", RUBY_METHOD_FUNC(get_fill), 0);
+	rb_define_method(cPainter, "set_stroke", RUBY_METHOD_FUNC(set_stroke), -1);
+	rb_define_method(cPainter, "no_stroke", RUBY_METHOD_FUNC(no_stroke), 0);
+	rb_define_method(cPainter, "get_stroke", RUBY_METHOD_FUNC(get_stroke), 0);
+	rb_define_method(cPainter, "set_clip", RUBY_METHOD_FUNC(set_clip), 4);
+	rb_define_method(cPainter, "no_clip", RUBY_METHOD_FUNC(no_clip), 0);
+	rb_define_method(cPainter, "get_clip", RUBY_METHOD_FUNC(get_clip), 0);
+	rb_define_method(cPainter, "set_font", RUBY_METHOD_FUNC(set_font), 1);
+	rb_define_method(cPainter, "get_font", RUBY_METHOD_FUNC(get_font), 0);
+	rb_define_method(cPainter, "push_attrs", RUBY_METHOD_FUNC(push_attrs), 0);
+	rb_define_method(cPainter, "pop_attrs", RUBY_METHOD_FUNC(pop_attrs), 0);
+
+	rb_define_method(cPainter, "translate", RUBY_METHOD_FUNC(translate), -1);
+	rb_define_method(cPainter, "scale", RUBY_METHOD_FUNC(push_matrix), 0);
+	rb_define_method(cPainter, "rotate", RUBY_METHOD_FUNC(push_matrix), 0);
+	rb_define_method(cPainter, "set_matrix", RUBY_METHOD_FUNC(push_matrix), 0);
+	rb_define_method(cPainter, "get_matrix", RUBY_METHOD_FUNC(push_matrix), 0);
+	rb_define_method(cPainter, "push_matrix", RUBY_METHOD_FUNC(push_matrix), 0);
+	rb_define_method(cPainter, "pop_matrix", RUBY_METHOD_FUNC(pop_matrix), 0);
 }