rays 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4a408fdf8bf60cb32907e9be2fe9048f0c5de133
+  data.tar.gz: 8e0ab09661a2083e27f9770d7ad8d23c2482fe0f
+SHA512:
+  metadata.gz: d9d66ab38417be7291948a5003b71836f74cc6d19e9c1163b0156032784d4677bc666afde3551644992180523af55bf501e0bba2435c2080ba90891d3cc7badd
+  data.tar.gz: 3f52a64943eb855b4cfbb5cd0ebeb7a337fde08d771eca0f42e3272ea6668af9cd16d5a675df426381b70da25493c79c049cc0fde56a3723c96a3e6aa8febae5

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

@@ -2,7 +2,11 @@
 
 
 #include <rucy.h>
+#include "rays/exception.h"
+#include "rays/ruby/color_space.h"
+#include "rays/ruby/color.h"
 #include "rays/ruby/font.h"
+#include "rays/ruby/texture.h"
 #include "defs.h"
 
 
@@ -10,50 +14,17 @@ using namespace Rucy;
 
 using Rays::uchar;
 using Rays::ushort;
-using Rays::ulong;
+using Rays::uint;
 using Rays::coord;
 
 
 static Class cBitmap;
 
+RUCY_DEFINE_VALUE_FROM_TO(Rays::Bitmap, cBitmap)
 
-namespace Rays
-{
-
-
-	Class
-	bitmap_class ()
-	{
-		return cBitmap;
-	}
+#define THIS  to<Rays::Bitmap*>(self)
 
-
-}// Rays
-
-
-namespace Rucy
-{
-
-
-	Value
-	value (const Rays::Bitmap& obj)
-	{
-		return new_type(cBitmap, new Rays::Bitmap(obj));
-	}
-
-	Value
-	value (const Rays::Bitmap* obj)
-	{
-		return obj ? value(*obj) : nil();
-	}
-
-
-}// Rucy
-
-
-#define THIS to<Rays::Bitmap*>(self)
-
-#define CHECK RUCY_CHECK_OBJECT(self, Rays::Bitmap, cBitmap)
+#define CHECK RUCY_CHECK_OBJECT(Rays::Bitmap, cBitmap, self)
 
 
 static
@@ -63,12 +34,24 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE setup(VALUE self, VALUE width, VALUE height, VALUE colorspace)
+VALUE initialize_copy(VALUE self, VALUE obj)
+{
+	RUCY_CHECK_OBJ(Rays::Bitmap, cBitmap, self);
+
+	*THIS = to<Rays::Bitmap&>(obj).copy();
+	return self;
+}
+
+static
+VALUE setup(VALUE self, VALUE width, VALUE height, VALUE color_space)
 {
-	RUCY_CHECK_OBJ(self, Rays::Bitmap, cBitmap);
-	*THIS = Rays::Bitmap(
-		to<int>(width), to<int>(height),
-		(Rays::ColorSpaceType) to<uint>(colorspace));
+	RUCY_CHECK_OBJ(Rays::Bitmap, cBitmap, self);
+
+	Rays::ColorSpace* cs = to<Rays::ColorSpace*>(color_space);
+	if (!cs)
+		argument_error(__FILE__, __LINE__);
+
+	*THIS = Rays::Bitmap(to<int>(width), to<int>(height), *cs);
 	return self;
 }
 
@@ -76,8 +59,7 @@ static
 VALUE draw_string(VALUE self)
 {
 	CHECK;
-	if (argc < 1 || 4 < argc)
-		arg_count_error("Bitmap#draw_string", argc, 1, 2, 3, 4);
+	check_arg_count(__FILE__, __LINE__, "Bitmap#draw_string", argc, 1, 2, 3, 4);
 
 	const char* str        = to<const char*>(argv[0]);
 	coord x                = argc >= 2 ? to<coord>(argv[1]) : 0;
@@ -85,13 +67,7 @@ VALUE draw_string(VALUE self)
 	const Rays::Font* font = argc >= 4
 		? to<Rays::Font*>(argv[3]) : &Rays::default_font();
 
-	if (!Rays::draw_string(THIS, str, x, y, *font))
-	{
-		rays_error(
-			"Bitmap#draw_string('%s', %f, %f, %s) failed.",
-			str, x, y, font->name().c_str());
-	}
-
+	Rays::draw_string(THIS, str, x, y, *font);
 	return self;
 }
 
@@ -116,7 +92,7 @@ VALUE color_space(VALUE self)
 {
 	CHECK;
 
-	return value(THIS->color_space().type());
+	return value(THIS->color_space());
 }
 
 static
