Skip to content

Commit 86956a0

Browse files
Atmosphere sample: removed external shaders
Load them using the DiligentFXShaderSourceStreamFactory
1 parent c06fa07 commit 86956a0

File tree

8 files changed

+13
-1184
lines changed

8 files changed

+13
-1184
lines changed

Samples/Atmosphere/CMakeLists.txt

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ set(TERRAIN_SHADERS
2626
set(SHADERS
2727
assets/shaders/HostSharedTerrainStructs.fxh
2828
)
29-
set(EXTERNAL_SHADERS
30-
../../../DiligentFX/Shaders/PostProcess/EpipolarLightScattering/public/EpipolarLightScatteringStructures.fxh
31-
../../../DiligentFX/Shaders/PostProcess/EpipolarLightScattering/public/EpipolarLightScatteringFunctions.fxh
32-
../../../DiligentFX/Shaders/PostProcess/ToneMapping/public/ToneMappingStructures.fxh
33-
../../../DiligentFX/Shaders/Common/public/BasicStructures.fxh
34-
../../../DiligentFX/Shaders/Common/public/Shadows.fxh
35-
)
3629

3730
set(RENDER_STATES
3831
assets/render_states/RenderStates.json
@@ -55,15 +48,15 @@ set(TERRAIN_TILES
5548
assets/Terrain/Tiles/Snow_NM.jpg
5649
)
5750

58-
set(ALL_SHADERS ${TERRAIN_SHADERS} ${SHADERS} ${EXTERNAL_SHADERS})
51+
set(ALL_SHADERS ${TERRAIN_SHADERS} ${SHADERS})
5952
set(ASSETS ${TERRAIN_TEXTURES} ${TERRAIN_TILES} ${RENDER_STATES})
6053
add_sample_app("Atmosphere" "DiligentSamples/Samples" "${SOURCE}" "${INCLUDE}" "${ALL_SHADERS}" "${ASSETS}")
6154

6255
set_source_files_properties(${TERRAIN_SHADERS} PROPERTIES
6356
VS_DEPLOYMENT_LOCATION "shaders/terrain"
6457
MACOSX_PACKAGE_LOCATION "Resources/shaders/terrain"
6558
)
66-
set_source_files_properties(${SHADERS} ${EXTERNAL_SHADERS} PROPERTIES
59+
set_source_files_properties(${SHADERS} PROPERTIES
6760
VS_DEPLOYMENT_LOCATION "shaders"
6861
MACOSX_PACKAGE_LOCATION "Resources/shaders"
6962
)
@@ -97,15 +90,5 @@ PRIVATE
9790
DiligentFX
9891
)
9992

100-
add_custom_command(TARGET Atmosphere PRE_BUILD
101-
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../../../DiligentFX/Shaders/PostProcess/EpipolarLightScattering/public/EpipolarLightScatteringStructures.fxh" "${CMAKE_CURRENT_SOURCE_DIR}/assets/shaders"
102-
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../../../DiligentFX/Shaders/PostProcess/EpipolarLightScattering/public/EpipolarLightScatteringFunctions.fxh" "${CMAKE_CURRENT_SOURCE_DIR}/assets/shaders"
103-
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../../../DiligentFX/Shaders/PostProcess/ToneMapping/public/ToneMappingStructures.fxh" "${CMAKE_CURRENT_SOURCE_DIR}/assets/shaders"
104-
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../../../DiligentFX/Shaders/Common/public/BasicStructures.fxh" "${CMAKE_CURRENT_SOURCE_DIR}/assets/shaders"
105-
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../../../DiligentFX/Shaders/Common/public/Shadows.fxh" "${CMAKE_CURRENT_SOURCE_DIR}/assets/shaders"
106-
)
107-
108-
10993
# We have to use a different group name (Assets with capital A) to override grouping that was set by add_sample_app
11094
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/assets PREFIX Assets FILES ${ASSETS} ${SHADERS} ${TERRAIN_SHADERS})
111-
source_group("Assets\\shaders" FILES ${EXTERNAL_SHADERS})

Samples/Atmosphere/assets/shaders/BasicStructures.fxh

Lines changed: 0 additions & 149 deletions
This file was deleted.

Samples/Atmosphere/assets/shaders/EpipolarLightScatteringFunctions.fxh

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)