X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_angle.h;h=b35999f4964bb0d96bfd71e90a2a408dd9172e36;hb=e0dedc46e8ab6b258be81887689b0c0fd60def0c;hp=3080366dc637c8b6f2eaf8e07218e52859043766;hpb=fabc591598bbf0618b740627faaab058efd5a29e;p=synfig.git

diff --git a/ETL/trunk/ETL/_angle.h b/ETL/trunk/ETL/_angle.h
index 3080366..b35999f 100644
--- a/ETL/trunk/ETL/_angle.h
+++ b/ETL/trunk/ETL/_angle.h
@@ -5,6 +5,7 @@
 ** $Id$
 **
 ** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2007 Chris Moore
 **
 ** This package is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public License as
@@ -25,8 +26,8 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __ETL_ANGLE_H
-#define __ETL_ANGLE_H
+#ifndef __ETL__ANGLE_H
+#define __ETL__ANGLE_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -40,6 +41,8 @@
 # define HALF_PI (PI/2)
 #endif
 
+#define ANGLE_EPSILON (1.0e-6)
+
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
@@ -60,7 +63,7 @@ public:
 protected:
 	typedef value_type unit;
 
-	unit v;	//! Stored in radians
+	unit v;	//! Stored in radians; positive values indicate counter-clockwise.
 
 public:
 
@@ -115,6 +118,7 @@ public:
 		return ret;
 	}
 
+#ifdef ETL_NOT_USED
 	//! 180 degree rotation operator
 	/*! Returns the angle directly opposite of
 		the given angle, and will yield a result
@@ -126,24 +130,26 @@ public:
 		ret.v = v+PI;
 		return ret.mod();
 	}
+#endif // ETL_NOT_USED
 
+#ifdef ETL_WRAP_ANGLES
 	/*! Returns true if the shortest
-		angle between the left-hand and
-		right-hand side is clockwise */
+		angle from the left-hand to the
+		right-hand side is counter-clockwise */
 	bool
 	operator<(const angle &rhs)const
 	{ return dist(rhs).v<(value_type)0.0; }
 
 	/*! Returns true if the shortest
-		angle between the left-hand and
-		right-hand side is counter-clockwise */
+		angle from the left-hand to the
+		right-hand side is clockwise */
 	bool
 	operator>(const angle &rhs)const
 	{ return dist(rhs).v>(value_type)0.0; }
 
 	/*! Returns true if the shortest
-		angle between the left-hand and
-		right-hand side is clockwise,
+		angle from the left-hand to the
+		right-hand side is counter-clockwise,
 		or if the angles are refer to the same
 		point on the unit circle. */
 	bool
@@ -151,8 +157,8 @@ public:
 	{ return dist(rhs).v<=(value_type)0.0; }
 
 	/*! Returns true if the shortest
-		angle between the left-hand and
-		right-hand side is counter-clockwise,
+		angle from the left-hand to the
+		right-hand side is clockwise,
 		or if the angles are refer to the same
 		point on the unit circle. */
 	bool
@@ -164,15 +170,68 @@ public:
 		on the unit circle. */
 	bool
 	operator==(const angle &rhs)const
-	{ return std::abs(dist(rhs).v)<epsilon; }
+	{ return std::abs(dist(rhs).v)<ANGLE_EPSILON; }
 
 	/*! Returns false if the angles
 		are refer to the same point
 		on the unit circle. */
 	bool
 	operator!=(const angle &rhs)const
-	{ return std::abs(dist(rhs).v)>epsilon; }
+	{ return std::abs(dist(rhs).v)>ANGLE_EPSILON; }
+#else // ETL_WRAP_ANGLES
+	/*! Returns true if the left-hand
+		side is less than the
+		right-hand side */
+	bool
+	operator<(const angle &rhs)const
+	{ return v < rhs.v; }
+
+	/*! Returns true if the left-hand
+		side is greater than the
+		right-hand side */
+	bool
+	operator>(const angle &rhs)const
+	{ return v > rhs.v; }
+
+	/*! Returns true if the left-hand
+		side is less or equal to the
+		right-hand side */
+	bool
+	operator<=(const angle &rhs)const
+	{ return v <= rhs.v; }
+
+	/*! Returns true if the left-hand
+		side is greater than or equal
+		to the right-hand side */
+	bool
+	operator>=(const angle &rhs)const
+	{ return v >= rhs.v; }
+
+	/*! Returns true if the angles
+		are the same, or close */
+	bool
+	operator==(const angle &rhs)const
+	{ return std::abs(v - rhs.v)<ANGLE_EPSILON; }
+
+	/*! Returns false if the angles
+		are different */
+	bool
+	operator!=(const angle &rhs)const
+		{ return std::abs(v - rhs.v)>ANGLE_EPSILON; }
+#endif // ETL_WRAP_ANGLES
 
