mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 04:20:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Begin implementing clip plane support for kameleon volumes

Browse Source 
Conflicts:
	modules/volume/CMakeLists.txt
This commit is contained in:
Emil Axelsson
2016-10-29 11:52:25 +02:00
parent dbe8857e42
commit 2a234befe8
14 changed files with 233 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/volume/CMakeLists.txt
+4 -3
View File
@@ -26,10 +26,7 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.h
<<<<<<< HEAD
${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.inl
=======
>>>>>>> 4bf7b71... Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner.
${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.h
${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.inl
${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.h
@@ -41,6 +38,8 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.h
${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl
${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplane.h
${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplanes.h
)
source_group("Header Files" FILES ${HEADER_FILES})
@@ -51,6 +50,8 @@ set(SOURCE_FILES
${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl
${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl
${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplane.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplanes.cpp
)
source_group("Source Files" FILES ${SOURCE_FILES})