Julien Ignace
6f585179
Implemented base of "Atmospheric Scattering" framework.
- AtmosphericScatteringXXX files where definition/editor and shader code of the fog functions are and that are used by any shader where fog is needed (full pass opaque fog, transparent forward materials...)
- Implemented basic linear/exponential fog with Uncharted 4 "Mip Sky" color fetch trick.
7 年前
Julien Ignace
30bdceed
- Properly integrated fog for transparent Lit/Unlit materials.
- Added density parameter for exp fog
7 年前
Julien Ignace
6b716493
Added global fog toggle.
7 年前
Julien Ignace
4a214e97
- Fixed shader compilation errors on PS4
- Fixed auto-merge mistake
- Renamed blend mode to more artists friendly names and removed SoftAdd mode.
7 年前
sebastienlagarde
36c0ec18
Add _BLENDMODE_ACCURATE_LIGHTING keyword - change _ENABLE_FOG to _ENABLE_TRANSPARENT_FOG
- rename _LinearFogOoRange as _LinearFogOneOverRange
- add _BLENDMODE_ACCURATE_LIGHTING keyword
- change _ENABLE_FOG to _ENABLE_TRANSPARENT_FOG
- update test scene
- fix issue with refractoinMask not correct by default- rename
_LinearFogOoRange as _LinearFogOneOverRange
- add _BLENDMODE_ACCURATE_LIGHTING keyword
- change _ENABLE_FOG to _ENABLE_TRANSPARENT_FOG
- update test scene
7 年前
GitHub
78752582
Merge pull request #506 from Unity-Technologies/Update-Transparent-code
Update fog and blend mode
7 年前
sebastienlagarde
5e418eb0
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Fix-blend-mode
7 年前
sebastienlagarde
bcd7b928
HDRenderPipeline: Add debug mode for SSAO/GTAO
7 年前
Remy
cffd854a
Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests
7 年前
GitHub
06f28ec2
Merge pull request #538 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
43d373d4
TODO: should we divide by ray segment length?
7 年前
Felipe Lira
e4ffdd2d
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Evgenii Golubev
d4501639
Clean up
7 年前
Paul Melamed
d31d3ab4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Peter Bay Bastian
9dd5e5c5
Change shader include paths to take advantage of Core being an include path now
7 年前
Evgenii Golubev
6f8ec8c3
Global rename: 'depthRaw' -> 'deviceDepth', 'depthVS -> linearDepth'
7 年前
Peter Bay Bastian
b7db3ef9
Merge branch 'shader-include-paths-2'
7 年前
GitHub
d6a58e9c
Merge pull request #594 from EvgeniiG/master
Reduce the number of dependent texture reads for SSS
7 年前
GitHub
1ba061ab
Revert " Reduce the number of dependent texture reads for SSS"
7 年前
GitHub
bcdbf637
Merge pull request #606 from Unity-Technologies/revert-594-master
Revert " Reduce the number of dependent texture reads for SSS"
7 年前
GitHub
39cb603c
Revert "Revert " Reduce the number of dependent texture reads for SSS""
7 年前
GitHub
b529a548
Merge pull request #607 from Unity-Technologies/revert-606-revert-594-master
Revert "Revert " Reduce the number of dependent texture reads for SSS""
7 年前
Frédéric Vauchelles
fe773302
Merge master
7 年前
Remy
39c80121
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Julien Ignace
1308feb1
Merge branch 'feature/realtimeCubemap' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
Evgenii Golubev
8ee2d44f
Merge 'master'
7 年前
Peter Andreasen
b6423cf9
merge
7 年前
Julien Ignace
10007208
Porting sky/fog systems to Interpolation volumes.
7 年前
Felipe Lira
e45df6b6
Merge branch 'master' into LightweightPipeline
7 年前
Peter Bay Bastian
14ac0ce2
Initial work on support assembly definition files
7 年前
Julien Ignace
7389ca21
Rewrote Sky/fog component with latest Volume APIs after merge.
7 年前
Paul Melamed
68425c93
Merge branch 'master' into prototype/decals
# Conflicts:
# SampleScenes/HDTest/GraphicTest/RealtimeCubemaps.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Peter Bay Bastian
981c0965
Assembly definition files + move various Editor folders into a common Editor folder (needed for assembly definition files)
7 年前
Julien Ignace
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Julien Ignace
033abbd6
More fixes with latest master.
7 年前
Evgenii Golubev
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Julien Ignace
b2315b94
Update default scene settings object creation to include exp fog and all relevant component.
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
Sebastien Lagarde
b8b6dd9b
Push second draft
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
Sebastien Lagarde
13eb066f
Fixed various issue and follow the deisng done with Julien. Working version
7 年前
GitHub
77ea5426
Merge pull request #688 from Unity-Technologies/Refactor-frameSettings
Refactor FrameSettings system
7 年前
Sebastien Lagarde
5f2183f6
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/ReflectionProbeEditor
7 年前
sebastienlagarde
2c5f3036
Update frame settings - adress various feedback
- Rename GlobalFrameSettings => RenderPipelineSettigs
- Remove various struct and put variables in RenderPipelineSettigs/FrameSettings directly
- Add better management of camera rename/disabling with debug menu
- Add EnableObjectMotionVector
7 年前
GitHub
e97ba4d0
Merge pull request #691 from Unity-Technologies/Update-FrameSettings
Update frame settings - adress various feedback
7 年前
sebastienlagarde
10b356c3
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-motion-vector-behavior
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/RenderPipeline/FrameSettings.cs
7 年前
Julien Ignace
c02d593d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/AtmosphericScattering/AtmosphericScattering.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
7 年前
Julien Ignace
b782a332
Update code with last merge changes and fixed some formatting issues.
7 年前
GitHub
75d76261
Merge pull request #692 from Unity-Technologies/Branch_SkySettingsVolume
Refactor of sky and fog to use interpolation volumes.
7 年前
sebastienlagarde
cfa07646
Merge branches 'master' and 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Evgenii Golubev
78563feb
Merge branch 'master'
7 年前
Evgenii Golubev
fc06d6c6
Move V-buffer sampling to AtmosphericScattering.hlsl
7 年前
Frédéric Vauchelles
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Paul Melamed
db6f48d8
Merge branch 'master' into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs
# ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl
7 年前
Peter Andreasen
87c36d52
merged with master
7 年前
Evgenii Golubev
016a51ff
Prepare the volumetric reprojection framework
7 年前
Evgenii Golubev
a013ecb1
Improve the reprojection quality
7 年前
sebastienlagarde
4b26e012
Move all core file to subfolder CoreRP + update shader include path to CoreRP/ShaderLibrary
7 年前
GitHub
3be07b99
Merge pull request #710 from Unity-Technologies/Move-Core-to-CoreRP
Move all core file to subfolder CoreRP + update shader include path t…
7 年前
Julien Ignace
713d15c0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
7 年前
sebastienlagarde
15efd9d7
Merge branch 'master' into Convert-shaderLibrary-to-half-float-support
7 年前
Frédéric Vauchelles
e239e312
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Evgenii Golubev
4d0996e2
Use HW trilinear filtering for V-Buffer sampling
7 年前
Evgenii Golubev
14a2be10
Implement biquadratic filtering of the volumetric lighting
7 年前
Evgenii Golubev
24634f16
Reduce the reliance on macros for sampling the V-Buffer
7 年前
Evgenii Golubev
389ea636
Move the volumetric lighting preset to ShaderConfig
7 年前
Evgenii Golubev
abd2e6a8
Factor out VBuffer code
7 年前
sebastienlagarde
c690cbed
HDRenderPipeline: Update correctly AtmosphericScattering.cs.hlsl
7 年前
GitHub
93b286e2
Merge pull request #731 from Unity-Technologies/Fix-wrong-generated-atmospheric-scattering.cs.hlsl
HDRenderPipeline: Update correctly AtmosphericScattering.cs.hlsl
7 年前
Robert Srinivasiah
0c9c55a9
Merge in master, with lots of fixups
Git hates merges + moves/renames.
Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager
7 年前
Evgenii Golubev
1f5d453d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
7 年前
Remy
ca0020dd
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/CommonSettings.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/HDRP_Test_Camera.prefab
7 年前
Paul Melamed
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
7 年前
Felipe Lira
c6543428
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances.meta
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances/Challenge-Brick.meta
7 年前
Mike Wuetherick
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
sebastienlagarde
b9b30507
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
GitHub
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
lyndon homewood
064d57c1
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/Common.hlsl
7 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
Evgenii Golubev
523323d4
Switch back to the regular alpha blending
7 年前
Evgenii Golubev
38e10475
Make the code less Italian by removing issues caused by copy-pasta
7 年前
Evgenii Golubev
170a4fb7
Make SampleInScatteredRadianceAndTransmittance() return transmittance
7 年前
GitHub
1461533c
Merge pull request #755 from EvgeniiG/volumetrics
Add the initial implementation of volumetric lighting
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Thomas
28f477a0
Cleanup & debug stuff
7 年前
sebastienlagarde
3ba5f5fc
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Frédéric Vauchelles
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
GitHub
d9a17bb3
Merge pull request #771 from Unity-Technologies/cleanup-misc
Small fixes, cleanup
7 年前
Sebastien Lagarde
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
lyndon homewood
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
Julien Ignace
43f6d6eb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
Julien Ignace
4919b7ad
Merge branch 'master' into Branch_ScreenSpaceShadows
# Conflicts:
# ScriptableRenderPipeline/Core/ShaderLibrary/Random.hlsl
# ScriptableRenderPipeline/Core/Shadow/AdditionalShadowData.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.Styles.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/DeferredDirectionalShadow.compute
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl
7 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Evgenii Golubev
7d2031ec
Merge branch 'master'
7 年前
Paul Melamed
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
Frédéric Vauchelles
86df6636
Merge master
7 年前
Julien Ignace
a533af44
Implemented height fog for linear and exponential fog.
7 年前
GitHub
67a7cae5
Merge pull request #821 from Unity-Technologies/Branch_HeightFog
Implemented height fog for linear and exponential fog.
7 年前
Julien Ignace
1a984f4b
Bundle of warning fixes.
7 年前
GitHub
a85fe8fe
Merge pull request #826 from Unity-Technologies/Branch_WarningFix
Bundle of warning fixes.
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
Frédéric Vauchelles
5f6876d6
Merge branch 'master' into feature/PlanarReflection
7 年前
John
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Paul Melamed
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
John
cf25c602
Merge master
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Evgenii Golubev
b60509c2
Move VBuffer.hlsl
7 年前
Evgenii Golubev
1ef2e80a
Use an improved (generalized) depth distribution
7 年前
GitHub
b5718762
Merge pull request #870 from EvgeniiG/master
Support asymmetry with reprojection
7 年前
GitHub
fe0284c8
Merge branch 'master' into HDRP_GraphicTests
7 年前
sebastienlagarde
6feb2d00
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
Paul Melamed
19876ed2
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
Frédéric Vauchelles
9db916f8
Merge branch 'master' into feature/PlanarReflection2
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
sebastienlagarde
48efe04c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
GitHub
655420d5
Merge pull request #881 from EvgeniiG/master
Use an improved (generalized) depth distribution
7 年前
sebastienlagarde
8f73bb93
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
Paul Melamed
3441b497
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
Remy
2136ed15
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Tim Cooper
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
John
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
John
0bfdddfc
Merge Screen Shadows
7 年前
Julien Ignace
950b560d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
sebastienlagarde
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Frédéric Vauchelles
672c909b
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta
# Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta
7 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Evgenii Golubev
fdd5cb7f
Ignore VBuffer scale
This means there is some fractional error if the screen size is not a multiple of 8 (or 4, depending on settings), but the error is typically less than 1%, so it's not very visible.
7 年前
GitHub
dc676759
Merge pull request #940 from EvgeniiG/fix_sss_radius_bug
Fix SSS radius bug (+ misc changes)
7 年前
sebastienlagarde
2bc6907f
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-forward-opaque-pass
7 年前
Remy
73141567
Merge remote-tracking branch 'origin/master' into MaterialUpgrader_Upgrade
7 年前
Remy
fa829be3
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode.unity.png
7 年前
Robert Srinivasiah
7427bb14
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Sebastien Lagarde
a60a0d5a
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
sebastienlagarde
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Julien Ignace
4b17c74c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling
# Conflicts:
# SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_10_5.mat
# SampleScenes/HDTest/Prefabs/Block_0.3x6.prefab
# SampleScenes/HDTest/Prefabs/Block_10x0.15.prefab
# SampleScenes/HDTest/Prefabs/Block_10x5.prefab
# SampleScenes/HDTest/Prefabs/Block_1x1.prefab
# SampleScenes/HDTest/Prefabs/Block_50x300.prefab
# ScriptableRenderPipeline/Core/CoreRP/Camera/CameraSwitcher.cs
7 年前
sebastienlagarde
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
Frédéric Vauchelles
d1dfdb4e
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# SampleScenes/HDTest/PlanarReflectionTests.unity
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebugPanel.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Evgenii Golubev
92ea5c34
Clean up VBuffer sampling
7 年前
Evgenii Golubev
e2795a17
Un-premultiply for color
7 年前
GitHub
8771660e
Fix incorrect clamping
7 年前
Evgenii Golubev
09ba8b07
Merge branch 'master' of https://github.com/EvgeniiG/ScriptableRenderLoop
7 年前
Evgenii Golubev
69dfe3f6
Switch to the volume system WIP
7 年前
Evgenii Golubev
e788c519
Port global density volumes to the interpolation volume system
7 年前
Evgenii Golubev
16866dfe
Fix numerical issues with the default volumetric fog mean free path
7 年前
GitHub
3a0290a2
Merge pull request #1225 from EvgeniiG/master
Port global density volumes to the interpolation volume framework (+ misc improvements)
7 年前
Stephane Laroche
8cf60948
Merge remote-tracking branch 'mainrepo/master' into stacklit
7 年前
Remy
9c81e0d8
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2102_GI_Emission.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2103_BakeMixed.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/9xxx_Other/9002_Deferr...
7 年前
Frédéric Vauchelles
d9f5b4f5
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Textures/RTHandleSystem.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/BufferPyramid.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyManager.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyRenderingContext.cs
7 年前
GitHub
fa52b6bd
Merge pull request #1255 from EvgeniiG/master
Enable volumetrics by default (+ bugfixes)
7 年前
sebastienlagarde
e03580d8
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
Raymond Graham
29eb0f1f
3D texture sampling in homogeneous volumes.
7 年前
Raymond Graham
667f9ee7
Adding support for 3D textures to mask local homogeneous fog volumes.
7 年前
Frédéric Vauchelles
8676f2e5
Merge master
7 年前
Evgenii Golubev
0be42a4f
Use correct terminology: rename "asymmetry" -> "anisotropy"
According to d'Eon, asymmetric scattering occurs due to anisotropic phase functions in anisotropic participating media.
7 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
7 年前
Evgenii Golubev
e7f0a6d1
Fix issues with light leaking in volumetric lighting
(due to sub-allocation (resource aliasing) of the RTHandle system)
7 年前
sebastienlagarde
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
7 年前
Stephane Laroche
10f8090a
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
7 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
7 年前
GitHub
6b174809
Merge pull request #1294 from Unity-Technologies/volumetric-lighting-updates
Adding 3D Texture support to the local fog volumes.
7 年前
sebastienlagarde
c24e9827
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
Evgenii Golubev
91dc696c
Merge upstream/master
7 年前
Frédéric Vauchelles
4bfaa623
merge master
7 年前
GitHub
c3aaee56
Merge pull request #1302 from EvgeniiG/master
Move the Volumetric Lighting system to the RTHandle system
7 年前
sebastienlagarde
05ee75ca
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
sebastienlagarde
01cd6f98
Add FrameSettings to hdCamera
7 年前
GitHub
17d5bb27
Merge pull request #1327 from Unity-Technologies/Add-FrameSettings-to-hdCamera
Add framesettings to hdcamera
7 年前
Stephane Laroche
e0b3d217
Merge branch 'master' into stacklit
7 年前
Sebastien Lagarde
f4660e9b
Add framesettings support to volumetric
7 年前
GitHub
1d661e75
Merge pull request #1334 from Unity-Technologies/Add-framesettings-support
Add enableVolumetric in the FrameSettings
7 年前
Jean-François F Fortin
a2ee3145
Merge branch 'master' into stacklit
7 年前
sebastienlagarde
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
7 年前
Felipe Lira
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Felipe Lira
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Evgenii Golubev
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Frédéric Vauchelles
3932faa4
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/CHANGELOG.md
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCameraFrameHistoryType.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Frédéric Vauchelles
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
Evgenii Golubev
327eed88
Change single scattering albedo defaults to 1
6 年前
Evgenii Golubev
381d8858
Add "Global Light Probe Dimmer" and tooltips for volumetrics
6 年前
Evgenii Golubev
f7ce098c
Add an option to the HDRP asset to increase the resolution of volumetric lighting
6 年前
GitHub
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
GitHub
87e8a616
Merge pull request #1609 from EvgeniiG/volumetrics_probe_dimmer
Add "Global Light Probe Dimmer" and tooltips for volumetrics
6 年前
GitHub
8dddca48
Merge pull request #1606 from EvgeniiG/kernel_quality_levels
Add an option to the HDRP asset to increase the resolution of volumetric lighting
6 年前
sebastienlagarde
7934a87a
Merge branch 'master' into LightUnits
6 年前
Paul Melamed
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
Remy
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
6 年前
Antoine Lelievre
832089b8
Disable fog when Diffuse, Specular and luxmeter debug modes are enabled
6 年前
sebastienlagarde
9f29886d
Update comment and changelog
6 年前
GitHub
4790e09b
Merge pull request #1617 from Unity-Technologies/DisableFogWithDiffsueAndSpecularDebug
Disable fog when Diffuse, Specular and luxmeter debug modes are enabled
6 年前
Matt Dean
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
Matt Dean
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
Stephane Laroche
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
Tim Cooper
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
Nerites
cc9ae6f7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Nerites
9b69a952
Merge xrconfig branch into xrsettings
6 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
GitHub
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
Nerites
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前