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

Removed the optional code path hack

Browse Source
This commit is contained in:
Robert Osfield
2019-03-14 10:13:15 +00:00
parent 12b298130a
commit 37eae8c719
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPlugins/p3d/ReaderWriterP3D.cpp
View File

@@ -217,14 +217,10 @@ public:
qlhs.makeRotate(osg::DegreesToRadians(lhs[0]),lhs[1],lhs[2],lhs[3]);
qrhs.makeRotate(osg::DegreesToRadians(rhs[0]),rhs[1],rhs[2],rhs[3]);
osg::Quat quat = qlhs*qrhs;
#ifdef OSG_USE_FLOAT_QUAT
osg::Vec4f result;
#else
osg::Vec4d result;
#endif
quat.getRotate ( result[0], result[1], result[2], result[3]);
result[0] = osg::RadiansToDegrees(result[0]);
return result;
osg::Quat::value_type angle;
osg::Vec3 direction;
quat.getRotate(angle, direction);
return osg::Vec4(osg::RadiansToDegrees(angle), direction.x(), direction.y(), direction.z());
}
inline bool read(const char* str, int& value) const;