rays 0.1.12 → 0.1.13

data/include/rays/point.h

@@ -4,105 +4,98 @@
 #define __RAYS_POINT_H__
 
 
-#include <rays/defs.h>
+#include <rays/coord.h>
 
 
 namespace Rays
 {
 
 
-	struct Coord2
+	struct Point : public Coord3
 	{
 
-		union
-		{
-			struct {coord x, y;};
-			coord array[2];
-		};
+		typedef Point This;
 
-		Coord2& reset (coord value = 0);
+		typedef Coord3 Super;
 
-		Coord2& reset (coord x, coord y);
+		Point (coord value = 0);
 
-		      coord& operator [] (size_t index);
+		Point (coord x, coord y, coord z = 0);
 
-		const coord& operator [] (size_t index) const;
+		This dup () const;
 
-	};// Coord2
+		This& reset (coord value = 0);
 
+		This& reset (coord x, coord y, coord z = 0);
 
-	struct Coord3
-	{
+		This& move_to (coord x, coord y, coord z = 0);
 
-		union
-		{
-			struct {coord x, y, z;};
-			coord array[3];
-		};
+		This& move_to (const This& point);
 
-		Coord3& reset (coord value = 0);
+		This& move_by (coord x, coord y, coord z = 0);
 
-		Coord3& reset (coord x, coord y, coord z = 0);
+		This& move_by (const This& point);
 
-		      coord& operator [] (size_t index);
+		void rotate (float degree);
 
-		const coord& operator [] (size_t index) const;
+		coord length () const;
 
-	};// Coord3
+		This normal () const;
 
+		void normalize ();
 
-	struct Point : public Coord3
-	{
+		This operator - () const;
 
-		Point (coord value = 0);
+		This& operator += (coord       rhs);
 
-		Point (coord x, coord y, coord z = 0);
+		This& operator += (const This& rhs);
 
-		Point dup () const;
+		This& operator -= (coord       rhs);
 
-		Point& move_to (coord x, coord y, coord z = 0);
+		This& operator -= (const This& rhs);
 
-		Point& move_to (const Point& point);
+		This& operator *= (coord       rhs);
 
-		Point& move_by (coord x, coord y, coord z = 0);
+		This& operator *= (const This& rhs);
 
-		Point& move_by (const Point& point);
+		This& operator /= (coord       rhs);
 
-		coord length () const;
+		This& operator /= (const This& rhs);
 
-		void  normalize ();
+		friend bool operator == (const This& lhs, const This& rhs);
 
-		Point normal () const;
+		friend bool operator != (const This& lhs, const This& rhs);
 
-		String inspect () const;
+		friend This operator + (coord       lhs, const This& rhs);
 
-		Point operator - () const;
+		friend This operator + (const This& lhs, coord       rhs);
 
-		Point& operator += (const Point& rhs);
+		friend This operator + (const This& lhs, const This& rhs);
 
-		Point& operator -= (const Point& rhs);
+		friend This operator - (coord       lhs, const This& rhs);
 
-		Point& operator *= (const Point& rhs);
+		friend This operator - (const This& lhs, coord       rhs);
 
-		Point& operator /= (const Point& rhs);
+		friend This operator - (const This& lhs, const This& rhs);
 
-		Point& operator /= (coord rhs);
+		friend This operator * (coord       lhs, const This& rhs);
 
-		friend bool operator == (const Point& lhs, const Point& rhs);
+		friend This operator * (const This& lhs, coord       rhs);
 
-		friend bool operator != (const Point& lhs, const Point& rhs);
+		friend This operator * (const This& lhs, const This& rhs);
 
-		friend Point operator + (const Point& lhs, const Point& rhs);
+		friend This operator / (coord       lhs, const This& rhs);
 
-		friend Point operator - (const Point& lhs, const Point& rhs);
+		friend This operator / (const This& lhs, coord       rhs);
 
-		friend Point operator * (const Point& lhs, const Point& rhs);
+		friend This operator / (const This& lhs, const This& rhs);
 
-		friend Point operator / (const Point& lhs, const Point& rhs);
+	};// Point
 
-		friend Point operator / (const Point& lhs, coord        rhs);
 
-	};// Point
+	coord dot (const Point& p1, const Point& p2);
+
+	Point cross (const Point& p1, const Point& p2);
 
 
 }// Rays

data/include/rays/polygon.h

@@ -0,0 +1,164 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_POLYGON_H__
+#define __RAYS_POLYGON_H__
+
+
+#include <vector>
+#include <xot/pimpl.h>
+#include <rays/bounds.h>
+#include <rays/polyline.h>
+
+
+namespace Rays
+{
+
+
+	class Polygon
+	{
+
+		public:
+
+			struct Line : public Polyline
+			{
+
+				typedef Polyline Super;
+
+				public:
+
+					Line ();
+
+					Line (
+						const Point* points, size_t size,
+						bool loop = true,
+						bool hole = false);
+
+					Line (const Polyline& polyline, bool hole = false);
+
+					bool hole () const;
+
+					operator bool () const;
+
+					bool operator ! () const;
+
+				private:
+
+					bool hole_;
+
+			};// Line
+
+			typedef std::vector<Line> LineList;
+
+			typedef LineList::const_iterator const_iterator;
+
+			Polygon ();
+
+			Polygon (const Point* points, size_t size, bool loop = true);
+
+			Polygon (const Polyline& polyline);
+
+			Polygon (const Line* lines, size_t size);
+
+			~Polygon ();
+
+			bool expand (Polygon* result, coord width) const;
+
+			Bounds bounds () const;
+
+			size_t size () const;
+
+			bool empty (bool deep = false) const;
+
+			const_iterator begin () const;
+
+			const_iterator end () const;
+
+			const Line& operator [] (size_t index) const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			friend Polygon operator + (const Polygon& lhs, const Polygon& rhs);
+
+			friend Polygon operator - (const Polygon& lhs, const Polygon& rhs);
+
+			friend Polygon operator & (const Polygon& lhs, const Polygon& rhs);
+
+			friend Polygon operator | (const Polygon& lhs, const Polygon& rhs);
+
+			friend Polygon operator ^ (const Polygon& lhs, const Polygon& rhs);
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+			typedef std::vector<Point> TrianglePointList;
+
+			Polygon (Data* data);
+
+		protected:
+
+			bool triangulate (TrianglePointList* triangles) const;
+
+	};// Polygon
+
+
+	Polygon create_line (coord x1, coord y1, coord x2, coord y2);
+
+	Polygon create_line (const Point& p1, const Point& p2);
+
+	Polygon create_line (const Point* points, size_t size, bool loop = false);
+
+	Polygon create_line (const Polyline& polyline);
+
+
+	Polygon create_rect (
+		coord x, coord y, coord width, coord height,
+		coord round   = 0,
+		uint nsegment = 0);
+
+	Polygon create_rect (
+		coord x, coord y, coord width, coord height,
+		coord round_left_top,    coord round_right_top,
+		coord round_left_bottom, coord round_right_bottom,
+		uint nsegment = 0);
+
+	Polygon create_rect (
+		const Bounds& bounds,
+		coord round   = 0,
+		uint nsegment = 0);
+
+	Polygon create_rect (
+		const Bounds& bounds,
+		coord round_left_top,    coord round_right_top,
+		coord round_left_bottom, coord round_right_bottom,
+		uint nsegment = 0);
+
+
+	Polygon create_ellipse (
+		coord x, coord y, coord width, coord height = 0,
+		const Point& hole_size = 0,
+		float angle_from       = 0,
+		float angle_to         = 360,
+		uint nsegment          = 0);
+
+	Polygon create_ellipse (
+		const Bounds& bounds,
+		const Point& hole_size = 0,
+		float angle_from       = 0,
+		float angle_to         = 360,
+		uint nsegment          = 0);
+
+	Polygon create_ellipse (
+		const Point& center, const Point& radius,
+		const Point& hole_radius = 0,
+		float angle_from         = 0,
+		float angle_to           = 360,
+		uint nsegment            = 0);
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/polyline.h

@@ -0,0 +1,65 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __RAYS_POLYLINE_H__
+#define __RAYS_POLYLINE_H__
+
+
+#include <vector>
+#include <xot/pimpl.h>
+#include <rays/point.h>
+#include <rays/bounds.h>
+
+
+namespace Rays
+{
+
+
+	class Polygon;
+
+
+	class Polyline
+	{
+
+		public:
+
+			typedef std::vector<Point> PointList;
+
+			typedef PointList::const_iterator const_iterator;
+
+			Polyline ();
+
+			Polyline (const Point* points, size_t size, bool loop = false);
+
+			~Polyline ();
+
+			bool expand (Polygon* result, coord width) const;
+
+			Bounds bounds () const;
+
+			bool loop () const;
+
+			size_t size () const;
+
+			bool empty () const;
+
+			const_iterator begin () const;
+
+			const_iterator end () const;
+
+			const Point& operator [] (size_t index) const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+	};// Polyline
+
+
+}// Rays
+
+
+#endif//EOH

data/include/rays/rays.h

@@ -4,6 +4,9 @@
 #define __RAYS_RAYS_H__
 
 
+#include <rays/defs.h>
+
+
 namespace Rays
 {
 

data/include/rays/ruby.h

@@ -5,14 +5,20 @@
 
 
 #include <rays/ruby/rays.h>
+
 #include <rays/ruby/point.h>
 #include <rays/ruby/bounds.h>
 #include <rays/ruby/color.h>
+#include <rays/ruby/color_space.h>
+#include <rays/ruby/matrix.h>
+
+#include <rays/ruby/polyline.h>
+#include <rays/ruby/polygon.h>
 #include <rays/ruby/bitmap.h>
-#include <rays/ruby/texture.h>
 #include <rays/ruby/image.h>
 #include <rays/ruby/font.h>
 #include <rays/ruby/shader.h>
+
 #include <rays/ruby/painter.h>
 
 

data/include/rays/ruby/bounds.h

@@ -23,7 +23,7 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Bounds)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Bounds)
 
 
 namespace Rucy

data/include/rays/ruby/color.h

@@ -22,7 +22,7 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Color)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Color)
 
 
 namespace Rucy

data/include/rays/ruby/color_space.h

@@ -21,7 +21,7 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::ColorSpace)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::ColorSpace)
 
 
 namespace Rucy

data/include/rays/ruby/font.h

@@ -21,7 +21,7 @@ namespace Rays
 }// Rays
 
 
-RUCY_DECLARE_VALUE_FROM_TO(Rays::Font)
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(Rays::Font)
 
 
 namespace Rucy