From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Wed, 14 Nov 2007 09:58:04 +0000 (+0000)
Subject: Working on #1827966. Removed more 'wrap at 360 degrees' code.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=7555e3b7805d66eac4fd47efd0a05b90db61387b;p=synfig.git

Working on #1827966. Removed more 'wrap at 360 degrees' code.


git-svn-id: http://svn.voria.com/code@1150 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/ETL/trunk/ETL/_angle.h b/ETL/trunk/ETL/_angle.h
index eb7710b..c15f90d 100644
--- a/ETL/trunk/ETL/_angle.h
+++ b/ETL/trunk/ETL/_angle.h
@@ -118,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
@@ -129,6 +130,7 @@ public:
 		ret.v = v+PI;
 		return ret.mod();
 	}
+#endif // ETL_NOT_USED
 
 #ifdef ETL_WRAP_ANGLES
 	/*! Returns true if the shortest
@@ -229,6 +231,7 @@ public:
 		return ret;
 	}
 
+#ifdef ETL_WRAP_ANGLES
 	//! Angle Difference Function
 	/*! This function will return the
 		shortest physical distance between
@@ -253,6 +256,26 @@ 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
@@ -285,8 +308,10 @@ public:
 
 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); }
+#endif // ETL_WRAP_ANGLES
 
 public:
 	/*