Commit f4fac0c4 authored by Sauvage's avatar Sauvage

Merge remote-tracking branch 'CGoGNcentral/develop' into develop

Conflicts:
	CGoGN/include/Utils/sphericalHarmonics.hpp
parents 9ce3d307 413a821f

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
CMakeLists.txt.user CMakeLists.txt.user
bin/ bin/
ThirdParty/bin/ ThirdParty/bin/
SCHNApps/bin SCHNApps/bin/
\ No newline at end of file windows_dependencies/
...@@ -2,26 +2,6 @@ cmake_minimum_required(VERSION 2.8) ...@@ -2,26 +2,6 @@ cmake_minimum_required(VERSION 2.8)
project(benches) project(benches)
#SET(CMAKE_BUILD_TYPE Release)
#SET(CMAKE_BUILD_TYPE Debug)
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
# define includes path
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CGoGN_ROOT_DIR}/include
${CGoGN_EXT_INCLUDES}
)
# define libs path
#IF(WIN32)
# link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS} )
#ELSE(WIN32)
# link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
#ENDIF(WIN32)
add_executable(bench_trav bench_trav.cpp ) add_executable(bench_trav bench_trav.cpp )
target_link_libraries( bench_trav ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ) target_link_libraries( bench_trav ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
......
...@@ -72,7 +72,7 @@ int main(int argc, char **argv) ...@@ -72,7 +72,7 @@ int main(int argc, char **argv)
std::vector<VertexAttribute<typename PFP::VEC3, MAP> > attr; std::vector<VertexAttribute<typename PFP::VEC3, MAP> > attr;
attr.push_back(position); attr.push_back(position);
Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices * 0.05) ; Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices /20) ;
VertexAttribute<PFP::VEC3, MAP> normal = myMap.addAttribute<PFP::VEC3,VERTEX,MAP>( "normal") ; VertexAttribute<PFP::VEC3, MAP> normal = myMap.addAttribute<PFP::VEC3,VERTEX,MAP>( "normal") ;
VertexAttribute<PFP::VEC3, MAP> position2 = myMap.addAttribute<PFP::VEC3,VERTEX,MAP>( "pos2") ; VertexAttribute<PFP::VEC3, MAP> position2 = myMap.addAttribute<PFP::VEC3,VERTEX,MAP>( "pos2") ;
......
...@@ -54,19 +54,19 @@ int main(int argc, char **argv) ...@@ -54,19 +54,19 @@ int main(int argc, char **argv)
std::vector<VertexAttribute<typename PFP::VEC3, MAP> > attr; std::vector<VertexAttribute<typename PFP::VEC3, MAP> > attr;
attr.push_back(position); attr.push_back(position);
Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices * 0.1) ; Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices / 10) ;
Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ; Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ; Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
nbVertices = Algo::Topo::getNbOrbits<VERTEX>(myMap) ; nbVertices = Algo::Topo::getNbOrbits<VERTEX>(myMap) ;
Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices * 0.1) ; Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices / 10);
Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ; Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ; Algo::Surface::Modelisation::LoopSubdivision<PFP>(myMap, position) ;
nbVertices = Algo::Topo::getNbOrbits<VERTEX>(myMap) ; nbVertices = Algo::Topo::getNbOrbits<VERTEX>(myMap) ;
Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices * 0.1) ; Algo::Surface::Decimation::decimate<PFP>(myMap, Algo::Surface::Decimation::S_QEM, Algo::Surface::Decimation::A_QEM, attr, nbVertices / 10);
Algo::Surface::Modelisation::CatmullClarkSubdivision<PFP>(myMap, position) ; Algo::Surface::Modelisation::CatmullClarkSubdivision<PFP>(myMap, position) ;
Algo::Surface::Modelisation::CatmullClarkSubdivision<PFP>(myMap, position) ; Algo::Surface::Modelisation::CatmullClarkSubdivision<PFP>(myMap, position) ;
......
...@@ -81,9 +81,11 @@ int main() ...@@ -81,9 +81,11 @@ int main()
}); });
centerFace /=nbVert; centerFace /=nbVert;
centerVol += centerFace; centerVol += centerFace;
nbFaces++;
}); });
centerVol /= nbFaces; centerVol /= nbFaces;
centerMesh += centerVol; centerMesh += centerVol;
nbVols++;
}); });
centerMesh /= nbVols; centerMesh /= nbVols;
CGoGNout<< "Traverse with foreach in " << ch.elapsed()<< " ms"<< CGoGNendl; CGoGNout<< "Traverse with foreach in " << ch.elapsed()<< " ms"<< CGoGNendl;
...@@ -110,9 +112,11 @@ int main() ...@@ -110,9 +112,11 @@ int main()
} }
centerFace /=nbVert; centerFace /=nbVert;
centerVol += centerFace; centerVol += centerFace;
nbFaces++;
} }
centerVol /= nbFaces; centerVol /= nbFaces;
centerMesh += centerVol; centerMesh += centerVol;
nbVols++;
} }
CGoGNout<< "Traverse with traversor in " << ch.elapsed()<< " ms"<< CGoGNendl; CGoGNout<< "Traverse with traversor in " << ch.elapsed()<< " ms"<< CGoGNendl;
......
IF (ONELIB) project(Apps)
IF (CGoGN_ONELIB)
SET(CGoGN_LIBS cgogn) SET(CGoGN_LIBS cgogn)
ELSE (ONELIB) ELSE ()
SET(CGoGN_LIBS algo topology container utils) SET(CGoGN_LIBS algo) # topology container utils include by dependencies
ENDIF (ONELIB) ENDIF ()
IF (WIN32) IF (WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/${ConfigurationName} ${Boost_LIBRARY_DIRS}) link_directories( ${CGoGN_ROOT_DIR}/windows_dependencies/lib/)
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual IF((CGoGN_WITH_QTCREATOR))
link_directories( ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE})
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE}) # Release/Debug added automatically by visual
ELSE()
link_directories( ${CGoGN_ROOT_DIR}/bin/$(ConfigurationName))
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/) # Release/Debug added automatically by visual
ENDIF()
ELSE() ELSE()
link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} ) link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE} ) IF(APPLE)
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE}/Contents/MacOS/ )
ELSE()
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE} )
ENDIF()
ENDIF() ENDIF()
include_directories( #include_directories(
${CGoGN_ROOT_DIR}/include # ${CGoGN_ROOT_DIR}/include
${CGoGN_EXT_INCLUDES}) # ${CGoGN_EXT_INCLUDES})
IF (COMPILE_SANDBOX) IF (CGoGN_COMPILE_SANDBOX)
add_subdirectory(SandBox) add_subdirectory(SandBox)
ENDIF() ENDIF()
IF (COMPILE_EXAMPLES AND WITH_QT) IF (CGoGN_COMPILE_EXAMPLES AND CGoGN_WITH_QT)
add_subdirectory(Examples) add_subdirectory(Examples)
ENDIF() ENDIF()
IF (COMPILE_TUTOS) IF (CGoGN_COMPILE_TUTOS)
add_subdirectory(Tuto) add_subdirectory(Tuto)
ENDIF() ENDIF()
IF (COMPILE_BENCHES) IF (CGoGN_COMPILE_BENCHES)
add_subdirectory(Benches) add_subdirectory(Benches)
ENDIF() ENDIF()
IF (COMPILE_TESTS) IF (CGoGN_COMPILE_TESTS)
add_subdirectory(Tests) add_subdirectory(Tests)
ENDIF() ENDIF()
#IF (WITH_QT)
# add_subdirectory(Tuto)
# add_subdirectory(Examples)
# IF (NOT DONOT_COMPILE_SANDBOX)
# add_subdirectory(SandBox)
# ENDIF (NOT DONOT_COMPILE_SANDBOX)
#ENDIF (WITH_QT)