+	//! Absolute Angle Function
+	/*! This function will return the
+		absolute value of the angle. */
+	angle
+	abs()const
+	{
+		angle ret;
+		ret.v=std::abs(v);
+		return ret;
+	}
+
+#ifdef ETL_WRAP_ANGLES
 	//! Angle Difference Function
 	/*! This function will return the
 		shortest physical distance between
@@ -197,7 +256,28 @@ public:
 		ret.v-=rot_floor(ret.v);
 		return ret;
 	}
+#else // ETL_WRAP_ANGLES
+	//! Angle Difference Function
+	/*! This function will return the
+		difference between
+		two angles, just like
+		\sa angle operator-(const angle &) */
+	angle
+	dist(const angle &rhs)const
+	{ return angle(*this)-=rhs; }
 
+	//! Rotation Modulus
+	/*! This function will return the
+		value of the angle */
+	angle
+	mod()const
+	{
+		angle ret(*this);
+		return ret;
+	}
+#endif // ETL_WRAP_ANGLES
+
+	//! Zero Rotation (0 degrees)
 	static angle
 	zero()
 	{
@@ -206,30 +286,32 @@ public:
 		return ret;
 	}
 
+	//! One Complete Rotation (360 degrees)
 	static angle
 	one()
 	{
 		angle ret;
-		ret.v=PI;
+		ret.v=PI*2;
 		return ret;
 	}
 
+	//! One Half Rotation (180 degrees)
 	static angle
 	half()
 	{
 		angle ret;
-		ret.v=PI*0.5;
+		ret.v=PI;
 		return ret;
 	}
 
-	bool operator!()const { return v==0; }
+	bool operator!()const { return std::abs(mod().v) < ANGLE_EPSILON; }
 
 private:
 
+#ifdef ETL_WRAP_ANGLES
 	static value_type rot_floor(value_type x)
 	{ return static_cast<value_type>(std::floor(x/(PI*2))*PI*2); }
-
-	static const value_type epsilon = 1.0e-6;
+#endif // ETL_WRAP_ANGLES
 
 public:
 	/*
@@ -283,12 +365,12 @@ public:
 	rad(const angle &a):angle(a) { }
 	rad	mod()const { return angle::mod(); }
 	rad dist(const angle &rhs)const { return angle::dist(rhs); }
+	value_type get()const { return v; }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
-	value_type get()const { return v; }
 }; // END of class angle::radians
-inline angle::rad::operator angle::value_type()const { return get(); }
+// inline angle::rad::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::deg	_angle.h	ETL/angle
@@ -305,10 +387,10 @@ public:
 	deg dist(const angle &rhs)const { return angle::dist(rhs); }
 	value_type get()const { return v*360/(PI*2); }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::degrees
-inline angle::deg::operator angle::value_type()const { return get(); }
+// inline angle::deg::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::rot	_angle.h	ETL/angle
@@ -325,10 +407,10 @@ public:
 	rot dist(const angle &rhs)const { return angle::dist(rhs); }
 	value_type get()const { return v/(PI*2); }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::rotations
-inline angle::rot::operator angle::value_type()const { return get(); }
+// inline angle::rot::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::sin	_angle.h	ETL/angle
@@ -345,10 +427,10 @@ public:
 	sin dist(const angle &rhs)const { return angle::dist(rhs); }
 	value_type get()const { return static_cast<value_type>(std::sin(v)); }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::sin
-inline angle::sin::operator angle::value_type()const { return get(); }
+// inline angle::sin::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::cos	_angle.h	ETL/angle
@@ -363,12 +445,12 @@ public:
 	cos(const angle &a):angle(a) { }
 	cos	mod()const { return angle::mod(); }
 	cos dist(const angle &rhs)const { return angle::dist(rhs); }
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
-#ifndef ETL_NO_DEPRECATED
 	value_type get()const { return (value_type)std::cos(v); }
+#ifndef ETL_NO_DEPRECATED
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
 }; // END of class angle::cos
-inline angle::cos::operator angle::value_type()const { return get(); }
+// inline angle::cos::operator angle::value_type()const { return get(); }
 
 // ========================================================================
 /*!	\class	angle::tan	_angle.h	ETL/angle
@@ -384,12 +466,12 @@ public:
 	tan(const angle &a):angle(a) { }
 	tan	mod()const { return angle::mod(); }
 	tan dist(const angle &rhs)const { return angle::dist(rhs); }
+	value_type get()const { return (value_type)std::tan(v); }
 #ifndef ETL_NO_DEPRECATED
-	operator value_type()const ETL_DEPRECATED_FUNCTION;
+	// operator value_type()const ETL_DEPRECATED_FUNCTION;
 #endif
-	value_type get()const { return (value_type)std::tan(v); }
 }; // END of class angle::tan
-inline angle::tan::operator angle::value_type()const { return get(); }
+// inline angle::tan::operator angle::value_type()const { return get(); }
 
 _ETL_END_NAMESPACE