[Opal-commits] opal/src Matrix44r.h,1.35,1.36
Status: Inactive
Brought to you by:
tylerstreeter
|
From: tylerstreeter <tyl...@us...> - 2005-07-19 17:29:22
|
Update of /cvsroot/opal/opal/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27989/src Modified Files: Matrix44r.h Log Message: Cleaned up more Visual Studio warnings in Matrix44r::getQuaternion(). Index: Matrix44r.h =================================================================== RCS file: /cvsroot/opal/opal/src/Matrix44r.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Matrix44r.h 26 Jun 2005 16:57:34 -0000 1.35 --- Matrix44r.h 19 Jul 2005 17:29:13 -0000 1.36 *************** *** 287,292 **** if((*this)(0,0) > (*this)(1,1) && (*this)(0,0) > (*this)(2,2)) { ! real s = 2.0 * sqrt(static_cast<real>(1.0 + (*this)(0,0) - (*this)(1,1) - ! (*this)(2,2))); q[1] = 0.25f * s; q[2] = ((*this)(0,1) + (*this)(1,0)) / s; --- 287,292 ---- if((*this)(0,0) > (*this)(1,1) && (*this)(0,0) > (*this)(2,2)) { ! real s = 2 * sqrt(static_cast<real>(1 + (*this)(0,0) - ! (*this)(1,1) - (*this)(2,2))); q[1] = 0.25f * s; q[2] = ((*this)(0,1) + (*this)(1,0)) / s; *************** *** 296,301 **** else if ((*this)(1,1) > (*this)(2,2)) { ! real s = 2.0 * sqrt(static_cast<real>(1.0 + (*this)(1,1) - (*this)(0,0) - ! (*this)(2,2))); q[1] = ((*this)(0,1) + (*this)(1,0)) / s; q[2] = 0.25f * s; --- 296,301 ---- else if ((*this)(1,1) > (*this)(2,2)) { ! real s = 2 * sqrt(static_cast<real>(1 + (*this)(1,1) - ! (*this)(0,0) - (*this)(2,2))); q[1] = ((*this)(0,1) + (*this)(1,0)) / s; q[2] = 0.25f * s; *************** *** 305,310 **** else { ! real s = 2.0 * sqrt(static_cast<real>(1.0 + (*this)(2,2) - (*this)(0,0) - ! (*this)(1,1))); q[1] = ((*this)(0,2) + (*this)(2,0)) / s; q[2] = ((*this)(1,2) + (*this)(2,1)) / s; --- 305,310 ---- else { ! real s = 2 * sqrt(static_cast<real>(1 + (*this)(2,2) - ! (*this)(0,0) - (*this)(1,1))); q[1] = ((*this)(0,2) + (*this)(2,0)) / s; q[2] = ((*this)(1,2) + (*this)(2,1)) / s; |