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

Added ComputeSimilarityMatchMatrix (and removed useless printout...)

This commit is contained in:
Paolo Cignoni 2012-11-27 22:49:21 +00:00
parent eb92432335
commit dc44ff8265
1 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
vcg/space/point_matching.h
View File

@ -118,8 +118,8 @@ void ComputeRigidMatchMatrix(std::vector<Point3<S> > &Pfix,
Eigen::SelfAdjointEigenSolver<Eigen::Matrix4d> eig(QQ); Eigen::SelfAdjointEigenSolver<Eigen::Matrix4d> eig(QQ);
Eigen::Vector4d eval = eig.eigenvalues(); Eigen::Vector4d eval = eig.eigenvalues();
Eigen::Matrix4d evec = eig.eigenvectors(); Eigen::Matrix4d evec = eig.eigenvectors();
std::cout << "EigenVectors:" << std::endl << evec << std::endl; // std::cout << "EigenVectors:" << std::endl << evec << std::endl;
std::cout << "eigenvalues:" << std::endl << eval << std::endl; // std::cout << "Eigenvalues:" << std::endl << eval << std::endl;
int ind; int ind;
eval.cwiseAbs().maxCoeff(&ind); eval.cwiseAbs().maxCoeff(&ind);
@ -143,10 +143,10 @@ void ComputeRigidMatchMatrix(std::vector<Point3<S> > &Pfix,
* IEEE TPAMI Vol 14, No 2 1992 * IEEE TPAMI Vol 14, No 2 1992
*/ */
template < class S > template < class S >
void ComputeRigidMatchMatrix(std::vector<Point3<S> > &Pfix, void ComputeRigidMatchMatrix(std::vector<Point3<S> > &Pfix,
std::vector<Point3<S> > &Pmov, std::vector<Point3<S> > &Pmov,
Matrix44<S> &res) Matrix44<S> &res)
{ {
Quaternion<S> q; Quaternion<S> q;
Point3<S> tr; Point3<S> tr;
@ -162,44 +162,32 @@ void ComputeRigidMatchMatrix(std::vector<Point3<S> > &Pfix,
} }
#if 0
/* /*
Compute a similarity matching (rigid + uniform scaling) Compute a similarity matching (rigid + uniform scaling)
simply create a temporary point set with the correct scaling factor simply create a temporary point set with the correct scaling factor
*/ */
static bool ComputeSimilarityMatchMatrix( Matrix44x &res, template <class S>
std::vector<Point3x> &Pfix, // vertici corrispondenti su fix (rossi) void ComputeSimilarityMatchMatrix(std::vector<Point3<S> > &Pfix,
std::vector<Point3x> &Pmov) // normali scelti su mov (verdi) std::vector<Point3<S> > &Pmov,
Matrix44<S> &res)
{ {
Quaternionx qtmp; S scalingFactor=0;
Point3x tr; for(size_t i=0;i<( Pmov.size()-1);++i)
{
std::vector<Point3x> Pnew(Pmov.size()); scalingFactor += Distance(Pmov[i],Pmov[i+1])/ Distance(Pfix[i],Pfix[i+1]);
}
ScalarType scalingFactor=0; scalingFactor/=(Pmov.size()-1);
for(size_t i=0;i<( Pmov.size()-1);++i)
{
scalingFactor += Distance(Pmov[i],Pmov[i+1])/ Distance(Pfix[i],Pfix[i+1]);
#ifdef _DEBUG
printf("Scaling Factor is %f",scalingFactor/(i+1));
#endif
}
scalingFactor/=(Pmov.size()-1);
for(size_t i=0;i<Pmov.size();++i) std::vector<Point3<S> > Pnew(Pmov.size());
Pnew[i]=Pmov[i]/scalingFactor; for(size_t i=0;i<Pmov.size();++i)
Pnew[i]=Pmov[i]/scalingFactor;
bool ret=ComputeRigidMatchMatrix(res,Pfix,Pnew,qtmp,tr); ComputeRigidMatchMatrix(Pfix,Pnew,res);
if(!ret) return false;
Matrix44x scaleM; scaleM.SetDiagonal(1.0/scalingFactor); Matrix44<S> scaleM; scaleM.SetDiagonal(1.0/scalingFactor);
res = res * scaleM;
res = res * scaleM;
return true;
} }
#endif
} // end namespace } // end namespace
#endif #endif