FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added signOrZero template method, and to Matrix_implementation.cpp usage of this

Browse Source 
method in the get(Quat&) code.
This commit is contained in:
Robert Osfield
2007-05-09 09:26:33 +00:00
parent 681bf12333
commit 6c74589014
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
examples/osgunittests/osgunittests.cpp
View File

@@ -314,8 +314,21 @@ void testQuat()
testQuatRotate(osg::Vec3d(0.0,0.0,-1.0),osg::Vec3d(0.0,0.0,1.0));
testGetQuatFromMatrix();
osg::Matrix matrix(0.5, 0.0, 0.0, 0.0,
0.0, 0.5, 0.0, 0.0,
0.0, 0.0, 0.5, 0.0,
1.0, 1.0, 1.0, 1.0);
osg::Quat quat;
matrix.get(quat);
osg::notify(osg::NOTICE)<<"Matrix = "<<matrix<<" rotation="<<quat<<std::endl;
}
int main( int argc, char** argv )
{
osg::ArgumentParser arguments(&argc,argv);

3
include/osg/Math
View File

@@ -167,6 +167,9 @@ inline T clampBetween(T v,T minimum, T maximum)
template<typename T>
inline T sign(T v) { return v<(T)0?(T)-1:(T)1; }
template<typename T>
inline T signOrZero(T v) { return v<(T)0 ? (T)-1 : ( v>(T)0 ? (T)1 : 0 ); }
template<typename T>
inline T square(T v) { return v*v; }

6
src/osg/Matrix_implementation.cpp
View File

@@ -138,9 +138,9 @@ Quat Matrix_implementation::getRotate() const
QY = 0.5 * sqrt( osg::maximum( 0.0, 1.0 - _mat[0][0] + _mat[1][1] - _mat[2][2] ) );
QZ = 0.5 * sqrt( osg::maximum( 0.0, 1.0 - _mat[0][0] - _mat[1][1] + _mat[2][2] ) );
QX = QX * osg::sign( _mat[1][2] - _mat[2][1]) ;
QY = QY * osg::sign( _mat[2][0] - _mat[0][2]) ;
QZ = QZ * osg::sign( _mat[0][1] - _mat[1][0]) ;
QX = QX * osg::signOrZero( _mat[1][2] - _mat[2][1]) ;
QY = QY * osg::signOrZero( _mat[2][0] - _mat[0][2]) ;
QZ = QZ * osg::signOrZero( _mat[0][1] - _mat[1][0]) ;
return q;
}