rays 0.1.15 → 0.1.16

data/ext/rays/color.cpp

@@ -211,9 +211,8 @@ Init_color ()
 	cColor.define_method("blue",   get_blue);
 	cColor.define_method("alpha=", set_alpha);
 	cColor.define_method("alpha",  get_alpha);
-
-	cColor.define_function("hsv", hsv);
-	cColor.define_function("set_palette_color", set_palette_color);
+	cColor.define_module_function("hsv", hsv);
+	cColor.define_module_function("set_palette_color", set_palette_color);
 }
 
 

data/ext/rays/extconf.rb

@@ -17,7 +17,7 @@ Xot::ExtConf.new Xot, Rucy, Rays do
     headers    << 'ruby.h'
     local_libs << 'rucy'
     libs.unshift 'gdi21', 'opengl32' if win32?
-    frameworks << 'AppKit' << 'OpenGL' if osx?
+    frameworks << 'AppKit' << 'OpenGL' << 'AVFoundation' if osx?
     $LDFLAGS   << ' -Wl,--out-implib=native.dll.a' if cygwin?
   end
 

data/ext/rays/font.cpp

@@ -61,6 +61,36 @@ RUCY_DEF0(height)
 }
 RUCY_END
 
+static
+RUCY_DEF0(ascent)
+{
+	CHECK;
+	coord ascent = 0;
+	THIS->get_height(&ascent);
+	return value(ascent);
+}
+RUCY_END
+
+static
+RUCY_DEF0(descent)
+{
+	CHECK;
+	coord descent = 0;
+	THIS->get_height(NULL, &descent);
+	return value(descent);
+}
+RUCY_END
+
+static
+RUCY_DEF0(leading)
+{
+	CHECK;
+	coord leading = 0;
+	THIS->get_height(NULL, NULL, &leading);
+	return value(leading);
+}
+RUCY_END
+
 
 static Class cFont;
 
@@ -74,8 +104,11 @@ Init_font ()
 	cFont.define_private_method("initialize", initialize);
 	cFont.define_method("name", name);
 	cFont.define_method("size", size);
-	cFont.define_method("width", width);
-	cFont.define_method("height", height);
+	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);
 }
 
 

data/ext/rays/image.cpp

@@ -142,14 +142,14 @@ Init_image ()
 	cImage.define_alloc_func(alloc);
 	cImage.define_private_method("initialize",      initialize);
 	cImage.define_private_method("initialize_copy", initialize_copy);
-	cImage.define_method("width", width);
+	cImage.define_method("width",  width);
 	cImage.define_method("height", height);
 	cImage.define_method("color_space", color_space);
 	cImage.define_method("pixel_density", pixel_density);
 	cImage.define_method("painter", painter);
 	cImage.define_method("bitmap", bitmap);
 	cImage.define_method("save", save);
-	cImage.define_function("load", load);
+	cImage.define_module_function("load", load);
 }
 
 

data/ext/rays/native.cpp

@@ -9,6 +9,7 @@ void Init_color ();
 void Init_color_space ();
 void Init_matrix ();
 
+void Init_painter ();
 void Init_polyline ();
 void Init_polygon_line ();
 void Init_polygon ();
@@ -16,8 +17,7 @@ void Init_bitmap ();
 void Init_image ();
 void Init_font ();
 void Init_shader ();
-
-void Init_painter ();
+void Init_camera ();
 
 void Init_noise ();
 
@@ -41,6 +41,7 @@ extern "C" void
 	Init_color_space();
 	Init_matrix();
 
+	Init_painter();
 	Init_polyline();
 	Init_polygon_line();
 	Init_polygon();
@@ -48,8 +49,7 @@ extern "C" void
 	Init_image();
 	Init_font();
 	Init_shader();
-
-	Init_painter();
+	Init_camera();
 
 	Init_noise();
 

data/ext/rays/painter.cpp

@@ -353,12 +353,7 @@ static
 RUCY_DEF1(set_stroke_cap, cap)
 {
 	CHECK;
-
-	int type = to<int>(cap);
-	if (type < 0 || Rays::CAP_MAX <= type)
-		argument_error(__FILE__, __LINE__, "invalid stroke cap -- %d", type);
-
-	THIS->set_stroke_cap((Rays::CapType) type);
+	THIS->set_stroke_cap(to<Rays::CapType>(cap));
 	return self;
 }
 RUCY_END
@@ -375,12 +370,7 @@ static
 RUCY_DEF1(set_stroke_join, join)
 {
 	CHECK;
-
-	int type = to<int>(join);
-	if (type < 0 || Rays::JOIN_MAX <= type)
-		argument_error(__FILE__, __LINE__, "invalid stroke join -- %d", type);
-
-	THIS->set_stroke_join((Rays::JoinType) type);
+	THIS->set_stroke_join(to<Rays::JoinType>(join));
 	return self;
 }
 RUCY_END

data/ext/rays/point.cpp

