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

Added ndim namespace to generic Matrix

This commit is contained in:
Paolo Cignoni 2006-01-03 15:29:49 +00:00
parent 36e37b0a6c
commit 9f49fb189a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vcg/complex/trimesh/create/extended_marching_cubes.h
View File

@ -334,7 +334,7 @@ namespace vcg
rank = (c > cos(_featureAngle) ? 2 : 3); rank = (c > cos(_featureAngle) ? 2 : 3);
// setup linear system (find intersection of tangent planes) // setup linear system (find intersection of tangent planes)
vcg::Matrix<double> A((unsigned int) vertices_num, 3); vcg::ndim::Matrix<double> A((unsigned int) vertices_num, 3);
double *b = new double[ vertices_num ]; double *b = new double[ vertices_num ];
for (i=0; i<vertices_num; ++i) for (i=0; i<vertices_num; ++i)
{ {
@ -345,9 +345,9 @@ namespace vcg
} }
// SVD of matrix A // SVD of matrix A
vcg::Matrix<double> V(3, 3); vcg::ndim::Matrix<double> V(3, 3);
double *w = new double[vertices_num]; double *w = new double[vertices_num];
vcg::SingularValueDecomposition< vcg::Matrix<double> >(A, w, V, 100); vcg::SingularValueDecomposition< vcg::ndim::Matrix<double> >(A, w, V, 100);
// rank == 2 -> suppress smallest singular value // rank == 2 -> suppress smallest singular value
if (rank == 2) if (rank == 2)
@ -369,7 +369,7 @@ namespace vcg
// SVD backsubstitution -> least squares, least norm solution x // SVD backsubstitution -> least squares, least norm solution x
double *x = new double[3]; double *x = new double[3];
vcg::SingularValueBacksubstitution< vcg::Matrix<double> >(A, w, V, x, b); vcg::SingularValueBacksubstitution< vcg::ndim::Matrix<double> >(A, w, V, x, b);
// transform x to world coords // transform x to world coords
CoordType point((ScalarType) x[0], (ScalarType) x[1], (ScalarType) x[2]); CoordType point((ScalarType) x[0], (ScalarType) x[1], (ScalarType) x[2]);