diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-07-12 16:40:02 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-07-12 16:40:02 +0200 |
| commit | 7ee378d89da93d2556ba000f59783c4c0e32e9a0 (patch) | |
| tree | 4223aa456491464498382673b47edda0b5891fe9 /test/geo_quaternion.cpp | |
| parent | 61c3f55362969ca20d88120f0ca226d3c23668d8 (diff) | |
Fix various scalar type conversion warnings.
Diffstat (limited to 'test/geo_quaternion.cpp')
| -rw-r--r-- | test/geo_quaternion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/geo_quaternion.cpp b/test/geo_quaternion.cpp index e011879a5..1694b32c7 100644 --- a/test/geo_quaternion.cpp +++ b/test/geo_quaternion.cpp @@ -32,7 +32,7 @@ template<typename QuatType> void check_slerp(const QuatType& q0, const QuatType& Scalar theta_tot = AA(q1*q0.inverse()).angle(); if(theta_tot>M_PI) theta_tot = Scalar(2.*M_PI)-theta_tot; - for(Scalar t=0; t<=1.001; t+=0.1) + for(Scalar t=0; t<=Scalar(1.001); t+=Scalar(0.1)) { QuatType q = q0.slerp(t,q1); Scalar theta = AA(q*q0.inverse()).angle(); @@ -156,7 +156,7 @@ template<typename Scalar, int Options> void quaternion(void) check_slerp(q1,q2); q1 = AngleAxisx(b, v1.normalized()); - q2 = AngleAxisx(b+M_PI, v1.normalized()); + q2 = AngleAxisx(b+Scalar(M_PI), v1.normalized()); check_slerp(q1,q2); q1 = AngleAxisx(b, v1.normalized()); |