@@ -124,198 +100,46 @@ VALUE at(VALUE self, VALUE x, VALUE y)
 {
 	CHECK;
 
-	int xx = x.as_i(), yy = y.as_i();
-	void* pixel = THIS->at<void*>(xx, yy);
-	if (!pixel) rays_error("Bitmap#at(%d, %d) failed.", xx, yy);
+	return value(Rays::Color(THIS->at<void>(x.as_i(), y.as_i()), THIS->color_space()));
+}
 
-	Value array(THIS->color_space().Bpp() / THIS->color_space().Bpc(), NULL);
-	if (THIS->color_space().is_float())
-	{
-		float* p = (float*) pixel;
-		switch (THIS->color_space().type())
-		{
-			case Rays::GRAY_float:
-				array.push(p[0]);
-				break;
-			case Rays::RGB_float:
-				array.push(p[0]).push(p[1]).push(p[2]);
-				break;
-			case Rays::RGBA_float:
-				array.push(p[0]).push(p[1]).push(p[2]).push(p[3]);
-				break;
-			case Rays::ARGB_float:
-				array.push(p[1]).push(p[2]).push(p[3]).push(p[0]);
-				break;
-			case Rays::BGR_float:
-				array.push(p[2]).push(p[1]).push(p[0]);
-				break;
-			case Rays::BGRA_float:
-				array.push(p[2]).push(p[1]).push(p[0]).push(p[3]);
-				break;
-			case Rays::ABGR_float:
-				array.push(p[3]).push(p[2]).push(p[1]).push(p[0]);
-				break;
-			default:
-				rays_error("Bitmap#at: unknown color space");
-		}
-	}
-	else
-	{
-		uchar* p = (uchar*) pixel;
-		switch (THIS->color_space().type())
-		{
-			case Rays::GRAY_8:
-				array.push(*(uchar*) pixel);
-				break;
-			case Rays::GRAY_16:
-				array.push(*(ushort*) pixel);
-				break;
-			case Rays::GRAY_32:
-				array.push(*(ulong*) pixel);
-				break;
-			case Rays::RGB_888:
-				array.push(p[0]).push(p[1]).push(p[2]);
-				break;
-			case Rays::RGBA_8888:
-				array.push(p[0]).push(p[1]).push(p[2]).push(p[3]);
-				break;
-			case Rays::ARGB_8888:
-				array.push(p[1]).push(p[2]).push(p[3]).push(p[0]);
-				break;
-			case Rays::RGBX_8888:
-				array.push(p[0]).push(p[1]).push(p[2]);
-				break;
-			case Rays::XRGB_8888:
-				array.push(p[1]).push(p[2]).push(p[3]);
-				break;
-			case Rays::BGR_888:
-				array.push(p[2]).push(p[1]).push(p[0]);
-				break;
-			case Rays::BGRA_8888:
-				array.push(p[2]).push(p[1]).push(p[0]).push(p[3]);
-				break;
-			case Rays::ABGR_8888:
-				array.push(p[3]).push(p[2]).push(p[1]).push(p[0]);
-				break;
-			case Rays::BGRX_8888:
-				array.push(p[2]).push(p[1]).push(p[0]);
-				break;
-			case Rays::XBGR_8888:
-				array.push(p[3]).push(p[2]).push(p[1]);
-				break;
-			default:
-				rays_error("Bitmap#at: unknown color space");
-		}
-	}
+static
+VALUE set_at(VALUE self, VALUE x, VALUE y, VALUE color)
+{
+	CHECK;
+
+	Rays::Color* col = to<Rays::Color*>(color);
+	if (!col)
+		argument_error(__FILE__, __LINE__);
+
+	col->get(THIS->at<void>(x.as_i(), y.as_i()), THIS->color_space());
 
-	return array;
+	return color;
 }
 
 static
-VALUE assign_at(VALUE self, VALUE x, VALUE y, VALUE color)
+VALUE to_texture(VALUE self)
 {
 	CHECK;
 
-	int xx = x.as_i(), yy = y.as_i();
-	void* pixel = THIS->at<void*>(xx, yy);
-	if (!pixel) rays_error("Bitmap#assign_at(%d, %d) failed.", xx, yy);
+	bool alpha_only = (argc >= 1) ? to<bool>(argv[0]) : false;
+	return value(Rays::Texture(*THIS, alpha_only));
+}
 
