Skip to content
Permalink
Browse files

Removed the optional code path hack

  • Loading branch information...
robertosfield committed Mar 14, 2019
1 parent 4e9762d commit f6acb803579570079e5333593896214bda9c69f2
Showing with 4 additions and 8 deletions.
  1. +4 −8 src/osgPlugins/p3d/ReaderWriterP3D.cpp
@@ -217,14 +217,10 @@ class ReaderWriterP3DXML : public osgDB::ReaderWriter
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;

0 comments on commit f6acb80

Please sign in to comment.
You can’t perform that action at this time.