From 4fbbfe4f86e168ac85fc4a5efe7264d543575567 Mon Sep 17 00:00:00 2001 From: cignoni Date: Wed, 18 Jun 2014 17:30:02 +0000 Subject: [PATCH] Small changes in the long long way to making meshlab and the vcglib really float/double independent --- .../local_optimization/tri_edge_collapse_quadric_tex.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric_tex.h b/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric_tex.h index 16fecfa0..f2d06f5a 100644 --- a/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric_tex.h +++ b/vcg/complex/algorithms/local_optimization/tri_edge_collapse_quadric_tex.h @@ -8,7 +8,7 @@ * \ * * 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 * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * @@ -340,7 +340,7 @@ class TriEdgeCollapseQuadricTex: public vcg::tri::TriEdgeCollapse< TriMeshType, qt= QualityFace(*x.F()); if(qtNormalCheck){ - Point3f nn=NormalizedNormal(*x.F()); + CoordType nn=NormalizedNormal(*x.F()); ndiff=nn.dot(x.F()->N()) / x.F()->N().Norm(); if(ndiffNormalCheck){ - Point3f nn=NormalizedNormal(*x.F()); + CoordType nn=NormalizedNormal(*x.F()); ndiff=nn.dot(x.F()->N() / x.F()->N().Norm()); if(ndiff_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; } @@ -797,5 +797,5 @@ class TriEdgeCollapseQuadricTex: public vcg::tri::TriEdgeCollapse< TriMeshType, } // namespace tri - } // namespace vcg + } // namespace vcg #endif