-	Value array(THIS->color_space().Bpp() / THIS->color_space().Bpc(), NULL);
-	if (THIS->color_space().is_float())
-	{
-		float* p = (float*) pixel;
-		switch (THIS->color_space().type())
-		{
-			#define C(n) ((float) color[n].as_f())
-			case Rays::GRAY_float:
-				p[0] = C(0);
-				break;
-			case Rays::RGB_float:
-				p[0] = C(0); p[1] = C(1); p[2] = C(2);
-				break;
-			case Rays::RGBA_float:
-				p[0] = C(0); p[1] = C(1); p[2] = C(2); p[3] = C(3);
-				break;
-			case Rays::ARGB_float:
-				p[0] = C(1); p[1] = C(2); p[2] = C(3); p[3] = C(0);
-				break;
-			case Rays::BGR_float:
-				p[0] = C(2); p[1] = C(1); p[2] = C(0);
-				break;
-			case Rays::BGRA_float:
-				p[0] = C(2); p[1] = C(1); p[2] = C(0); p[3] = C(3);
-				break;
-			case Rays::ABGR_float:
-				p[0] = C(3); p[1] = C(2); p[2] = C(1); p[3] = C(0);
-				break;
-			#undef C
-			default:
-				rays_error("Bitmap#at: unknown color space");
-		}
-	}
-	else
-	{
-		uchar* p = (uchar*) pixel;
-		switch (THIS->color_space().type())
-		{
-			#define C(n) ((uchar) color[n].as_i())
-			case Rays::GRAY_8:
-				*(uchar*) pixel = C(0);
-				break;
-			case Rays::GRAY_16:
-				*(ushort*) pixel = C(0);
-				break;
-			case Rays::GRAY_32:
-				*(ulong*) pixel = C(0);
-				break;
-			case Rays::RGB_888:
-				p[0] = C(0); p[1] = C(1); p[2] = C(2);
-				break;
-			case Rays::RGBA_8888:
-				p[0] = C(0); p[1] = C(1); p[2] = C(2); p[3] = C(3);
-				break;
-			case Rays::ARGB_8888:
-				p[0] = C(1); p[1] = C(2); p[2] = C(3); p[3] = C(0);
-				break;
-			case Rays::RGBX_8888:
-				p[0] = C(0); p[1] = C(1); p[2] = C(2);
-				break;
-			case Rays::XRGB_8888:
-				p[0] = C(1); p[1] = C(2); p[2] = C(3);
-				break;
-			case Rays::BGR_888:
-				p[0] = C(2); p[1] = C(1); p[2] = C(0);
-				break;
-			case Rays::BGRA_8888:
-				p[0] = C(2); p[1] = C(1); p[2] = C(0); p[3] = C(3);
-				break;
-			case Rays::ABGR_8888:
-				p[0] = C(3); p[1] = C(2); p[2] = C(1); p[3] = C(0);
-				break;
-			case Rays::BGRX_8888:
-				p[0] = C(2); p[1] = C(1); p[2] = C(0);
-				break;
-			case Rays::XBGR_8888:
-				p[0] = C(3); p[1] = C(2); p[2] = C(1);
-				break;
-			#undef C
-			default:
-				rays_error("Bitmap#at: unknown color space");
-		}
-	}
+static
+VALUE save(VALUE self, VALUE path)
+{
+	CHECK;
 
-	return color;
+	Rays::save_bitmap(*THIS, path.c_str());
+	return self;
 }
 
 
 static
 VALUE load(VALUE self, VALUE path)
 {
-	Rays::Bitmap bmp;
-	if (!Rays::load_bitmap(&bmp, path.c_str()))
-		rays_error("Bitmap.load('%s') failed.", path.c_str());
-
-	return value(bmp);
+	return value(Rays::load_bitmap(path.c_str()));
 }
 
 
@@ -324,18 +148,31 @@ Init_bitmap ()
 {
 	Module mRays = rb_define_module("Rays");
 
-	mRays.define_const("GRAY", Rays::GRAY);
-	mRays.define_const("RGB",  Rays::RGB);
-	mRays.define_const("RGBA", Rays::RGBA);
-
 	cBitmap = rb_define_class_under(mRays, "Bitmap", rb_cObject);
 	rb_define_alloc_func(cBitmap, alloc);
+	rb_define_private_method(cBitmap, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_private_method(cBitmap, "setup", RUBY_METHOD_FUNC(setup), 3);
 	rb_define_method(cBitmap, "draw_string", RUBY_METHOD_FUNC(draw_string), -1);
 	rb_define_method(cBitmap, "width", RUBY_METHOD_FUNC(width), 0);
 	rb_define_method(cBitmap, "height", RUBY_METHOD_FUNC(height), 0);
 	rb_define_method(cBitmap, "color_space", RUBY_METHOD_FUNC(color_space), 0);
 	cBitmap.define_method("[]", at);
-	cBitmap.define_method("[]=", assign_at);
+	rb_define_method(cBitmap, "set_at", RUBY_METHOD_FUNC(set_at), 3);
+	rb_define_method(cBitmap, "to_texture", RUBY_METHOD_FUNC(to_texture), -1);
+	rb_define_method(cBitmap, "save", RUBY_METHOD_FUNC(save), 1);
 	rb_define_function(cBitmap, "load", RUBY_METHOD_FUNC(load), 1);
 }
+
+
+namespace Rays
+{
+
+
+	Class
+	bitmap_class ()
+	{
+		return cBitmap;
+	}
+
+
+}// Rays