6b9ad1a2
Ported Legacy Unity procedural sky to HDRP and renamed our ProceduralSky to BlacksmithSky (pending removal)
7 年前
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 年前
30bdceed
- Properly integrated fog for transparent Lit/Unlit materials.
- Added density parameter for exp fog
7 年前
4a214e97
- Fixed shader compilation errors on PS4
- Fixed auto-merge mistake
- Renamed blend mode to more artists friendly names and removed SoftAdd mode.
7 年前
7e7d8661
HDRenderPipeline: Update UI and fog test scene
7 年前
c7d467a6
Merge pull request #505 from Unity-Technologies/Fix-fog-rough-refraction
Fix fog rough refraction
7 年前
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 年前
af7905e4
Update test scene and UI
7 年前
78752582
Merge pull request #506 from Unity-Technologies/Update-Transparent-code
Update fog and blend mode
7 年前
5e418eb0
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Fix-blend-mode
7 年前
27b99b20
Update blend mode and fix issue with UI
- Change alpha blend mode to One / InvSrc alpha and the multiplication
is done in the shader. Avoid precision issue
- Make a comment ApplyBlendMode function
- Update test scene
- Fix an issue with the UI and the Popup of blend mode
7 年前
f86a150a
Merge pull request #508 from Unity-Technologies/Fix-blend-mode
Update blend mode
7 年前
60296408
HDRenderPipeline: Update all material Keywords
7 年前
941020fc
HDrenderPipeline: Update test scene with no blend mode preserve specular lighting case
7 年前
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
3eb94be0
Update files to better match unity 2017.3
7 年前
2c9bfb4e
HDRenderPipeline: fix all material in current project
7 年前
fc5778fa
Merge pull request #655 from Unity-Technologies/Fix-all-material-in-project
HDRenderPipeline: fix all material in current project
7 年前
04b2dec6
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
7 年前
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
daaa1360
Update SkyFog test scenes with (disabled by default) volumes for fog and cleaned up some materials.
7 年前
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
d210135e
- Added HDShadowSettings component for volumes
- Removed all obsolete Scene/CommonSettings code
- Updated HDRP samples scene with new volume sky/fog settings and removed obsolete assets
7 年前
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
75d76261
Merge pull request #692 from Unity-Technologies/Branch_SkySettingsVolume
Refactor of sky and fog to use interpolation volumes.
7 年前
cfa07646
Merge branches 'master' and 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
78563feb
Merge branch 'master'
7 年前
2b24ec8c
Update all material
7 年前
7ab47949
Merge pull request #696 from Unity-Technologies/add-versionning-on-additonal-data
Add versionning on additonal data
7 年前
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
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 年前
2e30e761
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
87c36d52
merged with master
7 年前
f6a78dc5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
ad382e8e
Revert wrong commit and fix merge conflict indentation issues.
7 年前
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 年前
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 年前
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 年前
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
05efe29c
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
2fd0a788
HDRenderPipeline: Update all materials
7 年前
fbce26f6
Merge pull request #770 from Unity-Technologies/update-all-materials
HDRenderPipeline: Update all materials
7 年前
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
544aba56
Merge pull request #777 from Unity-Technologies/Branch_HeightMapParametrization
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
4b33a1b6
Merge branch 'master' into lw-gc-optim
7 年前
6ba9292e
Revered matrerial update after heightmap parametrization change.
7 年前
cdd44d73
Re-updated materials with new heightmap parametrization
7 年前
7f5f1c1a
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
37a266ac
Merge pull request #788 from Unity-Technologies/Branch_FixHeightMapUpdate
Branch fix height map update
7 年前
01b7d081
HDRenderPipeline: Update all materils keyword in scene and project
7 年前
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
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 年前
77f9f167
Merge branch 'master'
7 年前
3ccf74cc
merged from master
7 年前
4bef6509
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
3b815534
Merge commit 'ccee1ef8a8d0611355aaeace2c3530b65e34dfe0' into FixFix_TestFrameworkTools
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3004_CameraMotionVector_TranslateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3005_CameraMotionVector_TranslateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3006_CameraMotionVector_RotateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3007_CameraMotionVector_RotateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3008_CameraMotionVector_RotateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3009_CameraMotionVector_FOV.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector/SinMove.cs
# Te...
7 年前
7d2031ec
Merge branch 'master'
7 年前
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
86df6636
Merge master
7 年前
5f384459
HDRenderPipeline: Update all materials
7 年前
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
ca10cd2f
Merge
7 年前
c51ce48c
Merged master
7 年前
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
cf25c602
Merge master
7 年前
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
a28733e8
HDRenderPipeline: Update all materials
7 年前
2136ed15
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
0bfdddfc
Merge Screen Shadows
7 年前
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 年前
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
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 年前
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
ffbd199e
- Fixed objects motion vectors (they were upside down)
- Fixed some warnings
6 年前
ed3443be
Revert "- Fixed objects motion vectors (they were upside down)"
This reverts commit c85edb82a9a539fba719f345433b9e2a11134046.
6 年前
5f14b489
Update all materials with Last PR
6 年前
ce027b15
Merge pull request #947 from Unity-Technologies/Improve-forward-opaque-pass
Update all material for PR 946
6 年前
44c4a197
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
6 年前
e768893e
Merge branch 'master'
6 年前
d56ea57d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
6 年前
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
6 年前
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
04b933d9
merged with master
6 年前
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
6 年前
Julien Ignace
sebastienlagarde
GitHub
Sebastien Lagarde
Evgenii Golubev
Raymond Graham
Felipe Lira
Frédéric Vauchelles
Paul Melamed
Peter Andreasen
Robert Srinivasiah
Remy
Mike Wuetherick
lyndon homewood
Thomas
Arnaud Carre
John
Tim Cooper