Commit 6e256b2e authored by pitiot's avatar pitiot

ça marche !

parent 58dafed2
......@@ -4,18 +4,51 @@ project(Volusion)
#SET ( CMAKE_VERBOSE_MAKEFILE 1 )
#add_definitions(-DSPATIAL_HASHING)
SET(QT_USE_QTXML TRUE )
SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${QT_INCLUDE_DIR})
SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES})
SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} ${QT_LIBRARIES} ${QGLVIEWER_LIBRAIRIES})
SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/../../CGoGN CACHE STRING "CGoGN root dir")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ")
include(${CGoGN_ROOT_DIR}/apps_cmake.txt)
add_subdirectory(${CMAKE_SOURCE_DIR}/Release Release)
IF (NOT WIN32)
add_subdirectory(${CMAKE_SOURCE_DIR}/Debug Debug)
ENDIF (NOT WIN32)
#add_subdirectory(${CMAKE_SOURCE_DIR}/Release Release)
#IF (NOT WIN32)
# add_subdirectory(${CMAKE_SOURCE_DIR}/Debug Debug)
#ENDIF (NOT WIN32)
include_directories(
${CGoGN_ROOT_DIR}/include
${COMMON_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
include
)
SET(QT_USE_QTXML TRUE)
file( GLOB
sources
src/*.cpp
)
file( GLOB
includes
include/*.hpp
include/*.h
)
QT4_WRAP_UI( Volusion_ui include/Volusion.ui )
QT4_WRAP_CPP( Volusion_moc include/viewer.h )
add_executable( Volusion
${includes}
${sources}
${Volusion_moc}
${Volusion_ui}
)
target_link_libraries( Volusion ${CGoGN_LIBS} ${COMMON_LIBS} ${CGoGN_EXT_LIBS})
cmake_minimum_required(VERSION 2.8)
SET(CMAKE_BUILD_TYPE Debug)
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ELSE (WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF (WIN32)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/Debug
# ${CMAKE_CURRENT_SOURCE_DIR}
../include
${CGoGN_ROOT_DIR}/include
${COMMON_INCLUDES}
)
file(
GLOB
shaders_srcD
../include/*.frag
../include/*.vert
../include/*.geom
)
add_custom_target(shader_targetD ${CGoGN_ROOT_DIR}/ThirdParty/bin/shader_to_h ${shaders_srcD}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES ${shaders_srcD} )
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -p ")
QT4_WRAP_UI( Volusion_ui ../include/Volusion.ui )
QT4_WRAP_CPP( Volusion_moc ../include/viewer.h )
add_executable( VolusionD
../src/viewer.cpp
../src/env_map.cpp
../src/simulator.cpp
../src/niddle.cpp
${Volusion_moc}
${Volusion_ui}
)
add_dependencies(VolusionD shader_targetD )
target_link_libraries( VolusionD ${CGoGN_LIBS_D} ${COMMON_LIBS} ${CGoGN_EXT_LIBS})
cmake_minimum_required(VERSION 2.8)
SET(CMAKE_BUILD_TYPE Release)
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ELSE (WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF (WIN32)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/Release
# ${CMAKE_CURRENT_SOURCE_DIR}
../include
${CGoGN_ROOT_DIR}/include
${COMMON_INCLUDES}
)
file(
GLOB
shaders_src
../include/*.frag
../include/*.vert
../include/*.geom
)
add_custom_target(shader_target ${CGoGN_ROOT_DIR}/ThirdParty/bin/shader_to_h ${shaders_src}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
SOURCES ${shaders_src} )
SET(QT_USE_QTXML TRUE )
#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
QT4_WRAP_UI( Volusion_ui ../include/Volusion.ui )
QT4_WRAP_CPP( Volusion_moc ../include/viewer.h )
add_executable( Volusion
../src/viewer.cpp
../src/env_map.cpp
../src/simulator.cpp
../src/niddle.cpp
${Volusion_moc}
${Volusion_ui}
)
add_dependencies(Volusion shader_target )
target_link_libraries( Volusion ${CGoGN_LIBS_R} ${COMMON_LIBS} ${CGoGN_EXT_LIBS})
No preview for this file type
0 -51.2899 -163.469 1288.65 -46.3169 -153.556 1189.27 -0.00588224 0.995074 0.098965
102 -261.05 -591.018 327.605 -223.581 -512.409 278.443 0.0614282 0.508031 0.859145
384 -79.8237 -178.36 278.022 -53.9298 -122.942 198.912 0.145458 0.787317 0.599145
783 -18.9652 -82.8792 329.016 -11.4665 -54.4331 233.441 0.0183238 0.957894 0.286537
1010 -37.6417 -100.372 520.772 -29.2836 -78.8839 423.467 0.0387287 0.975037 0.218641
1451 47.6974 -316.138 424.826 39.6608 -254.389 346.58 -0.0834457 0.778075 0.622604
1904 -69.2883 -520.466 118.458 -60.4586 -427.908 81.6461 -0.0209514 0.371209 0.928313
25 300
752.914 -61.4409 -480.872 669.3 -54.4877 -426.464 0.0508533 0.997487 -0.0493242
733.314 185.543 -478.682 651.919 164.533 -424.521 -0.160627 0.977358 0.137735
524.877 647.248 -317.426 467.08 573.965 -281.522 -0.562113 0.67646 0.475848
This diff is collapsed.
21 752.914 -61.4409 -480.872 669.3 -54.4877 -426.464 0.0508533 0.997487 -0.0493242
21 733.314 185.543 -478.682 651.919 164.533 -424.521 -0.160627 0.977358 0.137735
21 524.877 647.248 -317.426 467.08 573.965 -281.522 -0.562113 0.67646 0.475848
1 700
282.553 -549.754 -431.112 243.297 -467.981 -389.015 0.278767 0.541963 -0.792821
400.527 224.803 -813.318 330.469 214.097 -727.414 -0.172437 0.984769 0.0222493
This diff is collapsed.
1 700
282.553 -549.754 -431.112 243.297 -467.981 -389.015 0.278767 0.541963 -0.792821
450.527 224.803 -813.318 330.469 214.097 -727.414 -0.172437 0.984769 0.0222493
TypeDeScene Eux
Circle-250 8.68987
Circle-500 35.2113
Circle-1000 124.571
set terminal svg size 600,400 enhanced font 'arial,11' butt
set output 'graphBenchMemoryCircles1000.svg'
set auto x
set grid
set xlabel 'Time'
set ylabel 'Memory'
set yrange [0.1:*]
#set xrange [0:2580]
#set logscale y
plot 'Circle_Memory_NotreMethodeSubdivMax.data' using 1:2 title 'Fine grid' with lines lt 5, \
'Circle_Memory_NotreMethodeSansSimplif.data' using 1:2 title 'Adaptive method w/o simplification' with lines lt 4, \
'Circle_Memory_NotreMethode.data' using 1:2 title 'Adaptive method' with lines lt 2, \
'Circle_Memory_NotreMethodeStatic.data' using 1:2 title 'Coarse grid' with lines lt 3
pause -1
0 407854
10 430462
20 422926
30 436972
40 412402
50 421106
60 401914
70 417166
80 398734
90 398830
100 405184
110 381698
120 408410
130 405026
140 389086
150 396958
160 393142
170 396028
180 372446
190 380318
200 395342
210 379582
220 383638
230 380062
240 357246
250 370322
260 351626
270 355634
280 355078
290 355030
300 347590
310 347394
320 352934
330 345734
340 353366
350 337630
360 326134
370 345214
380 340518
390 330002
400 335546
410 313322
420 327502
430 320062
440 320254
450 311406
460 299078
470 302942
480 303302
490 287242
500 294874
510 301492
520 293874
530 277646
540 285278
550 285422
560 276922
570 277018
580 265738
590 283422
600 259778
610 259694
620 259838
630 255646
640 251542
650 250838
660 250422
670 234110
680 240704
690 241182
700 233742
710 225194
720 232170
730 228474
740 224730
750 211638
760 211638
770 210708
780 209778
790 210720
800 211662
810 211662
820 211662
830 211662
840 211662
850 211662
860 211662
870 211662
880 211662
890 211662
900 211662
910 211662
920 211662
930 210720
940 209778
950 209778
960 209778
970 209778
980 209778
990 209802
1000 209802
1010 208872
1020 208872
1030 208872
1040 210896
1050 211978
1060 211978
1070 211036
1080 211036
1090 212118
1100 216166
1110 216166
1120 216968
1130 216968
1140 217910
1150 217910
1160 218852
1170 220876
1180 223842
1190 227890
1200 228972
1210 234764
1220 235846
1230 238290
1240 241256
1250 245164
1260 256226
1270 259052
1280 263660
1290 273500
1300 274582
1310 278182
1320 279938
1330 283232
1340 284260
1350 296148
1360 293116
1370 300336
1380 308238
1390 305854
1400 299550
1410 316710
1420 319548
1430 326284
1440 325784
1450 332554
1460 329240
1470 333174
1480 337258
1490 342146
1500 342184
1510 338520
1520 335020
1530 338216
1540 339438
1550 340532
1560 337240
1570 345472
1580 335624
1590 333740
1600 334604
1610 323184
1620 334208
1630 335254
1640 336454
1650 340782
1660 334364
1670 328232