Commit 2112a0e2 authored by Sauvage's avatar Sauvage

Merge branch 'develop' of icube-forge.unistra.fr:sauvage/cgogn into develop

parents 60996323 6d660a62
...@@ -132,13 +132,6 @@ ENDIF() ...@@ -132,13 +132,6 @@ ENDIF()
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName} ${Boost_LIBRARY_DIRS})
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual
ELSE ()
link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
ENDIF ()
IF(NOT CMAKE_BUILD_TYPE) IF(NOT CMAKE_BUILD_TYPE)
IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug|(.*)debug") IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug|(.*)debug")
...@@ -147,3 +140,11 @@ IF(NOT CMAKE_BUILD_TYPE) ...@@ -147,3 +140,11 @@ IF(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName} ${Boost_LIBRARY_DIRS})
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual
ELSE ()
link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
ENDIF ()
...@@ -148,7 +148,7 @@ void vertexQuadraticFitting( ...@@ -148,7 +148,7 @@ void vertexQuadraticFitting(
nlBegin(NL_MATRIX) ; nlBegin(NL_MATRIX) ;
foreach_adjacent2<EDGE>(map, v, [&] (Vertex it) { foreach_adjacent2<EDGE>(map, v, [&] (Vertex it) {
typename PFP::VEC3 itp = position[it] ; typename PFP::VEC3 itp = position[it] ;
quadraticFittingAddVertexPos<PFP>(v, itp, localFrame) ; // quadraticFittingAddVertexPos<PFP>(v, itp, localFrame) ;
typename PFP::VEC3 itn = normal[it] ; typename PFP::VEC3 itn = normal[it] ;
quadraticFittingAddVertexNormal<PFP>(itp, itn, p, localFrame) ; quadraticFittingAddVertexNormal<PFP>(itp, itn, p, localFrame) ;
}); });
...@@ -711,7 +711,7 @@ void computeCurvatureVertices_QuadraticFitting( ...@@ -711,7 +711,7 @@ void computeCurvatureVertices_QuadraticFitting(
{ {
CGoGN::Parallel::foreach_cell<VERTEX>(map, [&] (Vertex v, unsigned int threadID) CGoGN::Parallel::foreach_cell<VERTEX>(map, [&] (Vertex v, unsigned int threadID)
{ {
computeCurvatureVertex_QuadraticFitting<PFP>(map, v, position, normal, kmax, kmin, Kmax, Kmin, threadID) ; computeCurvatureVertex_QuadraticFitting<PFP>(map, v, position, normal, kmax, kmin, Kmax, Kmin) ;
}, FORCE_CELL_MARKING); }, FORCE_CELL_MARKING);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment