correct apps_cmake.txt

apps_cmake.txt

@@ -72,11 +72,8 @@ ENDIF (WITH_QT)
 
 IF (WITH_NUMERICAL)
 	add_definitions(-DWITH_NUMERICAL)
-#	SET (NUMERICAL_INCLUDES  ${CGoGN_ROOT_DIR}/ThirdParty/Numerical ${CGoGN_ROOT_DIR}/ThirdParty/Numerical/UFconfig)
-#	SET (NUMERICAL_LIBS f2c  blas  numerical lapack)
-
 	SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${CGoGN_ROOT_DIR}/ThirdParty/Numerical ${CGoGN_ROOT_DIR}/ThirdParty/Numerical/UFconfig)
-	SET (COMMON_LIBS ${COMMON_LIBS} f2c  blas  numerical lapack)
+	SET (COMMON_LIBS ${COMMON_LIBS} numerical lapack blas f2c)
 ENDIF (WITH_NUMERICAL)
 
 
@@ -102,5 +99,3 @@ SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
 
 SET(CGoGN_LIBS_D topologyD algoD containerD utilsD)
 SET(CGoGN_LIBS_R topology algo container utils)
-
-

include/Algo/Decimation/lightfieldApproximator.hpp

@@ -53,7 +53,7 @@ bool Approximator_RGBfunctionsHalf<PFP>::init()
 	m_approxFrame = this->m_map.template getAttribute<MATRIX33>(EDGE, "approx_frame") ;
 	m_quadricRGBfunctions = this->m_map.template getAttribute<QuadricRGBfunctions<REAL> >(EDGE, "quadricRGBfunctions") ;
 
-	MapBrowserLinkedAuto<typename PFP::MAP> mb(this->m_map) ;
+	MapBrowserLinked<typename PFP::MAP> mb(this->m_map) ;
 	this->m_map.foreach_orbit(EDGE, mb) ;
 
 	// create quadric embedding for computing and set them to 0
@@ -196,7 +196,7 @@ bool Approximator_RGBfunctions<PFP>::init()
 	m_approxFrame = this->m_map.template getAttribute<MATRIX33>(EDGE, "approx_frame") ;
 	m_quadricRGBfunctions = this->m_map.template getAttribute<QuadricRGBfunctions<REAL> >(EDGE, "quadricRGBfunctions") ;
 
-	MapBrowserLinkedAuto<typename PFP::MAP> mb(this->m_map) ;
+	MapBrowserLinked<typename PFP::MAP> mb(this->m_map) ;
 	this->m_map.foreach_orbit(EDGE, mb) ;
 
 	// create quadric embedding for computing and set them to 0

include/Algo/Export/export.h

@@ -90,12 +90,6 @@ bool exportPlyPTMgeneric(typename PFP::MAP& map, const char* filename, const typ
 template <typename PFP>
 bool exportPLYPTM(typename PFP::MAP& map, const char* filename, const typename PFP::TVEC3& position, const typename PFP::TVEC3 frame[3], const typename PFP::TVEC3 colorPTM[6], const FunctorSelect& good) ;
 
-/**
- *  export pout l'InESS
- */
-template <typename PFP>
-bool exportInESS(typename PFP::MAP& map, const char *filename, const typename PFP::TVEC3& position);
-
 } // namespace Export
 
 } // namespace Algo

include/Algo/Export/export.hpp

@@ -434,20 +434,6 @@ bool exportPLYPTM(typename PFP::MAP& map, const char* filename, const typename P
 	return true ;
 }
 
-template <typename PFP>
-bool exportInESS(typename PFP::MAP& map, const char *filename, const typename PFP::TVEC3& position)
-{
-	typedef typename PFP::MAP MAP;
-	typedef typename PFP::VEC3 VEC3;
-
-	std::ofstream out(filename, std::ios::out) ;
-	if (!out.good())
-	{
-		CGoGNerr << "Unable to open file " << CGoGNendl ;
-		return false ;
-	}
-}
-
 } // namespace Export
 
 } // namespace Algo

include/Algo/Filtering/bilateral.h

@@ -69,6 +69,9 @@ void filterBilateral(typename PFP::MAP& map, const typename PFP::TVEC3& position
 	{
 		if(!map.isBoundaryVertex(d))
 		{
+			// get normal of vertex
+			const VEC3& normal_d = normal[d] ;
+
 			// traversal of incident edges
 			float sum = 0.0f, normalizer = 0.0f ;
 			Traversor2VE<typename PFP::MAP> te(map, d) ;
@@ -82,7 +85,7 @@ void filterBilateral(typename PFP::MAP& map, const typename PFP::TVEC3& position
 				normalizer += wcs ;
 			}
 
-			position2[d] = position[d] + ((sum / normalizer) * normal[d]) ;
+			position2[d] = position[d] + ((sum / normalizer) * normal_d) ;
 		}
 		else
 			position2[d] = position[d] ;

include/Algo/Geometry/normalization.h

@@ -43,7 +43,7 @@ typename PFP::REAL normalizeLength(typename PFP::MAP & the_map, typename PFP::TV
 	typename PFP::REAL sum = 0 ;
 	int count = 0 ;
 
-	MapBrowserLinkedAuto<typename PFP::MAP> mb(the_map) ;
+	MapBrowserLinked<typename PFP::MAP> mb(the_map) ;
 	the_map.foreach_orbit(m_attr.getOrbit(), mb) ;
 
 	for (Dart d = mb.begin(); d != mb.end(); mb.next(d))

include/Topology/generic/mapBrowser.h

@@ -74,7 +74,7 @@ public:
  * a foreach_cell which adds darts in the list
  */
 template <typename MAP>
-class MapBrowserLinked: public MapBrowser, public FunctorType
+class MapBrowserLinked : public MapBrowser, public FunctorType
 {
 protected:
 	// The browsed map
@@ -181,6 +181,6 @@ public:
 	}
 } ;
 
-} // end namespace CGoGN
+} // namespace CGoGN
 
 #endif /* MAPBROWSER_H_ */