| cqrlib.h | cqrlib.h | |||
|---|---|---|---|---|
| skipping to change at line 932 | skipping to change at line 932 | |||
| } | } | |||
| /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++++++++++++*/ | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++++++++++++*/ | |||
| /* HLERPDist -- Hemispherical Linear Interpolation distance | /* HLERPDist -- Hemispherical Linear Interpolation distance | |||
| Form the distance between two quaternions by summing | Form the distance between two quaternions by summing | |||
| the difference in the magnitude of the radii and | the difference in the magnitude of the radii and | |||
| the great circle distance along the sphere of the | the great circle distance along the sphere of the | |||
| smaller quaternion. | smaller quaternion. | |||
| This version keeps a quaternion separate from the negative | ||||
| of the same quaternion and is not appropriate for | ||||
| quaternions representing rotations. Use CQRHLERPDist | ||||
| to apply SLERPDist to quaternions representing rotations | ||||
| */ | */ | |||
| /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++++++++++++*/ | /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++++++++++++*/ | |||
| inline DistanceType HLERPDist (const CPPQR& q) const | inline DistanceType HLERPDist (const CPPQR& q) const | |||
| { | { | |||
| CPPQR s1; | CPPQR s1; | |||
| CPPQR s2; | CPPQR s2; | |||
| CPPQR st1; | CPPQR st1; | |||
| CPPQR st2; | CPPQR st2; | |||
| CPPQR sout; | CPPQR sout; | |||
| skipping to change at line 1133 | skipping to change at line 1129 | |||
| /* CQRConjugate -- Form the conjugate of a quaternion qconj */ | /* CQRConjugate -- Form the conjugate of a quaternion qconj */ | |||
| int CQRConjugate (CQRQuaternionHandle qconjgate, CQRQuaternionHandle qu aternion); | int CQRConjugate (CQRQuaternionHandle qconjgate, CQRQuaternionHandle qu aternion); | |||
| /* CQRNormsq -- Form the normsquared of a quaternion */ | /* CQRNormsq -- Form the normsquared of a quaternion */ | |||
| int CQRNormsq (double CQR_FAR * normsq, CQRQuaternionHandle quaternion ) ; | int CQRNormsq (double CQR_FAR * normsq, CQRQuaternionHandle quaternion ) ; | |||
| /* CQRNorm -- Form the norm of a quaternion */ | /* CQRNorm -- Form the norm of a quaternion */ | |||
| int CQRNormsq (double CQR_FAR * norm, CQRQuaternionHandle quaternion ) ; | int CQRNorm (double CQR_FAR * norm, CQRQuaternionHandle quaternion ) ; | |||
| /* CQRInverse -- Form the inverse of a quaternion */ | /* CQRInverse -- Form the inverse of a quaternion */ | |||
| int CQRInverse (CQRQuaternionHandle inversequaternion, CQRQuaternionHan dle quaternion ); | int CQRInverse (CQRQuaternionHandle inversequaternion, CQRQuaternionHan dle quaternion ); | |||
| /* CQRRotateByQuaternion -- Rotate a vector by a Quaternion, w = qvq* * / | /* CQRRotateByQuaternion -- Rotate a vector by a Quaternion, w = qvq* * / | |||
| int CQRRotateByQuaternion(double CQR_FAR * w, CQRQuaternionHandle rotqu aternion, double CQR_FAR * v); | int CQRRotateByQuaternion(double CQR_FAR * w, CQRQuaternionHandle rotqu aternion, double CQR_FAR * v); | |||
| /* CQRAxis2Quaternion -- Form the quaternion for a rotation around axis v by angle theta */ | /* CQRAxis2Quaternion -- Form the quaternion for a rotation around axis v by angle theta */ | |||
| skipping to change at line 1221 | skipping to change at line 1217 | |||
| the difference in the magnitude of the radii and | the difference in the magnitude of the radii and | |||
| the great circle distance along the sphere of the | the great circle distance along the sphere of the | |||
| smaller quaternion. | smaller quaternion. | |||
| This version keeps a quaternion separate from the negative | This version keeps a quaternion separate from the negative | |||
| of the same quaternion and is not appropriate for | of the same quaternion and is not appropriate for | |||
| quaternions representing rotations. Use CQRHLERPDist | quaternions representing rotations. Use CQRHLERPDist | |||
| to apply SLERPDist to quaternions representing rotations | to apply SLERPDist to quaternions representing rotations | |||
| */ | */ | |||
| int HLERPDist (double CQR_FAR * dist, const CQRQuaternionHandle q1, con st CQRQuaternionHandle q2); | int CQRHLERPDist (double CQR_FAR * dist, const CQRQuaternionHandle q1, const CQRQuaternionHandle q2); | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| } | } | |||
| #endif | #endif | |||
| #endif | #endif | |||
| #endif | #endif | |||
| End of changes. 3 change blocks. | ||||
| 6 lines changed or deleted | 2 lines changed or added | |||