Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Cazier
CGoGN
Commits
2a15a591
Commit
2a15a591
authored
Dec 07, 2011
by
Pierre Kraemer
Browse files
Merge cgogn:~thery/CGoGN
parents
0cc54bd5
f2cbc9f2
Changes
359
Hide whitespace changes
Inline
Side-by-side
Apps/CMakeLists.txt
View file @
2a15a591
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 @
2a15a591
...
...
@@ -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,47 @@ ENDIF(WIN32)
QT4_WRAP_CPP
(
polyhedronsView_moc ../polyhedronsView.h
)
add_executable
(
polyhedronsViewD ../polyhedronsView.cpp
${
polyhedronsView_moc
}
)
target_link_libraries
(
polyhedronsViewD
${
CGoGN_LIBS_D
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT_LIB
S
}
)
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
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT_LIB
S
}
)
QT4_WRAP_CPP
(
texturesExample_moc ../texturesExample.h
)
add_executable
(
texturesExampleD ../texturesExample.cpp
${
texturesExample_moc
}
)
target_link_libraries
(
texturesExampleD
${
CGoGN_LIBS_D
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT_LIB
S
}
)
QT4_WRAP_CPP
(
simpleMap3_moc ../simpleMap3.h
)
add_executable
(
simpleMap3D ../simpleMap3.cpp
${
simpleMap3_moc
}
)
target_link_libraries
(
simpleMap3D
${
CGoGN_LIBS_D
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT_LIB
S
}
)
QT4_WRAP_CPP
(
simpleGMap2_moc ../simpleGMap2.h
)
add_executable
(
simpleGMap2D ../simpleGMap2.cpp
${
simpleGMap2_moc
}
)
target_link_libraries
(
simpleGMap2D
${
CGoGN_LIBS_D
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT_LIB
S
}
)
QT4_WRAP_CPP
(
simpleGMap3_moc ../simpleGMap3.h
)
add_executable
(
simpleGMap3D ../simpleGMap3.cpp
${
simpleGMap3_moc
}
)
target_link_libraries
(
simpleGMap3D
${
CGoGN_LIBS_D
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT_LIB
S
}
)
QT4_WRAP_CPP
(
extrusionView_moc ../extrusionView.h
)
add_executable
(
extrusionViewD ../extrusionView.cpp
${
extrusionView_moc
}
)
target_link_libraries
(
extrusionViewD
${
CGoGN_LIBS_D
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT_LIB
S
}
)
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
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_D
}
${
NUMERICAL_LIBS
}
${
C
GoGN_EXT_LIB
S
}
)
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
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT_LIB
S
}
)
Apps/Examples/Release/CMakeLists.txt
View file @
2a15a591
...
...
@@ -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,42 @@ ENDIF(WIN32)
QT4_WRAP_CPP
(
polyhedronsView_moc ../polyhedronsView.h
)
add_executable
(
polyhedronsView ../polyhedronsView.cpp
${
polyhedronsView_moc
}
)
target_link_libraries
(
polyhedronsView
${
CGoGN_LIBS_R
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_R
}
${
C
GoGN_EXT_LIB
S
}
)
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
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_R
}
${
C
GoGN_EXT_LIB
S
}
)
QT4_WRAP_CPP
(
texturesExample_moc ../texturesExample.h
)
add_executable
(
texturesExample ../texturesExample.cpp
${
texturesExample_moc
}
)
target_link_libraries
(
texturesExample
${
CGoGN_LIBS_R
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_R
}
${
C
GoGN_EXT_LIB
S
}
)
QT4_WRAP_CPP
(
simpleGMap2_moc ../simpleGMap2.h
)
add_executable
(
simpleGMap2 ../simpleGMap2.cpp
${
simpleGMap2_moc
}
)
target_link_libraries
(
simpleGMap2
${
CGoGN_LIBS_R
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_R
}
${
C
GoGN_EXT_LIB
S
}
)
QT4_WRAP_CPP
(
simpleGMap3_moc ../simpleGMap3.h
)
add_executable
(
simpleGMap3 ../simpleGMap3.cpp
${
simpleGMap3_moc
}
)
target_link_libraries
(
simpleGMap3
${
CGoGN_LIBS_R
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_R
}
${
C
GoGN_EXT_LIB
S
}
)
QT4_WRAP_CPP
(
extrusionView_moc ../extrusionView.h
)
add_executable
(
extrusionView ../extrusionView.cpp
${
extrusionView_moc
}
)
target_link_libraries
(
extrusionView
${
CGoGN_LIBS_R
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_R
}
${
C
GoGN_EXT_LIB
S
}
)
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
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_R
}
${
NUMERICAL_LIBS
}
${
C
GoGN_EXT_LIB
S
}
)
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
}
${
C
OMMON_LIBS
}
${
QT_LIBRARIE
S
}
)
${
CGoGN_LIBS_R
}
${
C
GoGN_EXT_LIB
S
}
)
Apps/Examples/Tests/CMakeLists.txt
View file @
2a15a591
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
}
${
C
OMMON
_LIBS
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT
_LIBS
}
)
add_executable
(
Geom_inclusionD ./Geom_inclusion.cpp
)
target_link_libraries
(
Geom_inclusionD
${
CGoGN_LIBS_D
}
${
C
OMMON
_LIBS
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_EXT
_LIBS
}
)
add_executable
(
Geom_intersectionD ./Geom_intersection.cpp
)
target_link_libraries
(
Geom_intersectionD
${
CGoGN_LIBS_D
}
${
C
OMMON
_LIBS
}
)
${
CGoGN_LIBS_D
}
${
C
GoGN_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 @
2a15a591
...
...
@@ -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.145434
f
,
0.126469
f
,
0.141475
f
,
0.096252
f
,
0.133621
f
,
0.0730446
f
,
0.120846
f
,
0.0558913
f
,
0.0764256
f
,
0.0359233
f
,
0
.0
f
,
0.028701
f
,
0
.0
f
,
0.0215257
f
,
0
.0
f
,
0.0143506
f
,
0
.0
f
,
0.00717529
f
,
0
.0
f
,
0.0
f
,
0.0560801
f
,
0.0
f
,
0.11216
f
,
0
.0
f
,
0.16824
f
,
0
.0
f
,
0.22432
f
,
0
.0
f
,
0.2804
f
,
0
.0
f
,
0.33648
f
,
0
.0
f
,
0.39256
f
,
0
.0
f
,
0.448641
f
,
0
.0
f
,
0.448641
f
,
0.00717529
f
,
0.448641
f
,
0.0143506
f
,
0.448641
f
,
0.0215257
f
,
0.448641
f
,
0.028701
f
,
0.406716
f
,
0.0313208
f
,
0.373254
f
,
0.0363483
f
,
0.347367
f
,
0.0446329
f
,
0.328172
f
,
0.0570242
f
,
0.314784
f
,
0.0743722
f
,
0.306316
f
,
0.0975264
f
,
0.301885
f
,
0.127337
f
,
0.300604
f
,
0.164653
f
,
0.300604
f
,
0.248489
f
,
0.300604
f
,
0.332326
f
,
0.300604
f
,
0.416163
f
,
0.300604
f
,
0.5
f
,
0.300604
f
,
0.583837
f
,
0.300604
f
,
0.667674
f
,
0.300604
f
,
0.751511
f
,
0.300604
f
,
0.835347
f
,
0.301761
f
,
0.872601
f
,
0.305891
f
,
0.902261
f
,
0.313987
f
,
0.925229
f
,
0.327039
f
,
0.942409
f
,
0.371979
f
,
0.963015
f
,
0.448641
f
,
0.971299
f
,
0.448641
f
,
0.978474
f
,
0.448641
f
,
0.98565
f
,
0.448641
f
,
0.992825
f
,
0.448641
f
,
1
.0
f
,
0.39256
f
,
1
.0
f
,
0.33648
f
,
1
.0
f
,
0.2804
f
,
1
.0
f
,
0.22432
f
,
1
.0
f
,
0.11216
f
,
1
.0
f
,
0
.0
f
,
1.0
f
,
0
.0
f
,
0.992825
f
,
0
.0
f
,
0.98565
f
,
0
.0
f
,
0.978474
f
,
0
.0
f
,
0.971299
f
,
0.0431605
f
,
0.967874
f
,
0.0770629
f
,
0.96259
f
,
0.102787
f
,
0.954438
f
,
0.121412
f
,
0.942409
f
,
0.134019
f
,
0.925495
f
,
0.141687
f
,
0.902686
f
,
0.145496
f
,
0.872973
f
,
0.146526
f
,
0.835347
f
,
0.146526
f
,
0.751511
f
,
0.146526
f
,
0.667674
f
,
0.146526
f
,
0.583837
f
,
0.146526
f
,
0.5
f
,
0.146526
f
,
0.416163
f
,
0.146526
f
,
0.332326
f
,
0.146526
f
,
0.248489
f
,
0.146526
f
,
0.164653
f
};
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.934964
f
,
0.533333
f
,
0.888768
f
,
0.533333
f
,
0.842572
f
,
0.533333
f
,
0.796377
f
,
0.533333
f
,
0.703986
f
,
0.533333
f
,
0.611594
f
,
0.533333
f
,
0.611594
f
,
0.526812
f
,
0.611594
f
,
0.52029
f
,
0.611594
f
,
0.513768
f
,
0.611594
f
,
0.507246
f
,
0.632945
f
,
0.505602
f
,
0.650611
f
,
0.503872
f
,
0.665118
f
,
0.501973
f
,
0.676993
f
,
0.499819
f
,
0.686761
f
,
0.497325
f
,
0.69495
f
,
0.494407
f
,
0.702086
f
,
0.490979
f
,
0.708696
f
,
0.486957
f
,
0.716245
f
,
0.481097
f
,
0.722622
f
,
0.473234
f
,
0.727879
f
,
0.463264
f
,
0.732065
f
,
0.451087
f
,
0.735233
f
,
0.4366
f
,
0.737432
f
,
0.419701
f
,
0.738714
f
,
0.400289
f
,
0.73913
f
,
0.378261
f
,
0.73913
f
,
0.348913
f
,
0.73913
f
,
0.319565
f
,
0.73913
f
,
0.290217
f
,
0.73913
f
,
0.26087
f
,
0.73913
f
,
0.231522
f
,
0.73913
f
,
0.202174
f
,
0.73913
f
,
0.172826
f
,
0.73913
f
,
0.143478
f
,
0.735128
f
,
0.126489
f
,
0.723686
f
,
0.110553
f
,
0.705656
f
,
0.0960427
f
,
0.681884
f
,
0.0833333
f
,
0.653221
f
,
0.0727978
f
,
0.620516
f
,
0.0648098
f
,
0.584618
f
,
0.0597429
f
,
0.546377
f
,
0.057971
f
,
0.462175
f
,
0.0655967
f
,
0.38716
f
,
0.0879982
f
,
0.321963
f
,
0.124462
f
,
0.26721
f
,
0.174275
f
,
0.223531
f
,
0.236725
f
,
0.191553
f
,
0.311096
f
,
0.171906
f
,
0.396677
f
,
0.165217
f
,
0.492754
f
,
0.167085
f
,
0.543526
f
,
0.172554
f
,
0.593229
f
,
0.18142
f
,
0.641199
f
,
0.193478
f
,
0.686775
f
,
0.208526
f
,
0.729294
f
,
0.226359
f
,
0.768093
f
,
0.246773
f
,
0.802511
f
,
0.269565
f
,
0.831884
f
,
0.294667
f
,
0.857006
f
,
0.322011
f
,
0.879053
f
,
0.351393
f
,
0.897942
f
,
0.382609
f
,
0.913587
f
,
0.415455
f
,
0.925903
f
,
0.449728
f
,
0.934805
f
,
0.485224
f
,
0.940209
f
,
0.521739
f
,
0.942029
f
,
0.55169
f
,
0.940744
f
,
0.580639
f
,
0.936911
f
,
0.608534
f
,
0.930565
f
,
0.635326
f
,
0.921739
f
,
0.660963
f
,
0.910468
f
,
0.685394
f
,
0.896784
f
,
0.708568
f
,
0.880723
f
,
0.730435
f
,
0.862319
f
,
0.745853
f
,
0.84707
f
,
0.75976
f
,
0.831363
f
,
0.772546
f
,
0.814603
f
,
0.784601
f
,
0.796196
f
,
0.796317
f
,
0.775546
f
,
0.808084
f
,
0.752061
f
,
0.820293
f
,
0.725144
f
,
0.833333
f
,
0.694203
f
,
0.841667
f
,
0.694203
f
,
0.85
f
,
0.694203
f
,
0.858333
f
,
0.694203
f
,
0.866667
f
,
0.694203
f
,
0.865217
f
,
0.732428
f
,
0.863768
f
,
0.770652
f
,
0.862319
f
,
0.808877
f
,
0.86087
f
,
0.847101
f
,
0.85942
f
,
0.885326
f
,
0.857971
f
,
0.923551
f
,
0.856522
f
,
0.961775
f
,
0.855072
f
,
1
.0
f
,
0.847101
f
,
1
.0
f
,
0.83913
f
,
1
.0
f
,
0.831159
f
,
1
.0
f
,
0.823188
f
,
1
.0
f
,
0.819138
f
,
0.990039
f
,
0.813609
f
,
0.98091
f
,
0.806757
f
,
0.972767
f
,
0.798732
f
,
0.965761
f
,
0.789688
f
,
0.960046
f
,
0.779778
f
,
0.955774
f
,
0.769155
f
,
0.953099
f
,
0.757971
f
,
0.952174
f
,
0.75214
f
,
0.95238
f
,
0.745562
f
,
0.953012
f
,
0.738304
f
,
0.954085
f
,
0.730435
f
,
0.955616
f
,
0.722022
f
,
0.957623
f
,
0.713134
f
,
0.960122
f
,
0.703838
f
,
0.963131
f
,
0.694203
f
,
0.966667
f
,
0.669684
f
,
0.97434
f
,
0.645063
f
,
0.981046
f
,
0.620375
f
,
0.986767
f
,
0.595652
f
,
0.991485
f
,
0.570929
f
,
0.995185
f
,
0.546241
f
,
0.997849
f
,
0.52162
f
,
0.999459
f
,
0.497101
f
,
1
.0
f
,
0.392522
f
,
0.990268
f
,
0.297147
f
,
0.962092
f
,
0.212438
f
,
0.917001
f
,
0.139855
f
,
0.856522
f
,
0.0808595
f
,
0.782184
f
,
0.0369112
f
,
0.695516
f
,
0.00947117
f
,
0.598047
f
,
0
.0
f
,
0.491304
f
,
0.00183978
f
,
0.439586
f
,
0.00738215
f
,
0.390874
f
,
0.016661
f
,
0.345049
f
,
0.0297101
f
,
0.301993
f
,
0.0465636
f
,
0.261586
f
,
0.0672554
f
,
0.223709
f
,
0.0918195
f
,
0.188244
f
,
0.12029
f
,
0.155072
f
,
0.15863
f
,
0.119698
f
,
0.200657
f
,
0.0886549
f
,
0.246114
f
,
0.0620613
f
,
0.294746
f
,
0.0400362
f
,
0.3463
f
,
0.0226987
f
,
0.400521
f
,
0.0101675
f
,
0.457153
f
,
0.00256171
f
,
0.515942
f
,
0
.0
f
,
0.56498
f
,
0.00227868
f
,
0.61721
f
,
0.00871821
f
,
0.670527
f
,
0.0187244
f
,
0.722826
f
,
0.0317028
f
,
0.771999
f
,
0.047059
f
,
0.815942
f
,
0.0641983
f
,
0.852548
f
,
0.0825265
f
,
0.87971
f
,
0.101449
f
,
0.87971
f
,
0.138225
f
,
0.87971
f
,
0.175
f
,
0.87971
f
,
0.211775
f
,
0.87971
f
,
0.248551
f
,
0.87971
f
,
0.285326
f
,
0.87971
f
,
0.322101
f
,
0.87971
f
,
0.358877
f
,
0.87971
f
,
0.395652
f
,
0.880621
f
,
0.4247
f
,
0.883741
f
,
0.448143
f
,
0.889646
f
,
0.466627
f
,
0.898913
f
,
0.480797
f
,
0.912121
f
,
0.491299
f
,
0.929846
f
,
0.498777
f
,
0.952666
f
,
0.503878
f
,
0.981159
f
,
0.507246
f
,
0.981159
f
,
0.513768
f
,
0.981159
f
,
0.52029
f
,
0.981159
f
,
0.526812
f
,
0.981159
f
,
0.533333
f
};
/**
* Struct that contains some informations about the types of the manipulated objects
...
...
Apps/Examples/Tests/concave_rendering.h
View file @
2a15a591
...
...
@@ -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 @
2a15a591
...
...
@@ -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 @
2a15a591
...
...
@@ -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 @
2a15a591
...
...
@@ -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/polyhedronsView.h
View file @
2a15a591
...
...
@@ -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.h
View file @
2a15a591
...
...
@@ -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.h
View file @
2a15a591
...
...
@@ -24,7 +24,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/gmap/embeddedGMap3.h"
...
...
Apps/Examples/simpleMap3.h
View file @
2a15a591
...
...
@@ -24,7 +24,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/map/embeddedMap3.h"
...
...
Apps/Examples/texturesExample.cpp
View file @
2a15a591
...
...
@@ -210,8 +210,6 @@ void TexView::computeImage()
int
main
(
int
argc
,
char
**
argv
)
{
ilInit
();
// interface:
QApplication
app
(
argc
,
argv
);
TexView
tv
;
...
...
Apps/Examples/texturesExample.h
View file @
2a15a591
...
...
@@ -27,7 +27,7 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"Utils/textures.h"
#include
"Utils/Shaders/shaderSimpleTexture.h"
#include
"Utils/Shaders/shaderTextureMask.h"
...
...
Apps/Examples/viewer.h
View file @
2a15a591
...
...
@@ -24,9 +24,9 @@
#include
<iostream>
#include
"Utils/qtSimple.h"
#include
"Utils/
Qt/
qtSimple.h"
#include
"ui_viewer.h"
#include
"Utils/qtui.h"
#include
"Utils/
Qt/
qtui.h"
#include
"Topology/generic/parameters.h"
#include
"Topology/map/embeddedMap2.h"
...
...
Apps/Tuto/CMakeLists.txt
View file @
2a15a591
...
...
@@ -6,74 +6,62 @@ project(Tutos)
SET
(
CMAKE_BUILD_TYPE Debug
)
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
}
)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
/usr/include/libxml2/
${
CGoGN_ROOT_DIR
}
/ThirdParty/gzstream
${
CGoGN_ROOT_DIR
}
/ThirdParty/OpenCTM
${
CGoGN_ROOT_DIR
}
/ThirdParty/Assimp/include
${
CGoGN_ROOT_DIR
}
/ThirdParty/glm