manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed bug in FromMatrix

This commit is contained in:
Federico Ponchio 2008-02-21 10:57:59 +00:00
parent 652f27f40f
commit a32c8842ef
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vcg/math/similarity.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.13 2008/02/21 10:30:18 benedetti
corrected bug in FromMatrix
Revision 1.12 2007/02/05 14:17:48 corsini Revision 1.12 2007/02/05 14:17:48 corsini
add new ctor (build similarity from euler angles) add new ctor (build similarity from euler angles)
@ -45,6 +48,9 @@ unified to the gl stlyle matix*vector. removed vector*matrix operator
Revision 1.6 2004/03/25 14:57:49 ponchio Revision 1.6 2004/03/25 14:57:49 ponchio
Microerror. ($LOG$ -> $Log: not supported by cvs2svn $ Microerror. ($LOG$ -> $Log: not supported by cvs2svn $
Microerror. ($LOG$ -> Revision 1.13 2008/02/21 10:30:18 benedetti
Microerror. ($LOG$ -> corrected bug in FromMatrix
Microerror. ($LOG$ ->
Microerror. ($LOG$ -> Revision 1.12 2007/02/05 14:17:48 corsini Microerror. ($LOG$ -> Revision 1.12 2007/02/05 14:17:48 corsini
Microerror. ($LOG$ -> add new ctor (build similarity from euler angles) Microerror. ($LOG$ -> add new ctor (build similarity from euler angles)
Microerror. ($LOG$ -> Microerror. ($LOG$ ->
@ -176,13 +182,14 @@ template <class S,class RotationType> Matrix44<S> Similarity<S,RotationType>::In
template <class S,class RotationType> void Similarity<S,RotationType>::FromMatrix(const Matrix44<S> &m) { template <class S,class RotationType> void Similarity<S,RotationType>::FromMatrix(const Matrix44<S> &m) {
tra[0] = m.ElementAt(3, 0);
tra[1] = m.ElementAt(3, 1);
tra[2] = m.ElementAt(3, 2);
sca = (S)pow(m.Determinant(), 1/3); sca = (S)pow(m.Determinant(), 1/3);
assert(sca != 0); assert(sca != 0);
Matrix44<S> t = m * Matrix44<S>().SetScale(1/sca, 1/sca, 1/sca); Matrix44<S> t = m * Matrix44<S>().SetScale(1/sca, 1/sca, 1/sca);
rot.FromMatrix(t); rot.FromMatrix(t);
tra[0] = t.ElementAt(0, 3);
tra[1] = t.ElementAt(1, 3);
tra[2] = t.ElementAt(2, 3);
} }
template <class S,class RotationType> Similarity<S,RotationType> &Invert(Similarity<S,RotationType> &a) { template <class S,class RotationType> Similarity<S,RotationType> &Invert(Similarity<S,RotationType> &a) {