@@ -262,6 +262,20 @@ RUCY_DEF0(inspect)
 }
 RUCY_END
 
+static
+RUCY_DEF2(dot, p1, p2)
+{
+	return value(Rays::dot(to<Rays::Point>(p1), to<Rays::Point>(p2)));
+}
+RUCY_END
+
+static
+RUCY_DEF2(cross, p1, p2)
+{
+	return value(Rays::cross(to<Rays::Point>(p1), to<Rays::Point>(p2)));
+}
+RUCY_END
+
 
 static Class cPoint;
 
@@ -295,6 +309,8 @@ Init_point ()
 	cPoint.define_method("[]=", set_at);
 	cPoint.define_method("[]",  get_at);
 	cPoint.define_method("inspect", inspect);
+	cPoint.define_module_function("dot",   dot);
+	cPoint.define_module_function("cross", cross);
 }
 
 

data/ext/rays/polygon.cpp

@@ -80,7 +80,7 @@ RUCY_DEF0(empty)
 RUCY_END
 
 static
-RUCY_DEF1(at, index)
+RUCY_DEF1(get_at, index)
 {
 	CHECK;
 
@@ -100,7 +100,7 @@ RUCY_DEF0(each)
 {
 	CHECK;
 
-	Value ret;
+	Value ret = Qnil;
 	for (const auto& line : *THIS)
 		ret = rb_yield(value(line));
 	return ret;
@@ -260,7 +260,7 @@ Init_polygon ()
 	cPolygon.define_method("bounds", bounds);
 	cPolygon.define_method("size", size);
 	cPolygon.define_method("empty?", empty);
-	cPolygon.define_method("[]", at);
+	cPolygon.define_method("[]", get_at);
 	cPolygon.define_method("each", each);
 	cPolygon.define_method("+", op_or);
 	cPolygon.define_method("-", op_sub);

data/ext/rays/polyline.cpp

@@ -83,7 +83,7 @@ RUCY_DEF0(empty)
 RUCY_END
 
 static
-RUCY_DEF1(at, index)
+RUCY_DEF1(get_at, index)
 {
 	CHECK;
 
@@ -103,7 +103,7 @@ RUCY_DEF0(each)
 {
 	CHECK;
 
-	Value ret;
+	Value ret = Qnil;
 	for (const auto& point : *THIS)
 		ret = rb_yield(value(point));
 	return ret;
@@ -126,7 +126,7 @@ Init_polyline ()
 	cPolyline.define_method("loop?", loop);
 	cPolyline.define_method("size", size);
 	cPolyline.define_method("empty?", empty);
-	cPolyline.define_method("[]", at);
+	cPolyline.define_method("[]", get_at);
 	cPolyline.define_method("each", each);
 }
 

data/ext/rays/rays.cpp

@@ -1,43 +1,33 @@
 #include "rays/ruby/rays.h"
 
 
+#include <vector>
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_OR_ARRAY_TO(Rays::CapType)
-RUCY_DEFINE_VALUE_OR_ARRAY_TO(Rays::JoinType)
+RUCY_DEFINE_CONVERT_TO(Rays::CapType)
+RUCY_DEFINE_CONVERT_TO(Rays::JoinType)
 
 
-static struct CapTypeEnum
+template <typename T>
+struct EnumType
 {
 	const char* name;
-	Rays::CapType type;
-}
-CAP_TYPES[] =
-{
-	{"CAP_BUTT",   Rays::CAP_BUTT},
-	{"CAP_ROUND",  Rays::CAP_ROUND},
-	{"CAP_SQUARE", Rays::CAP_SQUARE},
+	const char* short_name;
+	T type;
 };
 
-static const size_t CAP_TYPES_SIZE =
-	sizeof(CAP_TYPES) / sizeof(CAP_TYPES[0]);
-
-
-static struct JoinTypeEnum
-{
-	const char* name;
-	Rays::JoinType type;
-}
-JOIN_TYPES[] =
-{
-	{"JOIN_MITER",  Rays::JOIN_MITER},
-	{"JOIN_ROUND",  Rays::JOIN_ROUND},
-	{"JOIN_SQUARE", Rays::JOIN_SQUARE},
-};
+static std::vector<EnumType<Rays::CapType>> CAP_TYPES({
+	{"CAP_BUTT",   "BUTT",   Rays::CAP_BUTT},
+	{"CAP_ROUND",  "ROUND",  Rays::CAP_ROUND},
+	{"CAP_SQUARE", "SQUARE", Rays::CAP_SQUARE},
+});
 
-static const size_t JOIN_TYPES_SIZE =
-	sizeof(JOIN_TYPES) / sizeof(JOIN_TYPES[0]);
+static std::vector<EnumType<Rays::JoinType>> JOIN_TYPES({
+	{"JOIN_MITER",  "MITER",  Rays::JOIN_MITER},
+	{"JOIN_ROUND",  "ROUND",  Rays::JOIN_ROUND},
+	{"JOIN_SQUARE", "SQUARE", Rays::JOIN_SQUARE},
+});
 
 
 static
@@ -67,11 +57,11 @@ Init_rays ()
 	mRays.define_singleton_method("init!", init);
 	mRays.define_singleton_method("fin!", fin);
 
-	for (size_t i = 0; i < CAP_TYPES_SIZE; ++i)
-		mRays.define_const(CAP_TYPES[i].name, CAP_TYPES[i].type);
+	for (auto it = CAP_TYPES.begin(); it != CAP_TYPES.end(); ++it)
+		mRays.define_const(it->name, it->type);
 
-	for (size_t i = 0; i < JOIN_TYPES_SIZE; ++i)
-		mRays.define_const(JOIN_TYPES[i].name, JOIN_TYPES[i].type);
+	for (auto it = JOIN_TYPES.begin(); it != JOIN_TYPES.end(); ++it)
+		mRays.define_const(it->name, it->type);
 }
 
 
@@ -89,16 +79,21 @@ namespace Rucy
 			if (argv->is_s() || argv->is_sym())
 			{
 				const char* str = argv->c_str();
-				for (size_t i = 0; i < CAP_TYPES_SIZE; ++i)
+				for (auto it = CAP_TYPES.begin(); it != CAP_TYPES.end(); ++it)
 				{
-					if (strcasecmp(str, CAP_TYPES[i].name) == 0)
-						return CAP_TYPES[i].type;
+					if (
+						strcasecmp(str, it->name)       == 0 ||
+						strcasecmp(str, it->short_name) == 0)
+					{
+						return it->type;
+					}
 				}
+				argument_error(__FILE__, __LINE__, "invalid cap type -- %s", str);
 			}
 		}
 
-		uint type = value_to<uint>(*argv, convert);
-		if (type >= Rays::CAP_MAX)
+		int type = value_to<int>(*argv, convert);
+		if (type < 0 || Rays::CAP_MAX <= type)
 			argument_error(__FILE__, __LINE__, "invalid cap type -- %d", type);
 
 		return (Rays::CapType) type;
@@ -115,16 +110,21 @@ namespace Rucy
 			if (argv->is_s() || argv->is_sym())
 			{
 				const char* str = argv->c_str();
-				for (size_t i = 0; i < JOIN_TYPES_SIZE; ++i)
+				for (auto it = JOIN_TYPES.begin(); it != JOIN_TYPES.end(); ++it)
 				{
-					if (strcasecmp(str, JOIN_TYPES[i].name) == 0)
-						return JOIN_TYPES[i].type;
+					if (
+						strcasecmp(str, it->name)       == 0 ||
+						strcasecmp(str, it->short_name) == 0)
+					{
+						return it->type;
+					}
 				}
+				argument_error(__FILE__, __LINE__, "invalid join type -- %s", str);
 			}
 		}
 
