Commit 48abaa0e authored by Mike Kremer's avatar Mike Kremer
Browse files

Adapted implementation... I'm sorry, it's late.

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13034 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 99ab2623
......@@ -806,11 +806,11 @@ bool
rotationOfTwoVectors( const VectorT<Scalar,3>& _v0,
const VectorT<Scalar,3>& _v1,
VectorT<Scalar,3>& _axis,
typename Scalar& _angle ) {
Scalar& _angle ) {
// Normalize axes
Vec v0 = _v0.normalize();
Vec v1 = _v1.normalize();
VectorT<Scalar,3> v0 = _v0.normalize();
VectorT<Scalar,3> v1 = _v1.normalize();
// Get rotation axis
_axis = (v0 % v1).normalize();
......
......@@ -128,7 +128,7 @@ bool
rotationOfTwoVectors( const VectorT<Scalar,3>& _v0,
const VectorT<Scalar,3>& _v1,
VectorT<Scalar,3>& _axis,
typename Scalar& _angle );
Scalar& _angle );
/** \brief Get determinant of matrix [_v1, _v2, _v3]
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment