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

Added Matrix*::getRotate()/setRotate(Quat), deprecating Matrix*::get(Quat&), Matrix*::set(Quat&)

Browse Source
This commit is contained in:
Robert Osfield
2006-07-31 17:31:21 +00:00
parent 28cf404a25
commit 564ee34f76
20 changed files with 99 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/osg/Matrixd
View File

@@ -34,7 +34,7 @@ class OSG_EXPORT Matrixd
Matrixd( const Matrixf& mat );
inline explicit Matrixd( float const * const ptr ) { set(ptr); }
inline explicit Matrixd( double const * const ptr ) { set(ptr); }
inline explicit Matrixd( const Quat& quat ) { set(quat); }
inline explicit Matrixd( const Quat& quat ) { makeRotate(quat); }
Matrixd(value_type a00, value_type a01, value_type a02, value_type a03,
value_type a10, value_type a11, value_type a12, value_type a13,
@@ -88,10 +88,6 @@ class OSG_EXPORT Matrixd
value_type a20, value_type a21, value_type a22,value_type a23,
value_type a30, value_type a31, value_type a32,value_type a33);
void set(const Quat& q);
void get(Quat& q) const;
value_type * ptr() { return (value_type*)_mat; }
const value_type * ptr() const { return (const value_type *)_mat; }
@@ -289,6 +285,14 @@ class OSG_EXPORT Matrixd
inline Vec4f operator* ( const Vec4f& v ) const;
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(); }
#endif
void setRotate(const Quat& q);
Quat getRotate() const;
void setTrans( value_type tx, value_type ty, value_type tz );
void setTrans( const Vec3f& v );
void setTrans( const Vec3d& v );