ça marche !

CMakeLists.txt

@@ -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})

Debug/CMakeLists.txt

-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})

Release/CMakeLists.txt

-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})

cams/cam.out~

-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

cams/cam.scn8

-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

cams/cam.scn8~

-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

cams/cam.scn9

-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

cams/cam.scn9~

-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

graphData/Circle_LeurMethode.data

-TypeDeScene Eux
-Circle-250 8.68987
-Circle-500 35.2113
-Circle-1000 124.571

graphData/Circle_Memory.plot

-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
-

graphData/Circle_Memory_NotreMethode.data

-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
-1680 322080
-1690 323788
-1700 326426
-1710 325078
-1720 326288
-1730 323078
-1740 316050
-1750 315516
-1760 316446
-1770 313420
-1780 315036
-1790 313382
-1800 305044
-1810 301668
-1820 302916
-1830 298320
-1840 299646
-1850 293794
-1860 292918
-1870 298328
-1880 302388
-1890 299458
-1900 295410
-1910 288080
-1920 293490
-1930 296482
-1940 295820
-1950 294458
-1960 299066
-1970 303534
-1980 303712
-1990 311566
-2000 312546
-2010 316454
-2020 327974
-2030 325390
-2040 331220
-2050 329578
-2060 335306
-2070 336668
-2080 340054
-2090 339634
-2100 348570
-2110 353038
-2120 355902
-2130 361592
-2140 368364
-2150 371470
-2160 373634
-2170 378102
-2180 378382
-2190 380266
-2200 383652
-2210 382850
-2220 385956
-2230 388922
-2240 387700
-2250 390806
-2260 391888
-2270 393772
-2280 393110
-2290 396356
-2300 398660
-2310 396356
-2320 401626
-2330 405432
-2340 404350
-2350 405292
-2360 408016
-2370 408016
-2380 409098
-2390 409098
-2400 409098
-2410 410320
-2420 411402
-2430 414508
-2440 414508
-2450 414508
-2460 414508
-2470 415590
-2480 415590
-2490 415590
-2500 416672

graphData/Circle_Memory_NotreMethodeSansSimplif.data

-0 407854
-10 437998
-20 475678
-30 557454
-40 572526
-50 617742
-60 662958
-70 715150
-80 749062
-90 779206
-100 853446
-110 876054
-120 925038
-130 951414
-140 996070
-150 1026214
-160 1071430
-170 1134366
-180 1149438
-190 1179582
-200 1217262
-210 1261918
-220 1288294
-230 1322206
-240 1358766
-250 1388910
-260 1403982
-270 1445430
-280 1482550
-290 1505158
-300 1527766
-310 1579398
-320 1602006
-330 1617078
-340 1654758
-350 1669270
-360 1691878
-370 1725790
-380 1762350
-390 1777422
-400 1800030
-410 1815102
-420 1844686
-430 1867294
-440 1882366
-450 1911390
-460 1926462
-470 1937766
-480 1960374
-490 1974886
-500 1989958
-510 2011624
-520 2034054
-530 2041590
-540 2056662
-550 2064198
-560 2090014
-570 2097550
-580 2105086
-590 2126574
-600 2134110
-610 2141646
-620 2149182
-630 2163694
-640 2163694
-650 2178206
-660 2188950
-670 2188950
-680 2196486
-690 2203462
-700 2203462
-710 2210438
-720 2217414
-730 2217414
-740 2217414
-750 2220622
-760 2220622
-770 2220622
-780 2220622
-790 2220622
-800 2220622
-810 2220622
-820 2220622
-830 2220622
-840 2220622
-850 2220622
-860 2220622
-870 2220622
-880 2220622
-890 2220622
-900 2220622
-910 2220622
-920 2220622
-930 2220622
-940 2220622
-950 2220622
-960 2220622
-970 2220622
-980 2220622
-990 2220622
-1000 2220622
-1010 2220622
-1020 2220622
-1030 2220622
-1040 2220622
-1050 2220622
-1060 2220622
-1070 2220622
-1080 2220622
-1090 2220622
-1100 2220622
-1110 2220622
-1120 2220622
-1130 2220622
-1140 2220622
-1150 2220622
-1160 2220622
-1170 2220622
-1180 2220622
-1190 2220622
-1200 2220622
-1210 2220622
-1220 2220622
-1230 2220622
-1240 2220622
-1250 2220622
-1260 2220622
-1270 2220622
-1280 2220622
-1290 2220622
-1300 2220622
-1310 2220622
-1320 2220622
-1330 2220622
-1340 2220622
-1350 2220622
-1360 2220622
-1370 2220622
-1380 2220622
-1390 2220622
-1400 2220622
-1410 2220622
-1420 2220622
-1430 2220622
-1440 2220622
-1450 2220622
-1460 2220622
-1470 2220622
-1480 2220622
-1490 2220622
-1500 2220622
-1510 2220622
-1520 2220622
-1530 2220622
-1540 2220622
-1550 2220622
-1560 2220622
-1570 2220622
-1580 2220622
-1590 2220622
-1600 2220622
-1610 2220622
-1620 2220622
-1630 2220622
-1640 2220622
-1650 2220622
-1660 2220622
-1670 2220622
-1680 2220622
-1690 2220622
-1700 2220622
-1710 2220622
-1720 2220622