-		uint type = value_to<uint>(*argv, convert);
-		if (type >= Rays::JOIN_MAX)
+		int type = value_to<int>(*argv, convert);
+		if (type < 0 || Rays::JOIN_MAX <= type)
 			argument_error(__FILE__, __LINE__, "invalid join type -- %d", type);
 
 		return (Rays::JoinType) type;

data/include/rays/camera.h

@@ -0,0 +1,49 @@
+// -*- mode: c++ -*-
+#pragma once
+#ifndef __RAYS_CAMERA_H__
+#define __RAYS_CAMERA_H__
+
+
+#include <xot/pimpl.h>
+#include <rays/defs.h>
+#include <rays/image.h>
+
+
+namespace Rays
+{
+
+
+	class Camera
+	{
+
+		typedef Camera This;
+
+		public:
+
+			Camera ();
+
+			~Camera ();
+
+			bool start ();
+
+			void stop ();
+
+			bool is_active () const;
+
+			const Image* image () const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+	};// Camera
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/exception.h

@@ -31,9 +31,13 @@ namespace Rays
 
 		using namespace Xot::ErrorFunctions;
 
-		void rays_error   (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void rays_error (
+			const char* file, int line, const char* format = NULL, ...);
 
-		void opengl_error (const char* file, int line, const char* format = NULL, ...);
+		[[noreturn]]
+		void opengl_error (
+			const char* file, int line, const char* format = NULL, ...);
 
 	}// ErrorFunctions
 

data/include/rays/ruby/camera.h

@@ -0,0 +1,41 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_RUBY_CAMERA_H__
+#define __RAYS_RUBY_CAMERA_H__
+
+
+#include <rucy/rucy.h>
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <rays/camera.h>
+
+
+namespace Rays
+{
+
+
+	Rucy::Class camera_class ();
+	// class Rays::Camera
+
+
+}// Rays
+
+
+RUCY_DECLARE_VALUE_FROM_TO(Rays::Camera)
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Rays::Camera> ()
+	{
+		return Rays::camera_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH