rays 0.1.13 → 0.1.18

data/ext/rays/rays.cpp

@@ -1,7 +1,35 @@
-#include "rays/rays.h"
+#include "rays/ruby/rays.h"
+
+
+#include <vector>
 #include "defs.h"
 
 
+RUCY_DEFINE_CONVERT_TO(Rays::CapType)
+RUCY_DEFINE_CONVERT_TO(Rays::JoinType)
+
+
+template <typename T>
+struct EnumType
+{
+	const char* name;
+	const char* short_name;
+	T type;
+};
+
+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 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
 RUCY_DEF0(init)
 {
@@ -25,11 +53,87 @@ void
 Init_rays ()
 {
 	mRays = define_module("Rays");
+
 	mRays.define_singleton_method("init!", init);
 	mRays.define_singleton_method("fin!", fin);
+
+	for (auto it = CAP_TYPES.begin(); it != CAP_TYPES.end(); ++it)
+		mRays.define_const(it->name, it->type);
+
+	for (auto it = JOIN_TYPES.begin(); it != JOIN_TYPES.end(); ++it)
+		mRays.define_const(it->name, it->type);
 }
 
 
+namespace Rucy
+{
+
+
+	template <> Rays::CapType
+	value_to<Rays::CapType> (int argc, const Value* argv, bool convert)
+	{
+		assert(argc > 0 && argv);
+
+		if (convert)
+		{
+			if (argv->is_s() || argv->is_sym())
+			{
+				const char* str = argv->c_str();
+				for (auto it = CAP_TYPES.begin(); it != CAP_TYPES.end(); ++it)
+				{
+					if (
+						strcasecmp(str, it->name)       == 0 ||
+						strcasecmp(str, it->short_name) == 0)
+					{
+						return it->type;
+					}
+				}
+				argument_error(__FILE__, __LINE__, "invalid cap type -- %s", str);
+			}
+		}
+
+		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;
+	}
+
+
+	template <> Rays::JoinType
+	value_to<Rays::JoinType> (int argc, const Value* argv, bool convert)
+	{
+		assert(argc > 0 && argv);
+
+		if (convert)
+		{
+			if (argv->is_s() || argv->is_sym())
+			{
+				const char* str = argv->c_str();
+				for (auto it = JOIN_TYPES.begin(); it != JOIN_TYPES.end(); ++it)
+				{
+					if (
+						strcasecmp(str, it->name)       == 0 ||
+						strcasecmp(str, it->short_name) == 0)
+					{
+						return it->type;
+					}
+				}
+				argument_error(__FILE__, __LINE__, "invalid join type -- %s", str);
+			}
+		}
+
+		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;
+	}
+
+
+}// Rucy
+
+
 namespace Rays
 {
 

data/include/rays/camera.h

@@ -0,0 +1,74 @@
+// -*- mode: c++ -*-
+#pragma once
+#ifndef __RAYS_CAMERA_H__
+#define __RAYS_CAMERA_H__
+
+
+#include <vector>
+#include <xot/pimpl.h>
+#include <rays/defs.h>
+#include <rays/image.h>
+
+
+namespace Rays
+{
+
+
+	class Camera
+	{
+
+		typedef Camera This;
+
+		public:
+
+			Camera (
+				const char* device_name = NULL,
+				int min_width  = -1,
+				int min_height = -1,
+				bool resize    = true,
+				bool crop      = true);
+
+			~Camera ();
+
+			bool start ();
+
+			void stop ();
+
+			bool is_active () const;
+
+			void set_min_width (int width);
+
+			int      min_width () const;
+
+			void set_min_height (int height);
+
+			int      min_height () const;
+
+			void set_resize (bool resize = true);
+
+			bool  is_resize () const;
+
+			void set_crop (bool crop = true);
+
+			bool  is_crop () const;
+
+			const Image* image () const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+	};// Camera
+
+
+	std::vector<String> get_camera_device_names ();
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/color_space.h

@@ -14,7 +14,7 @@ namespace Rays
 	enum ColorSpaceType
 	{
 
-		COLORSPACE_UNKNOWN = Xot::UNKNOWN,
+		COLORSPACE_UNKNOWN = 0,
 
 		 GRAY_8,  GRAY_16,  GRAY_24,  GRAY_32,  GRAY_float,
 
@@ -28,7 +28,7 @@ namespace Rays
 
 		BGR_float, BGRA_float, ABGR_float,
 
-		COLORSPACE_LAST,
+		COLORSPACE_MAX,
 
 		GRAY  =  GRAY_8,
 
@@ -40,6 +40,8 @@ namespace Rays
 
 		BGRA  = BGRA_8888, BGRX = BGRX_8888, ABGR = ABGR_8888, XBGR = XBGR_8888,
 
+		DEFAULT_COLOR_SPACE = RGBA
+
 	};// ColorSpaceType
 
 

data/include/rays/defs.h

@@ -23,6 +23,39 @@ namespace Rays
 	typedef float coord;
 
 
+	enum CapType
+	{
+
+		CAP_BUTT = 0,
+
+		CAP_ROUND,
+
+		CAP_SQUARE,
+
+		CAP_MAX,
+
+		CAP_DEFAULT = CAP_BUTT
+
+	};// CapType
+
+
+	enum JoinType
+	{
+
+		JOIN_MITER = 0,
+
+		JOIN_ROUND,
+
+		JOIN_SQUARE,
+
+		JOIN_MAX,
+
+		JOIN_DEFAULT             = JOIN_MITER,
+		JOIN_DEFAULT_MITER_LIMIT = 2
+
+	};// JoinType
+
+
 }// Rays
 
 

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/image.h

@@ -26,7 +26,7 @@ namespace Rays
 			Image ();
 
 			Image (
-				int width, int height, const ColorSpace& cs = RGBA,
+				int width, int height, const ColorSpace& cs = DEFAULT_COLOR_SPACE,
 				float pixel_density = 1);
 
 			Image (const Bitmap& bitmap, float pixel_density = 1);

data/include/rays/painter.h

@@ -106,6 +106,32 @@ namespace Rays
 				const Point& hole_radius = 0,
 				float angle_from = 0, float angle_to = 360);
 
+			void curve (
+				coord x1, coord y1, coord x2, coord y2,
+				coord x3, coord y3, coord x4, coord y4,
+				bool loop = false);
+
+			void curve (
+				const Point& p1, const Point& p2, const Point& p3, const Point& p4,
+				bool loop = false);
+
+			void curve (
+				const Point* points, size_t size,
+				bool loop = false);
+
+			void bezier (
+				coord x1, coord y1, coord x2, coord y2,
+				coord x3, coord y3, coord x4, coord y4,
+				bool loop = false);
+
+			void bezier (
+				const Point& p1, const Point& p2, const Point& p3, const Point& p4,
+				bool loop = false);
+
+			void bezier (
+				const Point* points, size_t size,
+				bool loop = false);
+
 			void image (
 				const Image& image, coord x = 0, coord y = 0);
 
@@ -176,6 +202,18 @@ namespace Rays
 
 			coord    stroke_width () const;
 
+			void set_stroke_cap (CapType cap);
+
+			CapType  stroke_cap () const;
+
+			void set_stroke_join (JoinType join);
+
+			JoinType stroke_join () const;
+
+			void set_miter_limit (coord limit);
+
+			coord    miter_limit () const;
+
 			void set_nsegment (int nsegment);
 
 			uint     nsegment () const;

data/include/rays/polygon.h

@@ -6,6 +6,7 @@
 
 #include <vector>
 #include <xot/pimpl.h>
+#include <rays/defs.h>
 #include <rays/bounds.h>
 #include <rays/polyline.h>
 
@@ -61,7 +62,12 @@ namespace Rays
 
 			~Polygon ();
 
-			bool expand (Polygon* result, coord width) const;
+			bool expand (
+				Polygon* result,
+				coord width,
+				CapType cap       = CAP_DEFAULT,
+				JoinType join     = JOIN_DEFAULT,
+				coord miter_limit = JOIN_DEFAULT_MITER_LIMIT) const;
 
 			Bounds bounds () const;
 
@@ -158,6 +164,34 @@ namespace Rays
 		uint nsegment            = 0);
 
 
+	Polygon create_curve (
+		coord x1, coord y1, coord x2, coord y2,
+		coord x3, coord y3, coord x4, coord y4,
+		bool loop = false);
+
+	Polygon create_curve (
+		const Point& p1, const Point& p2, const Point& p3, const Point& p4,
+		bool loop = false);
+
+	Polygon create_curve (
+		const Point* points, size_t size,
+		bool loop = false);
+
+
+	Polygon create_bezier (
+		coord x1, coord y1, coord x2, coord y2,
+		coord x3, coord y3, coord x4, coord y4,
+		bool loop = false);
+
+	Polygon create_bezier (
+		const Point& p1, const Point& p2, const Point& p3, const Point& p4,
+		bool loop = false);
+
+	Polygon create_bezier (
+		const Point* points, size_t size,
+		bool loop = false);
+
+
 }// Rays
 
 

data/include/rays/polyline.h

@@ -6,6 +6,7 @@
 
 #include <vector>
 #include <xot/pimpl.h>
+#include <rays/defs.h>
 #include <rays/point.h>
 #include <rays/bounds.h>
 
@@ -32,7 +33,12 @@ namespace Rays
 
 			~Polyline ();
 
-			bool expand (Polygon* result, coord width) const;
+			bool expand (
+				Polygon* result,
+				coord width,
+				CapType cap       = CAP_DEFAULT,
+				JoinType join     = JOIN_DEFAULT,
+				coord miter_limit = JOIN_DEFAULT_MITER_LIMIT) const;
 
 			Bounds bounds () const;
 

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