Skip to content

GitLab

Commit 6b963c6a authored by untereiner's avatar untereiner
Browse files

Merge cgogn:~kraemer/CGoGN + importTet OK + correct vector traversal 

Conflicts:
	Apps/Tuto/tuto5.cpp
	Apps/Tuto/tuto5.h
	include/Topology/map/map3.h
parents 749f6086 eeb7e0de
Hide whitespace changes
Inline Side-by-side
Apps/CMakeLists.txt
View file @ 6b963c6a
SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin)
#BOOST_LIBS(boost_regex_lib_lists "boost_regex-mt")
SET (COMMON_LIBS ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${GLEW_LIBRARY} ${DEVIL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBXML2_LIBRARIES} ${Boost_REGEX_LIBRARY} ${Boost_THREAD_LIBRARY} gzstream AntTweakBar openctm assimp)
# FOR Qt4
#SET(QT_USE_QTOPENGL TRUE)
#INCLUDE(${QT_USE_FILE})
#ADD_DEFINITIONS(${QT_DEFINITIONS})
SET(CGoGN_LIBS_R topology algo container utils)
IF(WIN32)
SET(CGoGN_LIBS_D topology algo container utils) # libs have same name but in different place in Visual
add_subdirectory(Examples/Release)
add_subdirectory(Tuto)
ELSE(WIN32)
SET(CGoGN_LIBS_D topologyD algoD containerD utilsD)
add_subdirectory(Examples/Release)
add_subdirectory(Examples/Debug)
add_subdirectory(Examples/Tests)
add_subdirectory(Tuto)
IF (WITH_QT)
add_subdirectory(Examples/Debug)
ENDIF (WITH_QT)
ENDIF(WIN32)
IF (WITH_QT)
add_subdirectory(Tuto)
add_subdirectory(Examples/Release)
ENDIF (WITH_QT)
add_subdirectory(Examples/Tests)
Apps/Examples/Debug/CMakeLists.txt
View file @ 6b963c6a
......@@ -4,36 +4,23 @@ project(examplesD)
SET(CMAKE_BUILD_TYPE Debug)
# FOR Qt4
FIND_PACKAGE(Qt4 REQUIRED)
SET(QT_USE_QTOPENGL TRUE)
INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS})
# define includes path
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
/usr/include/libxml2/
${CGoGN_ROOT_DIR}/include
${CGoGN_ROOT_DIR}/ThirdParty/Numerical
${CGoGN_ROOT_DIR}/ThirdParty/Numerical/UFconfig
${CGoGN_ROOT_DIR}/ThirdParty/gzstream
${CGoGN_ROOT_DIR}/ThirdParty/Zinri
${CGoGN_ROOT_DIR}/ThirdParty/AntTweakBar/include
${CGoGN_ROOT_DIR}/ThirdParty/OpenCTM
${CGoGN_ROOT_DIR}/ThirdParty/Assimp/include
${CGoGN_ROOT_DIR}/ThirdParty/glm
${CGoGN_EXT_INCLUDES}
)
# define libs path
link_directories(
${CGoGN_ROOT_DIR}/lib/Debug
${CGoGN_ROOT_DIR}/lib/Release
${Boost_LIBRARY_DIRS}
)
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) ${Boost_LIBRARY_DIRS})
link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
${Boost_LIBRARY_DIRS})
ELSE(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF(WIN32)
......@@ -42,47 +29,46 @@ ENDIF(WIN32)
QT4_WRAP_CPP(polyhedronsView_moc ../polyhedronsView.h)
add_executable( polyhedronsViewD ../polyhedronsView.cpp ${polyhedronsView_moc})
target_link_libraries( polyhedronsViewD
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(frame_manip_moc ../frame_manip.h)
add_executable( frame_manipD ../frame_manip.cpp ${frame_manip_moc})
target_link_libraries( frame_manipD
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(texturesExample_moc ../texturesExample.h)
add_executable( texturesExampleD ../texturesExample.cpp ${texturesExample_moc} )
target_link_libraries( texturesExampleD
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(simpleMap3_moc ../simpleMap3.h)
add_executable( simpleMap3D ../simpleMap3.cpp ${simpleMap3_moc} )
target_link_libraries( simpleMap3D
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(simpleGMap2_moc ../simpleGMap2.h)
add_executable( simpleGMap2D ../simpleGMap2.cpp ${simpleGMap2_moc} )
target_link_libraries( simpleGMap2D
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(simpleGMap3_moc ../simpleGMap3.h)
add_executable( simpleGMap3D ../simpleGMap3.cpp ${simpleGMap3_moc} )
target_link_libraries( simpleGMap3D
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(extrusionView_moc ../extrusionView.h)
add_executable( extrusionViewD ../extrusionView.cpp ${extrusionView_moc})
target_link_libraries( extrusionViewD
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( viewer_ui ../viewer.ui )
QT4_WRAP_CPP( viewer_moc ../viewer.h )
add_executable( viewerD ../viewer.cpp ${viewer_moc} ${viewer_ui})
target_link_libraries( viewerD
${CGoGN_LIBS_D} ${NUMERICAL_LIBS} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_D} ${NUMERICAL_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( clipping_ui ../clipping.ui )
QT4_WRAP_CPP( clipping_moc ../clipping.h )
add_executable( clippingD ../clipping.cpp ${clipping_ui} ${clipping_moc})
target_link_libraries( clippingD
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
Apps/Examples/Release/CMakeLists.txt
View file @ 6b963c6a
......@@ -5,29 +5,12 @@ project(examples)
SET(CMAKE_BUILD_TYPE Release)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
# FOR Qt4
FIND_PACKAGE(Qt4 REQUIRED)
SET(QT_USE_QTOPENGL TRUE)
INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS})
find_package(Boost COMPONENTS regex REQUIRED)
# define includes path
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
/usr/include/libxml2/
${CGoGN_ROOT_DIR}/include
${CGoGN_ROOT_DIR}/ThirdParty/Numerical
${CGoGN_ROOT_DIR}/ThirdParty/Numerical/UFconfig
${CGoGN_ROOT_DIR}/ThirdParty/gzstream
${CGoGN_ROOT_DIR}/ThirdParty/Zinri
${CGoGN_ROOT_DIR}/ThirdParty/AntTweakBar/include
${CGoGN_ROOT_DIR}/ThirdParty/OpenCTM
${CGoGN_ROOT_DIR}/ThirdParty/Assimp/include
${CGoGN_ROOT_DIR}/ThirdParty/glm
${Boost_INCLUDE_DIRS}
${CGoGN_EXT_INCLUDES}
)
# define libs path
......@@ -43,42 +26,41 @@ ENDIF(WIN32)
QT4_WRAP_CPP(polyhedronsView_moc ../polyhedronsView.h)
add_executable( polyhedronsView ../polyhedronsView.cpp ${polyhedronsView_moc})
target_link_libraries( polyhedronsView
${CGoGN_LIBS_R} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(frame_manip_moc ../frame_manip.h)
add_executable( frame_manip ../frame_manip.cpp ${frame_manip_moc})
target_link_libraries( frame_manip
${CGoGN_LIBS_R} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(texturesExample_moc ../texturesExample.h)
add_executable( texturesExample ../texturesExample.cpp ${texturesExample_moc} )
target_link_libraries( texturesExample
${CGoGN_LIBS_R} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(simpleGMap2_moc ../simpleGMap2.h)
add_executable( simpleGMap2 ../simpleGMap2.cpp ${simpleGMap2_moc} )
target_link_libraries( simpleGMap2
${CGoGN_LIBS_R} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(simpleGMap3_moc ../simpleGMap3.h)
add_executable( simpleGMap3 ../simpleGMap3.cpp ${simpleGMap3_moc} )
target_link_libraries( simpleGMap3
${CGoGN_LIBS_R} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(extrusionView_moc ../extrusionView.h)
add_executable( extrusionView ../extrusionView.cpp ${extrusionView_moc})
target_link_libraries( extrusionView
${CGoGN_LIBS_R} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( viewer_ui ../viewer.ui )
QT4_WRAP_CPP( viewer_moc ../viewer.h )
add_executable( viewer ../viewer.cpp ${viewer_moc} ${viewer_ui})
target_link_libraries( viewer
${CGoGN_LIBS_R} ${NUMERICAL_LIBS} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_R} ${NUMERICAL_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( clipping_ui ../clipping.ui )
QT4_WRAP_CPP( clipping_moc ../clipping.h )
add_executable( clipping ../clipping.cpp ${clipping_ui} ${clipping_moc})
target_link_libraries( clipping
${CGoGN_LIBS_R} ${COMMON_LIBS} ${QT_LIBRARIES} )
${CGoGN_LIBS_R} ${CGoGN_EXT_LIBS} )
Apps/Examples/Tests/CMakeLists.txt
View file @ 6b963c6a
cmake_minimum_required(VERSION 2.6)
project(geometryAssertD)
project(testing_debug)
SET(CMAKE_BUILD_TYPE Debug)
#SET (COMMON_LIBS ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${GLEW_LIBRARY} ${DEVIL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBXML2_LIBRARIES} gzstream AntTweakBar openctm)
# FOR Qt4
FIND_PACKAGE(Qt4 REQUIRED)
SET(QT_USE_QTOPENGL TRUE)
INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS})
# define includes path
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CGoGN_ROOT_DIR}/include
/usr/include/libxml2/
${CGoGN_ROOT_DIR}/include
${CGoGN_ROOT_DIR}/ThirdParty/Numerical
${CGoGN_ROOT_DIR}/ThirdParty/Numerical/UFconfig
${CGoGN_ROOT_DIR}/ThirdParty/gzstream
${CGoGN_ROOT_DIR}/ThirdParty/Zinri
${CGoGN_ROOT_DIR}/ThirdParty/AntTweakBar/include
${CGoGN_ROOT_DIR}/ThirdParty/OpenCTM
${CGoGN_ROOT_DIR}/ThirdParty/Assimp/include
${CGoGN_ROOT_DIR}/ThirdParty/glm
${CGoGN_EXT_INCLUDES}
)
# define libs path
link_directories(
${CGoGN_ROOT_DIR}/lib/Debug
${CGoGN_ROOT_DIR}/lib/Release
)
IF(WIN32)
link_directories(
${CGoGN_ROOT_DIR}/lib/$(ConfigurationName)
${Boost_LIBRARY_DIRS} )
ELSE(WIN32)
link_directories(
${CGoGN_ROOT_DIR}/lib/Debug
${CGoGN_ROOT_DIR}/lib/Release )
ENDIF(WIN32)
#define exec to compile
add_executable( Geom_orientationD ./Geom_orientation.cpp)
target_link_libraries( Geom_orientationD
${CGoGN_LIBS_D} ${COMMON_LIBS} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
add_executable( Geom_inclusionD ./Geom_inclusion.cpp)
target_link_libraries( Geom_inclusionD
${CGoGN_LIBS_D} ${COMMON_LIBS} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
add_executable( Geom_intersectionD ./Geom_intersection.cpp)
target_link_libraries( Geom_intersectionD
${CGoGN_LIBS_D} ${COMMON_LIBS} )
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS})
QT4_WRAP_CPP(concave_rendering_moc concave_rendering.h)
add_executable( concave_renderingD concave_rendering.cpp ${concave_rendering_moc})
target_link_libraries( concave_renderingD
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
IF (WITH_QT)
QT4_WRAP_CPP(concave_rendering_moc concave_rendering.h)
add_executable( concave_renderingD concave_rendering.cpp ${concave_rendering_moc})
target_link_libraries( concave_renderingD
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
ENDIF (WITH_QT)
Apps/Examples/Tests/concave_rendering.cpp
View file @ 6b963c6a
......@@ -48,74 +48,74 @@ using namespace CGoGN ;
float Ifont[74*2]={
0.145434,0.126469, 0.141475,0.096252, 0.133621,0.0730446, 0.120846,0.0558913,
0.0764256,0.0359233, 0,0.028701, 0,0.0215257, 0,0.0143506, 0,0.00717529, 0,0,
0.0560801,0, 0.11216,0, 0.16824,0, 0.22432,0, 0.2804,0, 0.33648,0, 0.39256,0,
0.448641,0, 0.448641,0.00717529, 0.448641,0.0143506, 0.448641,0.0215257, 0.448641,0.028701,
0.406716,0.0313208, 0.373254,0.0363483, 0.347367,0.0446329, 0.328172,0.0570242,
0.314784,0.0743722, 0.306316,0.0975264, 0.301885,0.127337, 0.300604,0.164653,
0.300604,0.248489, 0.300604,0.332326, 0.300604,0.416163, 0.300604,0.5,
0.300604,0.583837, 0.300604,0.667674, 0.300604,0.751511, 0.300604,0.835347,
0.301761,0.872601, 0.305891,0.902261, 0.313987,0.925229, 0.327039,0.942409,
0.371979,0.963015, 0.448641,0.971299, 0.448641,0.978474, 0.448641,0.98565,
0.448641,0.992825, 0.448641,1, 0.39256,1, 0.33648,1, 0.2804,1, 0.22432,1,
0.11216,1, 0,1, 0,0.992825, 0,0.98565, 0,0.978474, 0,0.971299,
0.0431605,0.967874, 0.0770629,0.96259, 0.102787,0.954438, 0.121412,0.942409,
0.134019,0.925495, 0.141687,0.902686, 0.145496,0.872973, 0.146526,0.835347,
0.146526,0.751511, 0.146526,0.667674, 0.146526,0.583837, 0.146526,0.5,
0.146526,0.416163, 0.146526,0.332326, 0.146526,0.248489, 0.146526,0.164653};
0.145434f,0.126469f, 0.141475f,0.096252f, 0.133621f,0.0730446f, 0.120846f,0.0558913f,
0.0764256f,0.0359233f, 0.0f,0.028701f, 0.0f,0.0215257f, 0.0f,0.0143506f, 0.0f,0.00717529f, 0.0f,0.0f,
0.0560801f, 0.0f, 0.11216f,0.0f, 0.16824f,0.0f, 0.22432f,0.0f, 0.2804f,0.0f, 0.33648f,0.0f, 0.39256f,0.0f,
0.448641f,0.0f, 0.448641f,0.00717529f, 0.448641f,0.0143506f, 0.448641f,0.0215257f, 0.448641f,0.028701f,
0.406716f,0.0313208f, 0.373254f,0.0363483f, 0.347367f,0.0446329f, 0.328172f,0.0570242f,
0.314784f,0.0743722f, 0.306316f,0.0975264f, 0.301885f,0.127337f, 0.300604f,0.164653f,
0.300604f,0.248489f, 0.300604f,0.332326f, 0.300604f,0.416163f, 0.300604f,0.5f,
0.300604f,0.583837f, 0.300604f,0.667674f, 0.300604f,0.751511f, 0.300604f,0.835347f,
0.301761f,0.872601f, 0.305891f,0.902261f, 0.313987f,0.925229f, 0.327039f,0.942409f,
0.371979f,0.963015f, 0.448641f,0.971299f, 0.448641f,0.978474f, 0.448641f,0.98565f,
0.448641f,0.992825f, 0.448641f,1.0f, 0.39256f,1.0f, 0.33648f,1.0f, 0.2804f,1.0f, 0.22432f,1.0f,
0.11216f,1.0f, 0.0f,1.0f, 0.0f,0.992825f, 0.0f,0.98565f, 0.0f,0.978474f, 0.0f,0.971299f,
0.0431605f,0.967874f, 0.0770629f,0.96259f, 0.102787f,0.954438f, 0.121412f,0.942409f,
0.134019f,0.925495f, 0.141687f,0.902686f, 0.145496f,0.872973f, 0.146526f,0.835347f,
0.146526f,0.751511f, 0.146526f,0.667674f, 0.146526f,0.583837f, 0.146526f,0.5f,
0.146526f,0.416163f, 0.146526f,0.332326f, 0.146526f,0.248489f, 0.146526f,0.164653f};
float Gfont[174*2]={
0.934964,0.533333, 0.888768,0.533333, 0.842572,0.533333, 0.796377,0.533333,
0.703986,0.533333, 0.611594,0.533333,
0.611594,0.526812, 0.611594,0.52029,
0.611594,0.513768, 0.611594,0.507246,
0.632945,0.505602, 0.650611,0.503872, 0.665118,0.501973, 0.676993,0.499819,
0.686761,0.497325, 0.69495,0.494407, 0.702086,0.490979, 0.708696,0.486957,
0.716245,0.481097, 0.722622,0.473234, 0.727879,0.463264, 0.732065,0.451087,
0.735233,0.4366, 0.737432,0.419701, 0.738714,0.400289, 0.73913,0.378261,
0.73913,0.348913, 0.73913,0.319565, 0.73913,0.290217, 0.73913,0.26087,
0.73913,0.231522, 0.73913,0.202174, 0.73913,0.172826, 0.73913,0.143478,
0.735128,0.126489, 0.723686,0.110553, 0.705656,0.0960427, 0.681884,0.0833333,
0.653221,0.0727978, 0.620516,0.0648098, 0.584618,0.0597429, 0.546377,0.057971,
0.462175,0.0655967, 0.38716,0.0879982, 0.321963,0.124462, 0.26721,0.174275,
0.223531,0.236725, 0.191553,0.311096, 0.171906,0.396677, 0.165217,0.492754,
0.167085,0.543526, 0.172554,0.593229, 0.18142,0.641199, 0.193478,0.686775,
0.208526,0.729294, 0.226359,0.768093, 0.246773,0.802511, 0.269565,0.831884,
0.294667,0.857006, 0.322011,0.879053, 0.351393,0.897942, 0.382609,0.913587,
0.415455,0.925903, 0.449728,0.934805, 0.485224,0.940209, 0.521739,0.942029,
0.55169,0.940744, 0.580639,0.936911, 0.608534,0.930565, 0.635326,0.921739,
0.660963,0.910468, 0.685394,0.896784, 0.708568,0.880723, 0.730435,0.862319,
0.745853,0.84707, 0.75976,0.831363, 0.772546,0.814603, 0.784601,0.796196,
0.796317,0.775546, 0.808084,0.752061, 0.820293,0.725144, 0.833333,0.694203,
0.841667,0.694203, 0.85,0.694203,
0.858333,0.694203, 0.866667,0.694203,
0.865217,0.732428, 0.863768,0.770652, 0.862319,0.808877, 0.86087,0.847101,
0.85942,0.885326, 0.857971,0.923551, 0.856522,0.961775, 0.855072,1,
0.847101,1, 0.83913,1,
0.831159,1, 0.823188,1,
0.819138,0.990039, 0.813609,0.98091, 0.806757,0.972767, 0.798732,0.965761,
0.789688,0.960046, 0.779778,0.955774, 0.769155,0.953099, 0.757971,0.952174,
0.75214,0.95238, 0.745562,0.953012, 0.738304,0.954085, 0.730435,0.955616,
0.722022,0.957623, 0.713134,0.960122, 0.703838,0.963131, 0.694203,0.966667,
0.669684,0.97434, 0.645063,0.981046, 0.620375,0.986767, 0.595652,0.991485,
0.570929,0.995185, 0.546241,0.997849, 0.52162,0.999459, 0.497101,1,
0.392522,0.990268, 0.297147,0.962092, 0.212438,0.917001, 0.139855,0.856522,
0.0808595,0.782184, 0.0369112,0.695516, 0.00947117,0.598047, 0,0.491304,
0.00183978,0.439586, 0.00738215,0.390874, 0.016661,0.345049, 0.0297101,0.301993,
0.0465636,0.261586, 0.0672554,0.223709, 0.0918195,0.188244, 0.12029,0.155072,
0.15863,0.119698, 0.200657,0.0886549, 0.246114,0.0620613, 0.294746,0.0400362,
0.3463,0.0226987, 0.400521,0.0101675, 0.457153,0.00256171, 0.515942,0,
0.56498,0.00227868, 0.61721,0.00871821, 0.670527,0.0187244, 0.722826,0.0317028,
0.771999,0.047059, 0.815942,0.0641983, 0.852548,0.0825265, 0.87971,0.101449,
0.87971,0.138225, 0.87971,0.175, 0.87971,0.211775, 0.87971,0.248551,
0.87971,0.285326, 0.87971,0.322101, 0.87971,0.358877, 0.87971,0.395652,
0.880621,0.4247, 0.883741,0.448143, 0.889646,0.466627, 0.898913,0.480797,
0.912121,0.491299, 0.929846,0.498777, 0.952666,0.503878, 0.981159,0.507246,
0.981159,0.513768, 0.981159,0.52029,
0.981159,0.526812, 0.981159,0.533333};
0.934964f,0.533333f, 0.888768f,0.533333f, 0.842572f,0.533333f, 0.796377f,0.533333f,
0.703986f,0.533333f, 0.611594f,0.533333f,
0.611594f,0.526812f, 0.611594f,0.52029f,
0.611594f,0.513768f, 0.611594f,0.507246f,
0.632945f,0.505602f, 0.650611f,0.503872f, 0.665118f,0.501973f, 0.676993f,0.499819f,
0.686761f,0.497325f, 0.69495f,0.494407f, 0.702086f,0.490979f, 0.708696f,0.486957f,
0.716245f,0.481097f, 0.722622f,0.473234f, 0.727879f,0.463264f, 0.732065f,0.451087f,
0.735233f,0.4366f, 0.737432f,0.419701f, 0.738714f,0.400289f, 0.73913f,0.378261f,
0.73913f,0.348913f, 0.73913f,0.319565f, 0.73913f,0.290217f, 0.73913f,0.26087f,
0.73913f,0.231522f, 0.73913f,0.202174f, 0.73913f,0.172826f, 0.73913f,0.143478f,
0.735128f,0.126489f, 0.723686f,0.110553f, 0.705656f,0.0960427f, 0.681884f,0.0833333f,
0.653221f,0.0727978f, 0.620516f,0.0648098f, 0.584618f,0.0597429f, 0.546377f,0.057971f,
0.462175f,0.0655967f, 0.38716f,0.0879982f, 0.321963f,0.124462f, 0.26721f,0.174275f,
0.223531f,0.236725f, 0.191553f,0.311096f, 0.171906f,0.396677f, 0.165217f,0.492754f,
0.167085f,0.543526f, 0.172554f,0.593229f, 0.18142f,0.641199f, 0.193478f,0.686775f,
0.208526f,0.729294f, 0.226359f,0.768093f, 0.246773f,0.802511f, 0.269565f,0.831884f,
0.294667f,0.857006f, 0.322011f,0.879053f, 0.351393f,0.897942f, 0.382609f,0.913587f,
0.415455f,0.925903f, 0.449728f,0.934805f, 0.485224f,0.940209f, 0.521739f,0.942029f,
0.55169f,0.940744f, 0.580639f,0.936911f, 0.608534f,0.930565f, 0.635326f,0.921739f,
0.660963f,0.910468f, 0.685394f,0.896784f, 0.708568f,0.880723f, 0.730435f,0.862319f,
0.745853f,0.84707f, 0.75976f,0.831363f, 0.772546f,0.814603f, 0.784601f,0.796196f,
0.796317f,0.775546f, 0.808084f,0.752061f, 0.820293f,0.725144f, 0.833333f,0.694203f,
0.841667f,0.694203f, 0.85f,0.694203f,
0.858333f,0.694203f, 0.866667f,0.694203f,
0.865217f,0.732428f, 0.863768f,0.770652f, 0.862319f,0.808877f, 0.86087f,0.847101f,
0.85942f,0.885326f, 0.857971f,0.923551f, 0.856522f,0.961775f, 0.855072f,1.0f,
0.847101f,1.0f, 0.83913f,1.0f,
0.831159f,1.0f, 0.823188f,1.0f,
0.819138f,0.990039f, 0.813609f,0.98091f, 0.806757f,0.972767f, 0.798732f,0.965761f,
0.789688f,0.960046f, 0.779778f,0.955774f, 0.769155f,0.953099f, 0.757971f,0.952174f,
0.75214f,0.95238f, 0.745562f,0.953012f, 0.738304f,0.954085f, 0.730435f,0.955616f,
0.722022f,0.957623f, 0.713134f,0.960122f, 0.703838f,0.963131f, 0.694203f,0.966667f,
0.669684f,0.97434f, 0.645063f,0.981046f, 0.620375f,0.986767f, 0.595652f,0.991485f,
0.570929f,0.995185f, 0.546241f,0.997849f, 0.52162f,0.999459f, 0.497101f,1.0f,
0.392522f,0.990268f, 0.297147f,0.962092f, 0.212438f,0.917001f, 0.139855f,0.856522f,
0.0808595f,0.782184f, 0.0369112f,0.695516f, 0.00947117f,0.598047f, 0.0f,0.491304f,
0.00183978f,0.439586f, 0.00738215f,0.390874f, 0.016661f,0.345049f, 0.0297101f,0.301993f,
0.0465636f,0.261586f, 0.0672554f,0.223709f, 0.0918195f,0.188244f, 0.12029f,0.155072f,
0.15863f,0.119698f, 0.200657f,0.0886549f, 0.246114f,0.0620613f, 0.294746f,0.0400362f,
0.3463f,0.0226987f, 0.400521f,0.0101675f, 0.457153f,0.00256171f, 0.515942f,0.0f,
0.56498f,0.00227868f, 0.61721f,0.00871821f, 0.670527f,0.0187244f, 0.722826f,0.0317028f,
0.771999f,0.047059f, 0.815942f,0.0641983f, 0.852548f,0.0825265f, 0.87971f,0.101449f,
0.87971f,0.138225f, 0.87971f,0.175f, 0.87971f,0.211775f, 0.87971f,0.248551f,
0.87971f,0.285326f, 0.87971f,0.322101f, 0.87971f,0.358877f, 0.87971f,0.395652f,
0.880621f,0.4247f, 0.883741f,0.448143f, 0.889646f,0.466627f, 0.898913f,0.480797f,
0.912121f,0.491299f, 0.929846f,0.498777f, 0.952666f,0.503878f, 0.981159f,0.507246f,
0.981159f,0.513768f, 0.981159f,0.52029f,
0.981159f,0.526812f, 0.981159f,0.533333f};
/**
* Struct that contains some informations about the types of the manipulated objects
......
Apps/Examples/Tests/concave_rendering.h
View file @ 6b963c6a
......@@ -27,7 +27,7 @@
#include <iostream>
#include "Utils/qtSimple.h"
#include "Utils/Qt/qtSimple.h"
#include "Utils/cgognStream.h"
// forward definitions (minimize includes)
......
Apps/Examples/clipping.h
View file @ 6b963c6a
......@@ -27,12 +27,12 @@
#include <iostream>
#include "Utils/qtSimple.h"
#include "Utils/qtInputs.h"
#include "Utils/Qt/qtSimple.h"
#include "Utils/Qt/qtInputs.h"
#include "ui_clipping.h"
// inclure qtui.h juste après le ui_xxx.h
#include "Utils/qtui.h"
#include "Utils/Qt/qtui.h"
#include "Topology/generic/parameters.h"
#include "Topology/map/embeddedMap3.h"
......
Apps/Examples/extrusionView.h
View file @ 6b963c6a
......@@ -28,7 +28,7 @@
#include <iostream>
#include "Utils/qtSimple.h"
#include "Utils/Qt/qtSimple.h"
// forward definitions (minimize includes)
namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class MapRender; }}}}
......
Apps/Examples/frame_manip.h
View file @ 6b963c6a
......@@ -27,7 +27,7 @@
#include <iostream>
#include "Utils/qtSimple.h"
#include "Utils/Qt/qtSimple.h"
#include "Utils/frameManipulator.h"
#include "Utils/drawer.h"
......
Apps/Examples/miniTest.cpp
View file @ 6b963c6a
......@@ -657,13 +657,13 @@ void MyGlutWin::myKeyboard(unsigned char keycode, int x, int y)
visited.push_back(myMap.begin()) ;
markVisit.mark(myMap.begin()) ;
for(std::vector<Dart>::iterator vertex = visited.begin(); vertex != visited.end(); ++vertex)
for(unsigned int i = 0; i < visited.size(); ++i)
{
bool deleteV = true ;
if(markNoDelete.isMarked(*vertex))
if(markNoDelete.isMarked(visited[i]))
deleteV = false ;
Dart vit = *vertex ;
Dart vit = visited[i] ;
do // add all vertex neighbors to the table
{
Dart nv = myMap.phi1(vit) ;
......@@ -675,10 +675,10 @@ void MyGlutWin::myKeyboard(unsigned char keycode, int x, int y)
if(deleteV)
markNoDelete.mark(nv) ;
vit = myMap.alpha1(vit) ;
} while(vit != *vertex) ;
} while(vit != visited[i]) ;
if(deleteV)
myMap.deleteVertex(*vertex) ;
myMap.deleteVertex(visited[i]) ;
}
// for(Dart d = myMap.begin(); d != myMap.end(); myMap.next(d))
......
Apps/Examples/polyhedronsView.h
View file @ 6b963c6a
......@@ -27,7 +27,7 @@
#include <iostream>
#include "Utils/qtSimple.h"
#include "Utils/Qt/qtSimple.h"
// forward definitions (minimize includes)
namespace CGoGN { namespace Algo { namespace Render { namespace GL2 { class MapRender; }}}}
......
Apps/Examples/simpleGMap2.cpp
View file @ 6b963c6a
......@@ -37,20 +37,20 @@ SimpleGMap2::SimpleGMap2()
position[myMap.phi_1(d)] = VEC3(10,20,15);
position[myMap.phi_1(myMap.phi2(d))] = VEC3(0,0,30);
VEC3 mid = (position[d]+position[myMap.phi1(d)])/2.0f;
VEC3 mid = (position[d] + position[myMap.phi1(d)]) / 2.0f;
myMap.cutEdge(d);
position[myMap.phi1(d)] = mid;
Algo::Modelisation::Polyhedron<PFP> poly(myMap,position);
Algo::Modelisation::Polyhedron<PFP> poly(myMap, position);
d = poly.cylinder_topo(5,1,false,false);
d = poly.cylinder_topo(5, 1, false, false);
poly.embedCylinder(10,10,5);
poly.embedCylinder(10, 10, 5);
d = myMap.phi1(d);
Dart dd = myMap.beta2(d);
myMap.unsewFaces(d);
myMap.sewFaces(d,dd);
myMap.sewFaces(d, dd);
position[d][1] += 3.0f;
}
......
Apps/Examples/simpleGMap2.h
View file @ 6b963c6a
......@@ -24,7 +24,7 @@
#include <iostream>
#include "Utils/qtSimple.h"
#include "Utils/Qt/qtSimple.h"
#include "Topology/generic/parameters.h"
#include "Topology/gmap/embeddedGMap2.h"
......
Apps/Examples/simpleGMap3.cpp
View file @ 6b963c6a
......@@ -32,7 +32,7 @@
SimpleGMap3::SimpleGMap3()
{
position = myMap.addAttribute<