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

Build fix

Browse Source
This commit is contained in:
Robert Osfield
2017-05-25 09:54:11 +01:00
parent 2fe039e349
commit 502acc19c9
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/osgunittests/osgunittests.cpp
View File

@@ -407,8 +407,7 @@ void testQuat(const osg::Vec3d& quat_scale)
0.0, 0.0, 0.5, 0.0,
1.0, 1.0, 1.0, 1.0);
osg::Quat quat;
matrix.get(quat);
osg::Quat quat = matrix.getRotate();
osg::notify(osg::NOTICE)<<"Matrix = "<<matrix<<"rotation = "<<quat<<", expected quat = (0,0,0,1)"<<std::endl;
}

4
include/osg/Matrixd
View File

@@ -322,8 +322,8 @@ class OSG_EXPORT Matrixd
inline Vec4d operator* ( const Vec4d& v ) const;
#ifdef USE_DEPRECATED_API
inline void set(const Quat& q) { makeRotate(q); }
inline void get(Quat& q) const { q = getRotate(); }
inline void set(const Quat& q) { makeRotate(q); } /// deprecated, replace with makeRotate(q)
inline void get(Quat& q) const { q = getRotate(); } /// deprecated, replace with getRotate()
#endif
void setRotate(const Quat& q);