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

Small changes in the long long way to making meshlab and the vcglib really float/double independent

This commit is contained in:
Paolo Cignoni 2014-06-18 17:30:02 +00:00
parent e768943f3e
commit 4fbbfe4f86
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric_tex.h
View File

@ -8,7 +8,7 @@
* \ * * \ *
* All rights reserved. * * All rights reserved. *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
@ -340,7 +340,7 @@ class TriEdgeCollapseQuadricTex: public vcg::tri::TriEdgeCollapse< TriMeshType,
qt= QualityFace(*x.F()); qt= QualityFace(*x.F());
if(qt<MinQual) MinQual=qt; if(qt<MinQual) MinQual=qt;
if(pp->NormalCheck){ if(pp->NormalCheck){
Point3f nn=NormalizedNormal(*x.F()); CoordType nn=NormalizedNormal(*x.F());
ndiff=nn.dot(x.F()->N()) / x.F()->N().Norm(); ndiff=nn.dot(x.F()->N()) / x.F()->N().Norm();
if(ndiff<MinCos) MinCos=ndiff; if(ndiff<MinCos) MinCos=ndiff;
assert(!math::IsNAN(ndiff)); assert(!math::IsNAN(ndiff));
@ -352,7 +352,7 @@ class TriEdgeCollapseQuadricTex: public vcg::tri::TriEdgeCollapse< TriMeshType,
qt= QualityFace(*x.F()); qt= QualityFace(*x.F());
if(qt<MinQual) MinQual=qt; if(qt<MinQual) MinQual=qt;
if(pp->NormalCheck){ if(pp->NormalCheck){
Point3f nn=NormalizedNormal(*x.F()); CoordType nn=NormalizedNormal(*x.F());
ndiff=nn.dot(x.F()->N() / x.F()->N().Norm()); ndiff=nn.dot(x.F()->N() / x.F()->N().Norm());
if(ndiff<MinCos) MinCos=ndiff; if(ndiff<MinCos) MinCos=ndiff;
assert(!math::IsNAN(ndiff)); assert(!math::IsNAN(ndiff));
@ -459,7 +459,7 @@ class TriEdgeCollapseQuadricTex: public vcg::tri::TriEdgeCollapse< TriMeshType,
} }
this->_priority = std::max(priority1, priority2)*(1 + (pp->ExtraTCoordWeight)*(QH::Vd(this->pos.V(0)).size()+QH::Vd(this->pos.V(1)).size() - 2)); this->_priority = std::max(priority1, priority2)*(1 + (pp->ExtraTCoordWeight)*(QH::Vd(this->pos.V(0)).size()+QH::Vd(this->pos.V(1)).size() - 2));
return this->_priority; return this->_priority;
} }
@ -797,5 +797,5 @@ class TriEdgeCollapseQuadricTex: public vcg::tri::TriEdgeCollapse< TriMeshType,
} // namespace tri } // namespace tri
} // namespace vcg } // namespace vcg
#endif #endif