Skip to content

Commit 83741e7

Browse files
Merge pull request #533 from JonasLukasczyk/cinemaImagingBackend
Cinema Imaging Backend
2 parents d80b61f + 24cbd61 commit 83741e7

30 files changed

+2598
-716
lines changed

CMake/BaseCode.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,12 @@ function(ttk_set_compile_options library)
171171
target_link_libraries(${library} PUBLIC ${GRAPHVIZ_PATHPLAN_LIBRARY})
172172
endif()
173173

174+
if (TTK_ENABLE_EMBREE AND EMBREE_FOUND)
175+
target_compile_definitions(${library} PUBLIC TTK_ENABLE_EMBREE)
176+
target_include_directories(${library} PUBLIC ${EMBREE_INCLUDE_DIR})
177+
target_link_libraries(${library} PUBLIC ${EMBREE_LIBRARY})
178+
endif()
179+
174180
# TODO per module
175181
if (TTK_ENABLE_SQLITE3)
176182
target_compile_definitions(${library} PUBLIC TTK_ENABLE_SQLITE3)

CMake/Print.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ function(ttk_print_summary)
55
message(STATUS "TTK_ENABLE_CPU_OPTIMIZATION: ${TTK_ENABLE_CPU_OPTIMIZATION}")
66
message(STATUS "TTK_ENABLE_DOUBLE_TEMPLATING: ${TTK_ENABLE_DOUBLE_TEMPLATING}")
77
message(STATUS "TTK_ENABLE_EIGEN: ${TTK_ENABLE_EIGEN}")
8+
message(STATUS "TTK_ENABLE_EMBREE: ${TTK_ENABLE_EMBREE}")
89
message(STATUS "TTK_ENABLE_GRAPHVIZ: ${TTK_ENABLE_GRAPHVIZ}")
910
message(STATUS "TTK_ENABLE_KAMIKAZE: ${TTK_ENABLE_KAMIKAZE}")
1011
message(STATUS "TTK_ENABLE_MPI: ${TTK_ENABLE_MPI}")

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
7575
- task: Cache@2
7676
inputs:
77-
key: VTK | $(Agent.OS) | "$(VTKVersion)" | "v-11-16-20"
77+
key: VTK | $(Agent.OS) | "$(VTKVersion)" | "v-11-16-20c"
7878
path: $(Build.ArtifactStagingDirectory)/vtk-install
7979
cacheHitVar: CACHE_RESTORED
8080
displayName: Cache VTK build
@@ -214,7 +214,7 @@ jobs:
214214
215215
- task: Cache@2
216216
inputs:
217-
key: ParaView | $(Agent.OS) | "$(PV_VERSION)" | "v-11-16-20"
217+
key: ParaView | $(Agent.OS) | "$(PV_VERSION)" | "v-11-16-20c"
218218
path: $(Build.ArtifactStagingDirectory)/pv-install
219219
cacheHitVar: CACHE_RESTORED
220220
displayName: Cache ParaView build
@@ -504,7 +504,7 @@ jobs:
504504
steps:
505505
- task: Cache@2
506506
inputs:
507-
key: VTK | $(Agent.OS) | "$(VTKVersion)" | "v-11-16-20"
507+
key: VTK | $(Agent.OS) | "$(VTKVersion)" | "v-11-16-20c"
508508
path: $(Build.ArtifactStagingDirectory)/vtk-install
509509
cacheHitVar: CACHE_RESTORED
510510
displayName: Cache VTK build

config.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,14 @@ else()
128128
option(TTK_ENABLE_ZLIB "Enable Zlib support" ON)
129129
endif()
130130

131+
find_package(EMBREE 3.6)
132+
if(EMBREE_FOUND)
133+
option(TTK_ENABLE_EMBREE "Enable embree raytracing for ttkCinemaImaging" ON)
134+
else()
135+
option(TTK_ENABLE_EMBREE "Enable embree raytracing for ttkCinemaImaging" OFF)
136+
message(STATUS "EMBREE library not found, disabling embree support in TTK.")
137+
endif()
138+
131139
# START_FIND_GRAPHVIZ
132140
find_path(GRAPHVIZ_INCLUDE_DIR
133141
NAMES

0 commit comments

Comments
 (0)