X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_angle.h;h=c15f90d813e97601ec0a2ba71fd011571f4d8cfd;hb=7555e3b7805d66eac4fd47efd0a05b90db61387b;hp=eb7710b2137be280ea485d9acc8a0a8bc44950fd;hpb=0e3495322880e5f5594301f046fad5e2a7d5bfde;p=synfig.git 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(std::floor(x/(PI*2))*PI*2); } +#endif // ETL_WRAP_ANGLES public: /*