Skip to content

Fog volumetric scattering for path tracing #2110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Oct 25, 2020
Merged

Fog volumetric scattering for path tracing #2110

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6520e37
Brought changes from volume branch.
eturquin Sep 23, 2020
3ee9ea2
Merge branch 'HDRP/pt_volmerge' into HDRP/pt_volmerge2
eturquin Sep 23, 2020
2a3f1ab
Minor fixes on cone region of spot lights.
eturquin Sep 23, 2020
7732187
Re-added mistakenly removed headers from the PT pass of Unlit & Lit.
eturquin Sep 23, 2020
8e6ef82
Added clamping on cam ray misses with vol scattering.
eturquin Sep 23, 2020
e55ab5b
Minor tweaks.
eturquin Sep 23, 2020
0b7c2e2
Added support for box and pyramid point lights.
eturquin Sep 25, 2020
ff6005a
Merge branch 'HDRP/staging' into HDRP/pt_pointlightmodes
eturquin Sep 25, 2020
b72d000
Merge branch 'HDRP/pt_pointlightmodes' into HDRP/volmerge3
eturquin Sep 25, 2020
f886432
Merge branch 'HDRP/staging' into HDRP/pt_pointlightmodes
eturquin Oct 2, 2020
68ad43e
Updated changelog.
eturquin Oct 2, 2020
3d6e3d4
Merge branch 'HDRP/pt_pointlightmodes' into HDRP/pt_volmerge3
eturquin Oct 2, 2020
cdcdd65
Added vol light intensity multiplier support.
eturquin Oct 2, 2020
9518789
Merge branch 'HDRP/staging' into HDRP/pt_volmerge3
eturquin Oct 6, 2020
1d5560d
Added support for box and pyramid spot lights.
eturquin Oct 7, 2020
f0a2e4d
Merge branch 'HDRP/staging' into HDRP/pt_volmerge3
eturquin Oct 7, 2020
be03809
Updated Changelog.
eturquin Oct 7, 2020
99237b1
Merge branch 'HDRP/staging' into HDRP/pt_volmerge3
eturquin Oct 13, 2020
00f7a58
Reverted unwanted changes to diffusion profile asset.
eturquin Oct 13, 2020
909f261
...
eturquin Oct 13, 2020
6718735
FFS
eturquin Oct 13, 2020
e65de57
Added better path tracing support in shader graph.
eturquin Oct 14, 2020
c30c3f3
Merge branch 'HDRP/staging' into HDRP/pt_volmerge3
eturquin Oct 14, 2020
2db05b4
Fix PT directional light activation for null radius.
eturquin Oct 14, 2020
9c52ff4
Updated png reference images, to account for sampling seq changes.
eturquin Oct 14, 2020
754d624
Merge branch 'master' into HDRP/pt_volmerge3
eturquin Oct 23, 2020
53801e3
Merge branch 'master' into HDRP/pt_volmerge3
sebastienlagarde Oct 24, 2020
aece7cc
Merge branch 'master' into HDRP/pt_volmerge3
sebastienlagarde Oct 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Changelog
hangelog
All notable changes to this package will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
Expand Down Expand Up @@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added support for camera relative ray tracing (and keeping non-camera relative ray tracing working)
- Added a rough refraction option on planar reflections.
- Added scalability settings for the planar reflection resolution.
- Added fog volumetric scattering support for path tracing.

### Fixed
- Fixed several issues with physically-based DoF (TAA ghosting of the CoC buffer, smooth layer transitions, etc)
Expand Down
5 changes: 5 additions & 0 deletions com.unity.render-pipelines.high-definition/Runtime/Lighting/LightEvaluation.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef UNITY_LIGHT_EVALUATION_INCLUDED
#define UNITY_LIGHT_EVALUATION_INCLUDED

// This files include various function uses to evaluate lights
// use #define LIGHT_EVALUATION_NO_HEIGHT_FOG to disable Height fog attenuation evaluation
// use #define LIGHT_EVALUATION_NO_COOKIE to disable cookie evaluation
Expand Down Expand Up @@ -582,3 +585,5 @@ void ApplyScreenSpaceReflectionWeight(inout float4 ssrLighting)
ssrLighting.rgb *= ssrLighting.a;
}
#endif

#endif // UNITY_LIGHT_EVALUATION_INCLUDED
5 changes: 5 additions & 0 deletions com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/CookieSampling.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef UNITY_COOKIE_SAMPLING_INCLUDED
#define UNITY_COOKIE_SAMPLING_INCLUDED

//-----------------------------------------------------------------------------
// Cookie sampling functions
// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -47,3 +50,5 @@ float3 SamplePointCookie(float3 lightToSample, float4 scaleOffset, float lod = 0

return SampleCookie2D(uv, scaleOffset, lod);
}

#endif // UNITY_COOKIE_SAMPLING_INCLUDED
5 changes: 5 additions & 0 deletions com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoopDef.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#ifndef UNITY_LIGHT_LOOP_DEF_INCLUDED
#define UNITY_LIGHT_LOOP_DEF_INCLUDED

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/CookieSampling.hlsl"

Expand Down Expand Up @@ -375,3 +378,5 @@ float3 GetScreenSpaceColorShadow(PositionInputs posInput, int shadowIndex)
float4 res = LOAD_TEXTURE2D_ARRAY(_ScreenSpaceShadowsTexture, posInput.positionSS, INDEX_TEXTURE2D_ARRAY_X(shadowIndex & SCREEN_SPACE_SHADOW_INDEX_MASK));
return (SCREEN_SPACE_COLOR_SHADOW_FLAG & shadowIndex) ? res.xyz : res.xxx;
}

#endif // UNITY_LIGHT_LOOP_DEF_INCLUDED
6 changes: 2 additions & 4 deletions com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLit.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,19 +1128,17 @@ Shader "HDRP/LayeredLit"

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Material.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracingLightLoop.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Lighting.hlsl"

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/ShaderPass/LitSharePass.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl"

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoopDef.hlsl"
#define HAS_LIGHTLOOP
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RayTracingCommon.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitRaytracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingLightLoop.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/LayeredLit/LayeredLitData.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RayTracingCommon.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitPathTracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassPathTracing.hlsl"

ENDHLSL
Expand Down
6 changes: 2 additions & 4 deletions com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,19 +1160,17 @@ Shader "HDRP/Lit"

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Material.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/ShaderVariablesRaytracingLightLoop.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Lighting.hlsl"

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/ShaderPass/LitSharePass.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl"

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoopDef.hlsl"
#define HAS_LIGHTLOOP
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitRaytracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingLightLoop.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RayTracingCommon.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitData.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Lit/LitPathTracing.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassPathTracing.hlsl"

ENDHLSL
Expand Down
4 changes: 3 additions & 1 deletion com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,9 @@ Shader "HDRP/Unlit"
#pragma raytracing surface_shader

#define SHADERPASS SHADERPASS_PATH_TRACING

#define HAS_LIGHTLOOP // Used when computing volumetric scattering
#define EMISSIVE_ONLY

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingMacros.hlsl"

Expand All @@ -617,7 +620,6 @@ Shader "HDRP/Unlit"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/RaytracingIntersection.hlsl"

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/Unlit.hlsl"

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Unlit/UnlitData.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/ShaderPassPathTracing.hlsl"

Expand Down
1 change: 1 addition & 0 deletions ...pipelines.high-definition/Runtime/RenderPipeline/PathTracing/Shaders/PathTracingBSDF.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef UNITY_PATH_TRACING_BSDF_INCLUDED
#define UNITY_PATH_TRACING_BSDF_INCLUDED

#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/PathTracing/Shaders/PathTracingSampling.hlsl"
#include "Packages/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/Raytracing/Shaders/SubSurface.hlsl"

#define DELTA_PDF 1000000.0
Expand Down
Loading