sebastienlagarde
2610ae67
Move few files for better organization
7 年前
GitHub
c2005034
Merge pull request #866 from Unity-Technologies/Move-few-files
Move few files for better organization
7 年前
sebastienlagarde
2bae089c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
7 年前
Evgenii Golubev
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
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 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
sebastienlagarde
42c1a872
Add default value for HDRP shadow data
7 年前
sebastienlagarde
53ab337f
Update parameter name in InitDefaultHDAdditionalShadowData
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
GitHub
2376836c
Merge pull request #858 from Unity-Technologies/shadows-biasing
Shadows biasing
7 年前
Robert Srinivasiah
6626255e
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
sebastienlagarde
c4fab16a
Update shadow parameter in UI
7 年前
GitHub
cb7bd10f
Merge pull request #969 from Unity-Technologies/Update-shadow-param
Update shadow parameter in UI
7 年前
Thomas
44dd9f42
Merge branch 'master' into debug-menu-refactor
7 年前
Evgenii Golubev
2d48e00b
Merge branch 'master'
7 年前
Evgenii Golubev
3ad3c7d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前
Robert Srinivasiah
6f2b52f2
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
Manual fixup of some LightLoop stuff (stereo + decals living together in light cull data)
7 年前
Remy
2001df3c
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
sebastienlagarde
3ca4d227
Various update
7 年前
sebastienlagarde
fd14a7e5
More update
7 年前
Sebastien Lagarde
f4ef7018
Fix UI issue with gizmo of area light
7 年前
Sebastien Lagarde
861924c1
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
GitHub
29fc3c6e
Merge pull request #987 from Unity-Technologies/Add-physical-Light-unit-2
Add physical light unit
7 年前
Peter Bay Bastian
ba0ce030
Merge branch 'master' into integrate-sg-subshaders
7 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
Paul Melamed
6f570901
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
GitHub
47d42b36
Merge pull request #1 from Unity-Technologies/master
Merge from main
7 年前
sebastienlagarde
b25e74b2
Various light fix for HD
- Light was incorrectly initialize with physical light unit
- hide toggle default editor
- hide warning of reflection probe that spam the console
7 年前
sebastienlagarde
6d6c47f8
Fixed comment and typo about line light function/calculation
7 年前
Robert Srinivasiah
14e8b51f
Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前
sebastienlagarde
291c30a1
Various light fix for HD
- Light was incorrectly initialize with physical light unit
- hide toggle default editor
- hide warning of reflection probe that spam the console
7 年前
GitHub
51f6eb03
Merge pull request #1026 from Unity-Technologies/Various-light-fix-HD
Various light fix for HD
7 年前
sebastienlagarde
fc7ceeb5
Fixed comment and typo about line light function/calculation
7 年前
Paul Melamed
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
sebastienlagarde
f6393946
Fix bake area creation
7 年前
Aleksandr Kirillov
34c25f1b
Merge branch 'master' into LowEndPerf
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
7 年前
John Parsaie
0fe793d7
Merge 2018.1
7 年前
sebastienlagarde
58064ff2
Fix bake area creation
7 年前
GitHub
baa96d1a
Merge pull request #1045 from Unity-Technologies/Fix-bake-area-creation
Fix bake area creation
7 年前
sebastienlagarde
e6a439b8
More robust check at light creation (sanity check as we get report that problem may occur)
7 年前
Remy
cc4d54eb
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Felipe Lira
e630eecd
Merge branch 'master' into LW-Bugfix
7 年前
John Parsaie
40539650
Merge branch '2018.1' into projects/TheLastStand
7 年前
sebastienlagarde
0b2ddeb4
More robust check at light creation (sanity check as we get report that problem may occur)
7 年前
sebastienlagarde
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
7 年前
Evgenii Golubev
720c8a19
Merge branch 'master'
7 年前
Evgenii Golubev
dd8b51a8
Merge branch 'master'
7 年前
John Parsaie
73467192
Merge branch '2018.1' into projects/TheLastStand
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 年前
sebastienlagarde
82122b4d
fix fogbugz 989321
7 年前
GitHub
72eb8fea
Merge pull request #1140 from Unity-Technologies/fix-fogbugz-989321
fix fogbugz 989321 - Light broken when created as "Area" light
7 年前
Paul Melamed
d37105f2
Merge branch 'master' into decals/texture_atlas
7 年前
Mikko Strandborg
ed187777
Fix standalone builds: Light.lightmapBakeType is only available in the editor
7 年前
Paul Melamed
372a7582
fix script compile and pssl errors
7 年前
GitHub
7bfc3e85
Merge pull request #1146 from Unity-Technologies/fix-1145
Fix for issue 1145 and also fix standalone builds
7 年前
Frédéric Vauchelles
4f1b9eae
Merge branch 'master' into feature/PlanarReflectionUI
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/BufferPyramid.cs
7 年前
Frédéric Vauchelles
412bd010
Merge master
7 年前
Stephane Laroche
5ad6a9db
Merge branch 'master' into StackLitWork
7 年前
Evgenii Golubev
8d663ac4
Merge upstream/master
7 年前
Remy
9c0aa9c6
Add spot reflector option to modulate light intensity with spot angle.
7 年前
Remy
8fa08986
fix for PR
7 年前
Paul Melamed
5e4ad2d7
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
7 年前
GitHub
72f63df8
Merge pull request #1175 from Unity-Technologies/SpotReflector
Add spot reflector option to modulate light intensity with spot angle.
7 年前
Felipe Lira
65fc1c54
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted2.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader10.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader11.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader12.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader13.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader14.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader15.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader16.png.meta
# ScriptableRe...
7 年前
Evgenii Golubev
b4708ef6
Merge upstream/master
7 年前
Frédéric Vauchelles
4bd00e90
Merge master
7 年前
Evgenii Golubev
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Remy
256e6c9c
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_HiZ.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Proxy.mat.meta
# Tests/GraphicsTests/RenderPip...
7 年前
sebastien lagarde
3e16cb5d
Move SpotReflector in UI
Move SpotReflector in UI
7 年前
GitHub
f2f40b33
Merge pull request #1246 from Unity-Technologies/Move-SpotReflector-in-UI
Move SpotReflector in UI
7 年前
sebastien lagarde
9eddf969
HD: Fix scripting part of light intensity
7 年前
GitHub
2579ca2a
Merge pull request #1248 from Unity-Technologies/Fix-scripting-part-of-light-intensity
HD: Fix scripting part of light intensity
7 年前
GitHub
e358f5e9
Merge pull request #1249 from Unity-Technologies/Fix-scripting-part-of-light-intensity
HD: Fix scripting part of light intensity
7 年前
Evgenii Golubev
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Frédéric Vauchelles
8676f2e5
Merge master
7 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
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 年前
Evgenii Golubev
7d62d89f
Add a Volumetric Dimmer slider to lights to control the intensity of the scattered volumetric lighting
7 年前
GitHub
a334d0fc
Merge pull request #1312 from EvgeniiG/master
Add a Volumetric Dimmer slider to lights to control the intensity of the scattered volumetric lighting
7 年前
sebastienlagarde
86744235
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
Stephane Laroche
e0b3d217
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 年前
sebastienlagarde
30443854
Add support of per light shadow mask control
Add support of per light shadow mask control
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 年前
GitHub
06d2091a
Merge pull request #1383 from Unity-Technologies/Add-support-of-per-light-shadow-mask-control
Add support of per light shadow mask control
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
Tim Cooper
2c4a517b
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
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 年前
sebastienlagarde
32c9bff4
HDRP: Fix spot and dir gizmo issue with axis
7 年前
sebastienlagarde
e118502b
Misc various improvement
Add versionning on all HD asset (and correct previous way of doing it)
Add menu items for Density volume and planar reflection
Correctly do the naming for new created HD game object (Decal, scene settings...)
Change plane orientation of planar reflection from forward to up
Add new resource material: defaultHDMaterial
Do a small fix at runtime for GI (no impact)
7 年前
GitHub
e2c6895a
Merge pull request #1448 from Unity-Technologies/Various-workflow-improvement
Various workflow improvement + minor fix
7 年前
GitHub
51a1873e
Merge branch 'master' into update-changelog
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
Antoine Lelievre
43eed620
Add mesh filter and mesh renderer for emissive mesh on lights
7 年前
Antoine Lelievre
2828ae93
Added an enum field to change the light intensity unit
7 年前
Antoine Lelievre
33c68f5d
Add candela and luminance units for punctual and area lights
7 年前
Antoine Lelievre
94299904
Light intensity now works with timeline and animators
7 年前
Sebastien Lagarde
75993083
Fix issue with light intensity not matching area emissive mesh intensity + some renaming
7 年前
GitHub
3b7d93f1
Merge pull request #1585 from Unity-Technologies/EmissiveMeshForAreaLight
Emissive mesh for area lights
7 年前
Antoine Lelievre
a452a9db
Merge branch 'master' into LightUnits
7 年前
Antoine Lelievre
21feec05
Fixed a lot of bugs on light intensity and emissive mesh updates
- Fix light intensity not updated when light type changes
- Fix light unit with emissive mesh conversion value (do not convert luminance anymore)
- Fix emissive mesh transform changes in timeline
- Fix light intensity not updated when undo/redo
And added color temperature for emissive mesh color
7 年前
Antoine Lelievre
4beb4329
Fix light intensity update and nullref on undo
7 年前
Antoine Lelievre
f52ec0c8
Fixed undo/redo for area light shape and timeline area light shape record issue
6 年前
Antoine Lelievre
cc5c2a31
Cleanup code and reset HDRP asset to default
6 年前
GitHub
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
7 年前
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 年前
sebastienlagarde
432deee6
Fix convertion when in editor + fix color temperature with GI static
6 年前
sebastienlagarde
905e4624
Fix emissive mesh color
6 年前
GitHub
adaab50a
Merge pull request #1612 from Unity-Technologies/LightUnits
HDRP: Add extra Light units (Candela, Luminance)
6 年前
sebastienlagarde
acce4895
Merge branch 'master' into DisableFogWithDiffsueAndSpecularDebug
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 年前
sebastienlagarde
9d1cc626
Remove Editor-only code from the PS4 build
6 年前
Nerites
cc9ae6f7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Nerites
9b69a952
Merge xrconfig branch into xrsettings
6 年前
Antoine Lelievre
f32756be
Light unit upgrade workaround
6 年前
sebastien lagarde
cbe3ad9e
HDRP: Add more comment to the workaorund for light upgrade
6 年前
GitHub
309bef96
Merge pull request #1653 from Unity-Technologies/FixLightUnitUpgrade
Light unit upgrade workaround
6 年前
sebastienlagarde
b90ec54f
HDRP: Fix katana test
6 年前
RSlysz
8eb9fc52
coupling HDLight-Light reset workflow
6 年前
Antoine Lelievre
9d870530
Fix light intensity upgrade for disabled lights
6 年前
GitHub
a555bf87
HDRP: Add comment to light data
6 年前
RSlysz
a7c6f9bf
Fix Awake issue
6 年前
Antoine Lelievre
7a14ff21
Merge branch 'FixLightIntensityUpgrade2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into FixLightIntensityUpgrade2
6 年前
GitHub
b1e0d042
Merge pull request #1666 from Unity-Technologies/FixLightIntensityUpgrade2
Fix light intensity upgrade for disabled lights
6 年前
Julien Ignace
219daa3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Branch_FixPreIntegratedFGD
6 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
Nerites
86a99323
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Antoine Lelievre
34405216
Changed version in HDAdditionalLightData from float to int
6 年前
Antoine Lelievre
650d41df
Hide current version for HDAdditionalLightData
6 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
Jennifer Nordwall
0e161243
Renamed Area to Rectangle
We introduced a new light type (Disc) which is also an Area light. To make it less confusing, we decieded to rename Area to Rectangle.
6 年前
GitHub
1fbde3ba
Merge pull request #1691 from Unity-Technologies/IntVersionNumberForLightData
Changed version in HDAdditionalLightData from float to int
6 年前
GitHub
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
GitHub
3f424739
Merge pull request #1713 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
Stephane Laroche
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
Nerites
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
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 年前
Nerites
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
GitHub
80d748f5
Add light linking support ( #1758 )
* HDRP: Add support of light layering for forward (first draft)
TODO:
- Test instancing
- Check perf
- add an option to disable light layer support + in frameSettings
- add deferred rendering support (mean add an optional extra GBuffer)
* Add LightLinking support (version 1 - compile)
This PR add support of LightLayers feature.
To use it, setup mask renderingLayers on renderers and LightLayers on a lights. If a logical and of both give a non 0 value, the light is apply, otherwise it isn't.
This mean that by default LightLayers is 1 and RenderingLayers is 1. Then user can say LightLayers is only 2 and it will only affect renderingLayers with 2 or 3 mask value.
LightLayers require an extra GBuffer in deferred, mean it have extra bandwidth and memory cost.
LightLayers once enabled in HDRPAsset with SupportLightLayers can be control by FrameSettings. Mean a camera can enable extra RT only for an in game cinematic.
This PR refactor...
6 年前
GitHub
a2d7bf8d
Merge pull request #1759 from Unity-Technologies/Add-Light-Layers
Add light layers features
6 年前
GitHub
31e46703
Merge pull request #1761 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Remy
be0eb3c8
Merge branch 'master' into tests/hdrp/distortion
6 年前
Julien Ignace
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
Yao Xiaoling
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
Nerites
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
GitHub
7b744594
Merge branch 'master' into xrsettings
6 年前
Antoine Lelievre
41bdfac0
Add Ev into enums
6 年前
Antoine Lelievre
f41c533f
Moved area light convertion code to LightUtils
6 年前
Antoine Lelievre
f0d21faf
renamed EV to EV100
6 年前
GitHub
e9c0c3ef
Merge pull request #1797 from Unity-Technologies/EvIntensityForLights
Ev intensity for lights
6 年前
GitHub
6ec5b4df
Merge branch 'HDRP/staging' into IndirectLightingControlVolume
6 年前
GitHub
c3119430
Merge pull request #1803 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
Yao Xiaoling
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
GitHub
80401d99
Merge pull request #1710 from Unity-Technologies/lighting-arealigh-fixup
Renamed Area to Rectangle
6 年前
sebastienlagarde
f7078aa6
Merge branch 'master' into volume-texture-tool
6 年前
sebastienlagarde
b5fa681b
Merge branch 'master' into HDLightExplorerExtension
6 年前
Frédéric Vauchelles
ce4065fd
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
RSlysz
05f23629
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
egomeh
507df163
Merge branch 'master' into lw/light-attenuation
6 年前
sebastienlagarde
793cbb29
Move light Gizmo Drawing to core
6 年前
Julien Ignace
5c5547e8
Removed a bunch of GC.Alloc each frame.
6 年前
Paul Melamed
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
GitHub
bc502caa
Merge pull request #1855 from Unity-Technologies/Move-light-Gizmo-Drawing-to-core
Move light Gizmo Drawing to core
6 年前
Sebastien Lagarde
82c30969
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
GitHub
d2258e34
Merge pull request #1665 from Unity-Technologies/fix/coupling-hdlight-workflow
Fix/coupling Light-HDLight workflow waiting for a C++ PR #70472
6 年前
GitHub
f25dd24a
Merge branch 'master' into HDRP/staging
6 年前
GitHub
2befab52
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
6 年前
Julien Ignace
ab8c4439
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-gcalloc
6 年前
GitHub
e5d59bcd
Merge pull request #1864 from Unity-Technologies/HDRP/fix-gcalloc
Removed a bunch of GC.Alloc each frame.
6 年前
Paul Melamed
f1d163d5
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
6 年前
GitHub
3e6c15b0
Merge pull request #1870 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
sebastienlagarde
38a3e185
Merge branch 'master' into HDRP/add-LightLayer-in-probes
6 年前
egomeh
e7c59a70
Resolve merge conflicts
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前