From 6144181d48a3682da3753008e912dca1c827a85e Mon Sep 17 00:00:00 2001
From: Kenneth Vanhoey <kenneth.vanhoey@unistra.fr>
Date: Thu, 24 Jan 2013 13:45:51 +0100
Subject: [PATCH] merge commit

---
 include/Algo/Decimation/halfEdgeSelector.h   |  4 ++--
 include/Algo/Decimation/halfEdgeSelector.hpp | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/include/Algo/Decimation/halfEdgeSelector.h b/include/Algo/Decimation/halfEdgeSelector.h
index cfdc6b76..b6a9bb75 100644
--- a/include/Algo/Decimation/halfEdgeSelector.h
+++ b/include/Algo/Decimation/halfEdgeSelector.h
@@ -463,9 +463,9 @@ public:
 				(*errors)[d] = halfEdgeInfo[d].it->first ;
 			}
 			Dart dd = this->m_map.phi2(d) ;
-			if (halfEdgeInfo[dd].valid && halfEdgeInfo[dd].it->first < (*errors)[d])
+			if (halfEdgeInfo[dd].valid && halfEdgeInfo[dd].it->first > (*errors)[d])
 			{
-				(*errors)[d] = halfEdgeInfo[dd].it->first ;
+				(*errors)[dd] = halfEdgeInfo[dd].it->first ;
 			}
 			//m_avgColor[d] = VEC3(m_visualImportance[d]/6.,m_visualImportance[d]/6.,m_visualImportance[d]/6.) ;
 		}
diff --git a/include/Algo/Decimation/halfEdgeSelector.hpp b/include/Algo/Decimation/halfEdgeSelector.hpp
index c4a0fc38..97d83825 100644
--- a/include/Algo/Decimation/halfEdgeSelector.hpp
+++ b/include/Algo/Decimation/halfEdgeSelector.hpp
@@ -293,7 +293,6 @@ bool HalfEdgeSelector_QEMextColor<PFP>::init()
 	{
 		assert(this->m_approximators[approxindex]->getType() == A_hQEM
 				|| this->m_approximators[approxindex]->getType() == A_hHalfCollapse
-				|| this->m_approximators[approxindex]->getType() != A_Lightfield
 				|| !"Approximator for selector (HalfEdgeSelector_QEMextColor) must be of a half-edge approximator") ;
 
 		bool saved = false ;
@@ -1670,9 +1669,9 @@ void HalfEdgeSelector_LightfieldKCL<PFP>::computeHalfEdgeInfo(Dart d, HalfEdgeIn
 	// New position
 	const VEC3& newPos = (this->m_approx[m_approxindex_pos]->getAttr(m_attrindex_pos))[d] ; // get newPos
 
-	const REAL geomErr = quadGeom(newPos) ;
-	const REAL visualI = m_visualImportance[dd] ;
-	const REAL lferr = computeLightfieldError(d) ;
+	const REAL& geomErr = quadGeom(newPos) ;
+	const REAL& visualI = m_visualImportance[dd] ;
+	const REAL& lferr = computeLightfieldError(d) ;
 
 	//std::cout << lferr/geomErr << std::endl ;
 	const REAL& err =
@@ -1699,8 +1698,19 @@ typename PFP::REAL HalfEdgeSelector_LightfieldKCL<PFP>::computeLightfieldError(D
 {
 	Dart v1 = this->m_map.phi1(v0) ;
 
-	//return computeSquaredLightfieldDifference(v0,v1) ;
 	REAL err = 0 ;
+	/*Traversor2VVaE<MAP> tv0(this->m_map,v0) ; // all vertices surrounding vertex v0
+	for (Dart vi = tv0.begin() ; vi != tv0.end() ; vi = tv0.next())
+	{
+		if (vi != v1)
+		{
+			err += computeSquaredLightfieldDifference(v1,vi) ;
+		}
+	}
+	return err ;
+*/
+
+	// return computeSquaredLightfieldDifference(v0,v1) ;
 	Traversor2VVaE<MAP> tv(this->m_map,v1) ; // all vertices surrounding vertex v0
 	for (Dart vi = tv.begin() ; vi != tv.end() ; vi = tv.next())
 	{
-- 
GitLab