sebastienlagarde
ea867c72
HDRenderLoop: Remove Shaders folder and move all files at root + rename XXXDefault.shader to XXX.shader
8 年前
sebastienlagarde
f61b40c5
HDRenderLoop: Move editor thing in editor directory to be able to build a player
8 年前
Julien Ignace
28861e70
Prepared LayeredLit shader to allow switching mapping mode for each layer. Added planar mapping.
8 年前
sebastienlagarde
648bed87
HDRenderLoop: Push starter that doesn't compile
8 年前
Julien Ignace
50ac3b7d
Temporarily disable Layer Mapping combinations for compile time purpose.
8 年前
Julien Ignace
705c2c66
Added proper support for Vertex Color in LayeredLit shader.
8 年前
Sebastien Lagarde
ecc73ed7
HDRenderLoop: Add depth prepass +DepthPrepass for forward opaque
8 年前
sebastienlagarde
1225abd4
Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
sebastienlagarde
996cc98f
HDRenderLoop: Move FragInput is now global to share code + reorganise debug attributes
8 年前
sebastienlagarde
a919228a
Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL
8 年前
Julien Ignace
2d47017c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/LitData.hlsl
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/LitDebugPass.hlsl
8 年前
sebastienlagarde
6a1b6e2f
Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL
8 年前
Evgenii Golubev
290723c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into UpdateAreaLightImpl
8 年前
Julien Ignace
99b57d08
- Temporarily disabled "triplanar" in LayeredLit GUI (until it's implemented)
- Cleaned LayeredLit GUI a little.
8 年前
sebastienlagarde
0da561ce
Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL
8 年前
Julien Ignace
66069643
Re-enabled shader feature for mapping of LayeredLit shader (should be much faster to import now thanks Aras :) )
8 年前
sebastienlagarde
2591b2be
HDRenderLoop: fix issue with HeightMap
8 年前
Evgenii Golubev
a9ec88d9
Merge branch 'LineLights'
8 年前
Paul Demeulenaere
e7df382c
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitignore
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Editor/LitUI.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/Lit.cs
8 年前
Julien Ignace
442892e0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
Evgenii Golubev
f85c5fe4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Paul Demeulenaere
2b2b5808
Merge branch 'master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Editor/LitUI.cs
8 年前
joeante
84ff510c
Material Upgrader support first pass
Material Upgrader framework and specific implementation for Standard ->
HD Lit.
Only limited amount of properties are transfererred. More todo.
8 年前
sebastienlagarde
f15e0c7c
HDREnderLoop: First draft of new layeredLit shader
8 年前
Sebastien Lagarde
87a19817
HDRenderLoop: Large refactor to add Triplanar and detail map on LayeredLit
8 年前
Sebastien Lagarde
cb8aa00b
HDRenderLoop: Finish cleaning LayeredLit (some bug left)
8 年前
GitHub
85b19946
Merge pull request #21 from Unity-Technologies/LayeredLitShader
Refactor LayeredLit.Shader
8 年前
sebastienlagarde
c75df233
HDRenderLoop: LayeredLit Remove BlendMaskMap variant
8 年前
Julien Ignace
72b53eb8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
c4eb0aa1
Fixed vertex color mask for LayeredLit shader.
8 年前
Evgenii Golubev
b2ff5346
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
0eb1758a
Merge branch 'master' into SkySystem
8 年前
Paul Demeulenaere
16333450
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Paul Demeulenaere
14378632
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Julien Ignace
7e712073
Fixed LayeredLit detail maps and improved the LayeredLitTest scene.
8 年前
vlad-andreev
5b31375a
Merge branch 'MaterialUpdater' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Paul Demeulenaere
4f7e51fb
Split LitUI and UnlitUI with base class to share behavior with the MaterialGraph
8 年前
Evgenii Golubev
fc0cb9a4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into SkySystem
8 年前
GitHub
59bd5b18
Merge pull request #24 from Unity-Technologies/Split-LitUI-and-UnlitUI-with-BaseClass
BaseClass for LitUI and UnlitUI
8 年前
Paul Demeulenaere
ab48557b
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Evgenii Golubev
2df9af84
Merge branch 'SkySystem'
8 年前
Evgenii Golubev
80814477
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/SinglePass/SinglePass.hlsl
8 年前
Julien Ignace
668f9372
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/Editor/LayeredLitUI.cs
8 年前
Julien Ignace
2fc686ba
Synchronized properly texture scale/offset for layeredLit.
8 年前
Paul Demeulenaere
f44b8fd2
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitignore
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
Sebastien Lagarde
b835a78b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
dc9c16ef
Renamed "tex world scale" to "tiling" for planar/triplanar mapping.
8 年前
GitHub
fb30bf8c
Merge pull request #33 from Unity-Technologies/LayeredLit
Layeredlit
8 年前
runes
a5030aa0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
9ccb7b24
Fixed LayeredLit test scene for UV3 case (data was corrupted by Vertex Tool Pro...)
8 年前
sebastienlagarde
935b09ec
HDRenderLoop: Fix issue with tiled lighting, now working as before the refactor
8 年前
GitHub
b182eb4f
Merge pull request #35 from Unity-Technologies/Fix-Tiled-lighting
HDRenderLoop: Fix issue with tiled lighting, now working as before the refactor
8 年前
Evgenii Golubev
e7cb98c6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
462e7b4d
Merge branch 'master' into scriptablerenderloop-graphicssettings
8 年前
Paul Demeulenaere
267b0349
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
GitHub
2dd27005
Merge pull request #41 from Unity-Technologies/LayeredLit
Fixed LayeredLit test scene for UV3 case (data was corrupted by Vertex Tool Pro...)
8 年前
Sebastien Lagarde
d1bf008e
HDRenderLoop: Add distortion pass control + depth offset support
8 年前
GitHub
6b8997e6
Merge pull request #46 from Unity-Technologies/Add-distortion/DepthOffset
HDRenderLoop: Add distortion pass control + depth offset support
8 年前
sebastienlagarde
ad90df53
HDRenderLoop: Add mainTex scale bias on lit.shader and layeredLit.shader
8 年前
GitHub
e668399e
Merge pull request #50 from Unity-Technologies/Add-scale-bias-mainTex
HDRenderLoop: Add mainTex scale bias on lit.shader and layeredLit.shader
8 年前
sebastienlagarde
506d2826
HDRenderLoop: Add UV2 control
8 年前
Sebastien Lagarde
42aa5061
HDRenderLoop: Reduce the number of combinaison of layeredLit as it is not practical
8 年前
Sebastien Lagarde
2a400360
HDREnderLoop: fix an issue
8 年前
Sebastien Lagarde
d79f7fb8
HDRenderLoop: Some formatting
8 年前
GitHub
396c29de
Merge pull request #51 from Unity-Technologies/Add-uv2-control
HDRenderLoop: Add UV2 control
8 年前
Evgenii Golubev
8bbe4289
Merge remote-tracking branch 'upstream/master'
8 年前
Filip Iliescu
5da35f57
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
31325bbd
Fixed some missing keywords for LayeredLit shader.
8 年前
GitHub
deff790c
Merge pull request #60 from Unity-Technologies/LayeredLit
Fixed some missing keywords for LayeredLit shader.
8 年前
Julien Ignace
95bd4bde
First version of layered shader height blending.
8 年前
GitHub
8760c4f3
Merge pull request #65 from Unity-Technologies/LayeredLit
First version of Layered Lit shader height based blending.
8 年前
Tim Cooper
1ddcb9ee
Merge remote-tracking branch 'origin/master' into refactorentrypoint
8 年前
Julien Ignace
36d89c76
- Improved LayeredLit test scene.
- Added a menu item to re-synchronize all LayeredLit materials.
- Fixed some multi-editing issues with LayeredLit material.
8 年前
Julien Ignace
31df85eb
LayeredLit: Vertex colors now act as a height offset when using height based blend.
8 年前
Evgenii Golubev
1af099df
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into MIS
8 年前
sebastienlagarde
b890244e
HDRenderLoop: Rename the directory HDRenderLoop in HDRenderPipeline
8 年前
GitHub
23f2ee44
Merge pull request #71 from Unity-Technologies/Renaming-HDRenderLoop
Renaming hdrenderloop to hd renderPipeline
8 年前
sebastienlagarde
da1063e4
HDRenderPipeline: Move shader properties to a dedicated include file (request from demo team)
8 年前
GitHub
0a0c9298
Merge pull request #72 from Unity-Technologies/moveShaderPropertiesToInlcudeFile
HDRenderPipeline: Move shader properties to a dedicated include file (request from demo team)
8 年前
Felipe Lira
782077fb
Merge branch 'master' into lowendmobile
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
8 年前
Julien Ignace
0f63e44e
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
8 年前
GitHub
973d16b4
Merge pull request #73 from Unity-Technologies/LayeredLit
Layeredlit improvements
8 年前
Julien Ignace
9613bb46
- Added the possibility for material layers to inherit from the base layer normal map.
- Changed the way normal are handled in Lit/LayeredLit shader so that we could properly implement the point above (namely, GetSurfaceData now returns the tangent space normal instead of world space directly, this allows to blend them correctly for layered shader).
8 年前
sebastienlagarde
0d8aeb13
HDRenderPipeline: Add support for normal and detail normal scale
8 年前
GitHub
c51e0506
Merge pull request #75 from Unity-Technologies/Add-Normal-Scale
HDRenderPipeline: Add support for normal and detail normal scale
8 年前
Arnaud Carre
66610d8f
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
8 年前
Evgenii Golubev
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
c5bf4cfb
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitSurfaceData.hlsl
8 年前
sebastienlagarde
6521b4be
HDRenderPipeline: More rename of UnityEditor.Experimental.ScriptableRenderLoop + minor stuff
8 年前
Chman
fc2f9126
Merge remote-tracking branch 'refs/remotes/Unity-Technologies/master' into postfx-hack
8 年前
Julien Ignace
364394a6
Restored wrongly deleted code.
8 年前
GitHub
610b8d11
Merge pull request #79 from Unity-Technologies/LayeredLit
Layeredlit
8 年前
Evgenii Golubev
478a2e31
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
ff5e75b4
HDRenderPipeline: First draft of tesselation (not compiling)
8 年前
Julien Ignace
d74017b4
Fixed lit and layered lit shaders GUI binding (was wrong because of namespace changes)
8 年前
GitHub
0b99de23
Merge pull request #85 from Unity-Technologies/fix-lit-shader-GUI
Fixed lit and layered lit shaders GUI binding (was wrong because of namespace changes)
8 年前
Julien Ignace
dd7221d4
Fixed some shader warnings.
8 年前
GitHub
ce84e650
Merge pull request #86 from Unity-Technologies/fix-shader-warning
Fixed some shader warnings.
8 年前
sebastienlagarde
dbf04c5b
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-tesselation
8 年前
Julien Ignace
bdb225d7
Now vertex color is remapped between -1 and 1 and added to the mask map when using both at the same time for layered lit shader (instead of being multiplied)
8 年前
GitHub
82cd8f40
Merge pull request #88 from Unity-Technologies/Branch_layered-additive-vertexcolor
Branch layered additive vertexcolor
8 年前
Julien Ignace
a083a47e
Fixed previous CL for height scale bias handling. Shader code is not the same as what is shown in the interface (was causing weird GUI behavior)
8 年前
sebastienlagarde
b60bd965
HDRenderPipeline: Fix various issue with tesselatoin + depth offset
8 年前
GitHub
1bdb150d
Merge pull request #90 from Unity-Technologies/Branch_fix_height_amplitude
Fixed previous CL for height scale bias handling. Shader code is not the same as what is shown in the interface (was causing weird GUI behavior)
8 年前
sebastienlagarde
a6377673
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-tesselation
8 年前
sebastienlagarde
120fb435
HDRenderPipeline: First draft of tesselation, working for base layer only
need a big refactor, will change all code for performance but it is to
allow artists to work.
8 年前
sebastienlagarde
ae5b9db5
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-tesselation
8 年前
sebastienlagarde
3566a95a
HDRenderPipeline: Upgrade after Julien change
8 年前
GitHub
789af10a
Merge pull request #89 from Unity-Technologies/Add-tesselation
Add tesselation
8 年前
Julien Ignace
7b7eb3b4
Fixed a number of compilation issue with PS4.
8 年前
GitHub
a04d917d
Merge pull request #92 from Unity-Technologies/Branch_fix-ps4-hdrenderloop
Fixed a number of compilation issue with PS4.
8 年前
Julien Ignace
47800dae
Fixed a number of issues on PS4
- Some shaders not compiled for PS4
- Shaders testing depth when no depth buffer were bound (which works fine on DX11)
8 年前
Sebastien Lagarde
8f97c56c
HDRenderPipeline: Add Phong tesselation
8 年前
Sebastien Lagarde
83594dd2
HDRenderPipeline: Big renaming Tesselation => Tessellation
8 年前
Sebastien Lagarde
b60287f0
HDRenderPipeline: Make distance based edge factor (WIP, lot of thing to change)
8 年前
GitHub
52f8c9ce
Merge pull request #93 from Unity-Technologies/Improve-tessellation
HDRenderPipeline: Add Phong tesselation
8 年前
Evgenii Golubev
74657c39
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
886b32ec
HDRenderPipeline: update unlit shader
8 年前
GitHub
7f00e9f5
Merge pull request #96 from Unity-Technologies/Changed-transparent-opaque-Unlit-pass
Update unlit shader
8 年前
Felipe Lira
05e84b23
Merge branch 'master' into lowendmobile
8 年前
Sebastien Lagarde
fd23a655
HDRenderPipeline: Second part of modification still not compiling/working
8 年前
sebastienlagarde
3b0e1c97
HDRenderPipeline: Large refactor of all the pass attribute and varying system
8 年前
sebastienlagarde
53b5f4b3
HDRenderPipeline: Fixing a lot of compiling issue, all is now compiling
8 年前
Sebastien Lagarde
1cc45a08
HDRenderPipeline: Push various error and warning fix
8 年前
Sebastien Lagarde
fe9b2eb8
HDRenderPipeline: Format + another set of fix with displacement map
8 年前
GitHub
531082c1
Merge pull request #98 from Unity-Technologies/Vertex-interpolator-and-tesselation-improvement
Change Vertex / attributes / Interpolator management
8 年前
Sebastien Lagarde
f4f59ad1
HDRenderPipeline: Add distance and screen adapation + backface culling
miss frustrum culling
8 年前
GitHub
9a72bdd8
Merge pull request #99 from Unity-Technologies/Improve-tessellation-efficiency
HDRenderPipeline: Add distance and screen adapation + backface culling
8 年前
sebastienlagarde
e447e133
HDRenderPipeline: Fix tessellation issue with double sided
8 年前
GitHub
9b15b029
Merge pull request #101 from Unity-Technologies/Fix-for-two-sided-tessellation
HDRenderPipeline: Fix tessellation issue with double sided
8 年前
Julien Ignace
c83f3d4a
Merge branch 'master' into Branch_fix-ps4-hdrenderloop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Unlit/Unlit.shader
# Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/HDRISky/Resources/SkyHDRI.shader
# Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/ProceduralSky/Resources/SkyProcedural.shader
# Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/Resources/GGXConvolve.shader
8 年前
Julien Ignace
4ce76493
Added V2 of height base blend + inherit from base layer albedo option.
8 年前
sebastienlagarde
613a80ee
HDRenderPipeline; Add Pom test level
8 年前
GitHub
4ed323aa
Merge pull request #105 from Unity-Technologies/Add-POM-and-Tesselation-Test-Level
Add pom and tesselation test level
8 年前
Evgenii Golubev
8b521e10
Merge branch 'master' into SSSSS
8 年前
Juho Oravainen
4320bff0
Initial metal support kickoff. Tweaked shader pragma targets from 5.0 to 4.5. Added metal to only_renderers lists. Added initial platform header API/Metal.hlsl. Couple of include paths changed to absolute until a bugfix lands on Unity side.
8 年前
GitHub
89421bcf
Merge branch 'master' into metal
8 年前
GitHub
2ba6f819
Merge pull request #108 from Unity-Technologies/metal
Initial macOS Metal support for HDRenderPipeline + some iOS fixes in FTPL
8 年前
sebastienlagarde
e25f8c19
HDRenderPipeline: Add object scale
8 年前
GitHub
297cb6ad
Merge pull request #109 from Unity-Technologies/Add-object-scale-for-tessellation
Add object scale for tessellation
8 年前
sebastienlagarde
298c7695
HDRenderPipeline: Clean some code in Tessellation
8 年前
GitHub
272bdc72
Merge pull request #110 from Unity-Technologies/LayeredLit
Added V2 of height base blend + inherit from base layer albedo option.
8 年前
Evgenii Golubev
087242cd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
21be7561
Merge branch 'master' into SSSSS
8 年前
sebastienlagarde
50a39496
HDRenderPipeline: Batch of fix for tesselation shaders
8 年前
Tim Cooper
d4271c8c
Merge remote-tracking branch 'origin/master' into preview-cameras
8 年前
Tim Cooper
171302ee
Merge branch 'preview-cameras' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
Paul Demeulenaere
40290c81
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
8 年前
Evgenii Golubev
269e987f
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
810afcf1
HDRenderPipeline: Update layered material
8 年前
GitHub
ecd950f5
Merge pull request #118 from Unity-Technologies/Update-layered-material
HDRenderPipeline: Update layered material
8 年前
sebastienlagarde
24f0a144
HDRenderPipeline: Move Density/opacity of Layered material in standard mode
8 年前
sebastienlagarde
e0d3ad66
HDRenderPipeline: Quix fix about HeightBlend mode v2 for layered material
8 年前
Sebastien Lagarde
408e09aa
HDREnderLoop: Fix cluster lighting + rename base layer to main layer
- Cluster opaque is working but cluster transparent is not working
- Change name base layer to Main layer influence
- Clean some unused code
8 年前
Sebastien Lagarde
da3da19b
HDRenderPipeline: Attempt to fix cluster rendering
8 年前
GitHub
58e4eacd
Merge pull request #120 from Unity-Technologies/Enable-Cluster-rendering
Enable cluster rendering
8 年前
Tim Cooper
8ff712ff
Merge branch 'master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Sky/ProceduralSky/ProceduralSkyRenderer.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Utilities.cs
8 年前
sebastienlagarde
ada64deb
HDRenderPipeline: Add tiling paramater for layered
8 年前
GitHub
342f3efc
Merge pull request #121 from Unity-Technologies/Add-tiling-paramater-for-layered
Add tiling paramater for layered
8 年前
Arnaud Carre
2cdff1ec
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset.meta
# Assets/TestScenes/HDTest/HDRI.meta
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectSettings.asset
8 年前
sebastienlagarde
ffb6c390
HDRenderPipeline: Update layered material based on artists feedback
8 年前
sebastienlagarde
55b83cf2
HDRenderPipeline: Second update for artists - layered shader
8 年前
Tim Cooper
d608f760
Merge remote-tracking branch 'origin/master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
sebastienlagarde
b8002a40
HDRenderPipeline: Fix layered material
8 年前
sebastienlagarde
48a18cb1
HDRenderPipeline: Fix shader warning + ligth limits
8 年前
GitHub
49a063c5
Merge pull request #125 from Unity-Technologies/Fix-shader-warning-+-light-limits-corruption
HDRenderPipeline: Fix shader warning + ligth limits
8 年前
Felipe Lira
be52007a
Merge branch 'master' into lowendmobile
8 年前
sebastienlagarde
8a6b2cf1
HDRenderPipeline: Update unlit shader
8 年前
GitHub
28357983
Merge pull request #126 from Unity-Technologies/Update-unlit-shader
HDRenderPipeline: Update unlit shader
8 年前
Tim Cooper
a1e72bda
Merge remote-tracking branch 'origin/master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePassResources.cs
8 年前
Evgenii Golubev
ac23a82e
Merge branch 'master' into SSSSS
8 年前
sebastienlagarde
4b4a4435
HDRenderPipeline: Add horizon based specular occlusion
8 年前
GitHub
e78502fa
Merge pull request #127 from Unity-Technologies/Add-Horizon-based-spec-occlusion
HDRenderPipeline: Add horizon based specular occlusion
8 年前
Evgenii Golubev
9fc5bc97
Fix typos
8 年前
Evgenii Golubev
3d558256
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
0ca79425
Merge branch 'SSSSS'
8 年前
GitHub
d00136e3
Merge pull request #128 from EvgeniiG/master
Add the initial implementation of SSS
8 年前
Julien Ignace
df95d960
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs
8 年前
sebastienlagarde
b2595e70
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
sebastienlagarde
9cecdb2e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
sebastienlagarde
b7ce99a8
HDRenderPipeline: Push draft not compling
8 年前
runes
3b9f1e7d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Sebastien Lagarde
c4c5cfb5
HDRenderPipeline: Third draft not working
8 年前
Sebastien Lagarde
70821b88
HDRenderPipeline: First compiling version
8 年前
Sebastien Lagarde
aa453c68
HDRenderPipeline: Fix several problem - POM working with layered and lit planar
8 年前
GitHub
1b201c94
Merge pull request #136 from Unity-Technologies/Update-POM-+-Heightmap-behavior
Updating Layered shader
8 年前
Julien Ignace
e39df9e7
Fixed BakedLighting in debug lighting mode and properly implemented them for forward shaders.
8 年前
Julien Ignace
b21da003
Added Lighting debug passes for Tessellation shaders.
8 年前
sebastienlagarde
096f6f33
HDRenderPipeline: Add BlendMask tiling support
8 年前
GitHub
ee6a8dfe
Merge pull request #139 from Unity-Technologies/Branch_DebugLighting
Fixed BakedLighting in debug lighting mode and properly implemented them for forward shaders.
8 年前
Evgenii Golubev
c13b75bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
66d474dd
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-Blend-Mask-Tiling-param
8 年前
Chman
1d022582
Merge remote-tracking branch 'refs/remotes/origin/master' into postfx-temp
8 年前
GitHub
9e9fcce9
Merge pull request #143 from Unity-Technologies/Add-Blend-Mask-Tiling-param
Add blend mask tiling param
8 年前
Arnaud Carré arnaud@unity3d.com
ca6b7f62
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching.meta
# Assets/BasicRenderBatching/LightingBatching.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderLoop/HDRenderPipeline/PostProcess/Resources/Textures.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/CascadedShadowsTest.meta
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GraphicTest/Two Sided/Prefabs/Materials.meta
# Assets/TestScenes/HDTest/Leaf.meta
# Assets/TestScenes/HDTest/Leaf/GroundLeaf.meta
8 年前
Arnaud Carre
89d05b25
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
8 年前
sebastienlagarde
79986910
HDRednerPipeline: separate uvmapping for blend mask
8 年前
GitHub
d7f0af3d
Merge pull request #148 from Unity-Technologies/Separate-blend-mask-UV-mapping
HDRednerPipeline: separate uvmapping for blend mask
8 年前
sebastienlagarde
f3b40a2b
HDRenderPipeline: Add support for object scale affecting tiling for layered material
8 年前
GitHub
56246180
Merge pull request #149 from Unity-Technologies/Add-object-scale-affect-tiling-support
HDRenderPipeline: Add support for object scale affecting tiling for layered material
8 年前
sebastienlagarde
34b7b8f2
Merge remote-tracking branch 'refs/remotes/origin/master' into POM-cleanup
8 年前
Sebastien Lagarde
a1e0f1e9
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline
- Rename all "loop" name to "pipeline" name for FPTL/Basic/HD
- Update all include in HDRenderPipeline to match C++ #include path that
is Asset/ScriptableRenderPipeline
Caution: This PR require the new C++ code
8 年前
GitHub
f67aaaa4
Merge pull request #152 from Unity-Technologies/Rename-ScriptableRenderLoop-folder
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline (Need to update C++)
8 年前
Sebastien Lagarde
ab900a3a
HDRenderPipeline: Allow different keyword by layers
- Add keywork normal, specularocclusion, detailmap, mask to layered
shader
- Remove smoothness in alpha option
- Remove code related to detail heightmap
- Remove the restriction on GUI of layered lit layer 1, 2, 3 matching
layer 0
8 年前
Sebastien Lagarde
68f6880e
HDRenderPipeline: Cleanup GUI for lit and layered lit material
- reorganize attributes
- remove inputs options
- Add SkyBox/Cubemap to the project
8 年前
GitHub
554a5c02
Merge pull request #153 from Unity-Technologies/Layered-Lit-Clean-and-update-UI
Layered lit clean and ui update
8 年前
uygar
c8a27740
Merge branch 'master' into shadows
8 年前
runes
2ce17b6c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
e13205b5
HDRenderPipeline: Change two sided options
Remove all variant of two sided, let double sided mirror for lit
material and double sisded for unlit
8 年前
GitHub
551cee1c
Merge pull request #155 from Unity-Technologies/Change-two-sided-option
HDRenderPipeline: Change two sided options
8 年前
Evgenii Golubev
ff92221a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
0905d0bc
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
8 年前
sebastienlagarde
8a5cbf10
HDRenderPipeline: Cleanup of inspectorUI code for LayredLit and Lit material
8 年前
Evgenii Golubev
bc7c95fb
Add stencil information to every LIT shader
8 年前
Evgenii Golubev
54a730be
Add stencil information to every LIT shader (2)
8 年前
Sebastien Lagarde
51b20e16
HDRenderPipeline: Fix issue with script updating all material + update test material
8 年前
Sebastien Lagarde
00cb67b6
HDRenderPipeline: Clean interface and update UnlitUI
8 年前
Sebastien Lagarde
0c007b69
HDRenderPipeline: Missing two files
8 年前
GitHub
ba1e0e65
Merge pull request #158 from Unity-Technologies/Cleanup-of-inspectorUI-code
Cleanup and update of Lit and Unlit UI
8 年前
Evgenii Golubev
967eec25
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
GitHub
29e588a8
Merge pull request #156 from EvgeniiG/master
Implement painted-thickness-based transmittance for SSS
8 年前
sebastienlagarde
ae6a348f
HDRenderPipeline: Fix issue with Layered not taking heightmap into account + add update script for mateial keywords
8 年前
sebastienlagarde
4f612260
HDRenderPipeline: Another set of fix for update material script + expose Horizon Fade to layered material
8 年前
Julien Ignace
7b4ab969
Merge branch 'master' into Branch_SceneSettings
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
8 年前
Evgenii Golubev
672495ee
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
28308271
Fix stencil values
8 年前
GitHub
24918600
Merge pull request #162 from EvgeniiG/master
Improve the SSS profile UI
8 年前
uygar
77102a68
Merge branch 'master' into shadows
8 年前
Sebastien Lagarde
0365d4e5
HDRenderPipeline: Change LayerUV to UVMapping + add keyword MAPPING_PLANAR
- added _LAYER_MAPPING_PLANAR0 keyword
- Planar mapping is now a shader feature
- Move all SampleLayer to to ShaderLibrary and rename LayerUV to
UVMapping
- Create an enum UVMappingType instead of using isPlanar / is Triplanar
- Move double/mirror sided function to materialUtilities
- Update a lot of materials in test scene
8 年前
GitHub
fd4b72d5
Merge pull request #166 from Unity-Technologies/normal-surface-gradient
Add Morten's Surface Gradient support
8 年前
Evgenii Golubev
a5c5f339
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Sebastien Lagarde
3f8a200e
HDRenderPipeline: Fix planar and triplanar + triplanar POM
8 年前
GitHub
2b3fa928
Merge pull request #168 from Unity-Technologies/Triplanar-POM
Fix planar/triplanar with normal map + POM Triplanar
8 年前
Arnaud Carre
3c290788
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/TestScenes/Big
# Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Lit_Emissive_Blue.mat
8 年前
runes
cb7bce50
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
9470df9a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
50485164
HDRenderPipeline: Add tessellation tile scale
8 年前
GitHub
d54fe697
Merge pull request #172 from Unity-Technologies/Tessellatoin-tile-scale
HDRenderPipeline: Add tessellation tile scale
8 年前
runes
84860a17
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Arnaud Carre
b38bced1
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
8 年前
Sebastien Lagarde
8ebbee62
HDRenderPipeline; Fix issue with tessellation and velocity pass + reformat
8 年前
Antti Tapaninen
bfd69072
Merge branch 'master' into metal-ios
8 年前
Antti Tapaninen
2cce2981
Merge branch 'master' into metal
8 年前
sebastienlagarde
4f43da2d
HDRenderPipeline: Add LOD cross fade (need C++ update)
8 年前
GitHub
464f63e0
Merge pull request #191 from Unity-Technologies/add-LOD-cross-fade
Add lod cross fade
8 年前
sebastienlagarde
ddd7d5d5
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
GitHub
86dbe5d8
Merge pull request #192 from Unity-Technologies/Update-To-relative-path
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
Rune Stubbe
e210fc3a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Antti Tapaninen
764e5269
Merge branch 'master' into metal-ios
8 年前
uygar
cefe8b15
Merge branch 'master' into shadows
8 年前
Felipe Lira
557acdfd
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/LowEndMobilePipeline/TestScenes/Materials.meta
# Assets/ScriptableRenderPipeline/Editor/MaterialUpgrader.cs
# Assets/TestScenes/HDTest/GraphicTest/LayeredTessellation/Material.meta
# Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Materials.meta
8 年前
Antti Tapaninen
0574ef6b
Merge branch 'master' into metal
8 年前
Tim Cooper
c30d33b8
[Format]Reformat via format.pl to match the new conventions
8 年前
Antti Tapaninen
a261aadf
Merge branch 'master' into metal-ios
8 年前
Antti Tapaninen
06aa5d1c
Merge branch 'master' into metal
8 年前
Julien Ignace
a58a777f
Added first version of vertex wind and a corresponding test scene.
8 年前
GitHub
5ae8a937
Merge pull request #207 from Unity-Technologies/Branch_WindV1
Added first version of vertex wind and a corresponding test scene.
8 年前
Evgenii Golubev
9d4c2988
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Antti Tapaninen
336f484e
Merge branch 'master' into metal-ios
8 年前
Arnaud Carre
66e32153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectVersion.txt
# ProjectSettings/QualitySettings.asset
8 年前
Antti Tapaninen
46f1a7cf
Merge branch 'master' into metal
8 年前
vlad-andreev
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
uygar
8db09493
Merge branch 'master' into shadows
8 年前
Filip Iliescu
6e428acc
Merge branch 'metal' into classicDeferredMobile
8 年前
Julien Ignace
83a7b5d3
Added a directionality parameter to the wind vertex animation.
8 年前
GitHub
407a1322
Merge pull request #224 from Unity-Technologies/Branch_WindImprovement
Added a directionality parameter to the wind vertex animation.
8 年前
sebastienlagarde
ed55ce8f
HDRenderPipeline: Clean debgu settings
- Merge debugViewMaterial with Lightingdebug mode into a DisplayDebug
(less pass)
- Clean debug code, remove useless file
8 年前
sebastienlagarde
79156ff3
HDRenderPipeline: Complete previous submit (github error)
8 年前
sebastienlagarde
67b47dd9
HDRenderPipeline: Fix misc issue introduce during the clean of debug mode clean
8 年前
uygar
d82162c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
8 年前
GitHub
c53cba39
Merge pull request #229 from Unity-Technologies/Clean-debug-settings
Clean debug settings
8 年前
Evgenii Golubev
42530415
Merge branch 'master'
8 年前
Julien Ignace
c31d6106
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.asset
8 年前
Sebastien Lagarde
58f36f39
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
8 年前
Evgenii Golubev
2da00de6
Set the ID of the SSS material to 0 and of the standard material to 1
8 年前
Evgenii Golubev
235b3f5e
Use the same stencil value for all non-SSS materials
8 年前
GitHub
78d7833b
Merge pull request #250 from EvgeniiG/material_id_update
Swap material IDs for a simpler stencil test configuration
8 年前
Evgenii Golubev
0d763678
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Filip Iliescu
3a226917
merged master
8 年前
Arnaud Carre
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
8 年前
sebastienlagarde
e93ed04c
HDRenderPipeline: Re-add "none" mode for double sided lighting
This may be use for hair card. Double sided mode now have none, mirror
and flip mode
8 年前
GitHub
1d2a75e7
Merge pull request #271 from Unity-Technologies/Fix-tangent-issue-and-update-double-sided
Fix tangent issue and update double sided
8 年前
Julien Ignace
9ba99a5b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
8 年前
Sebastien Lagarde
dee59c09
Merge branch 'master' into ssao-test
8 年前
Arnaud Carre
df0c1521
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/PostProcessing
8 年前
sebastienlagarde
5ea9464b
HDRenderPipeline: split normalOS property
8 年前
GitHub
a1884724
Merge pull request #279 from Unity-Technologies/Object-space-normal-improvement
Object space normal improvement
8 年前
Evgenii Golubev
ad3d47b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Filip Iliescu
dda281fd
Merge branch 'master' into classicDeferredMobile
8 年前
David Rogers
85744e59
Local merge
8 年前
David Rogers
36baac01
Revert "Local merge"
This reverts commit 05f9d2b94ae1d3a5f3e707ba4ad677e700a6fc55, reversing
changes made to f491bb59591c78736427ca92d2067f445f1630c5.
8 年前
Sebastien Lagarde
d06af446
HDrenderPipeline: Update stencil bits
- Add stencil bit usage
- Move stencil bit to LightDefinition class
- Rename the enum with RegularLighting and SplitLighting
- Update SSS code to better stencil test practice
8 年前
Filip Iliescu
9c290707
merge changes from remote to local branch
8 年前
GitHub
1b926dca
Merge pull request #286 from Unity-Technologies/Update-material-framework
Update material framework
8 年前
Evgenii Golubev
70499455
Switch to HDCamera matrices (WIP, shadows have not yet been fixed)
8 年前
Julien Ignace
205fb8de
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
8 年前
Arnaud Carre
d070d1b8
Merge branch 'master' into Branch_Batching2
8 年前
Evgenii Golubev
0a7924ff
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix
8 年前
Filip Iliescu
74f56073
create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere
8 年前
sebastienlagarde
a311adc9
HDRenderPipeline: Remove LegacyLayered and Performancecheck of shaders code
8 年前
Arnaud Carre
e9b3071e
Merge branch 'master' into Branch_Batching2
8 年前
Evgenii Golubev
5570c647
Merge branch 'master'
8 年前
Evgenii Golubev
08f93209
Use the legacy Unity matrices for shadow map rendering
8 年前
Evgenii Golubev
df0f7a32
Add SHADERPASS_SHADOWS
8 年前
uygar
4125f4e0
Disabling zclipping in shaders that have a shadowcaster pass.
8 年前
Evgenii Golubev
f9e8648f
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
c2f786f1
Merge branch 'master' of https://github.com/EvgeniiG/ScriptableRenderLoop into hdrp_matrix
8 年前
Evgenii Golubev
d8386bd4
Address the PR feedback
8 年前
GitHub
1fb45557
Merge pull request #318 from EvgeniiG/hdrp_matrix
Set HDRP matrices from scripts (except shadows)
8 年前
Filip Iliescu
cd024be6
Merge branch 'master' into OnTileDeferred
8 年前
Arnaud Carre
b7e36e2f
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl.meta
# Assets/TestScenes/HDTest/HDRenderLoopTest.meta
# Assets/TestScenes/HDTest/NewBatcherTest/skin.meta
8 年前
sebastienlagarde
2016f575
HDRenderPipeline: Move ShaderConfig.cs.hlsl to ShaderVariables.hlsl
7 年前
Evgenii Golubev
a04a82ab
Merge branch 'master'
7 年前
Arnaud Carre
ad0fb3d8
Merge branch 'master' into Branch_Batching2
7 年前
Julien Ignace
82232448
Renamed LayeredLit files to InfluenceLayeredLit
7 年前
Julien Ignace
719e0012
Renamed LayeredLit shaders and UI classes to InfluenceLayeredLit.
7 年前
Julien Ignace
7d46e579
"Simple" LayeredLit WIP
7 年前
Julien Ignace
9f664a03
- Removed "simple" layered lit.
- InlfuenceLayeredLit now shares UI with the Lit shader and displays it in foldouts for each layer.
7 年前
Filip Iliescu
28a25cc0
merged master
7 年前
Julien Ignace
f63d11a1
Removed baseColor influence threshold and minimum opacity parameters
7 年前
Julien Ignace
057a142d
New more "regular" version of height based blend.
7 年前
Julien Ignace
8f426d69
Removed "Use Density Mode" checkbox. Shader feature is now automatically deduced from the parameters of all layers.
7 年前
Julien Ignace
62abd97f
Added a separate map for influence mask.
7 年前
GitHub
590566d8
Merge pull request #364 from Unity-Technologies/Branch_RenameLayeredShader
Renamed LayeredLit shader to InfluenceLayeredLit
7 年前
Julien Ignace
cab7d520
Reverted InfluenceLayeredLit files to LayeredLit.
7 年前
Filip Iliescu
ac2b77ef
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Julien Ignace
4957c390
- Renamed InfluenceLayeredLitXXX classes back to LayeredLit
- Changing the number of layers no longer synchronize them all.
7 年前
GitHub
0dda7798
Merge pull request #375 from Unity-Technologies/Branch_RenameLayeredShader
LayeredLit refactor
7 年前
Evgenii Golubev
5bf0af64
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Felipe Lira
7d62ca8f
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
7 年前
runes
dd5838bd
sample game delta:
-FPS Mode (Render mesh with custom FOV)
-only PCF shadows with game specific limits
-Atmosphere y-offset property
7 年前
Peter Bay Bastian
a1133cd9
Update #includes of ShaderLibrary to new path
7 年前
GitHub
05ffcc95
Merge pull request #379 from Unity-Technologies/restructuring
Restructuring
7 年前
Felipe Lira
024a70fc
Merged master.
7 年前
Tim Cooper
e0e3492b
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Peter Bay Bastian
a4ea9ff8
Merge branch 'master' into prepare-filtering
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Julien Ignace
f0d202b1
Fixed UV Mapping mask for layered shader.
7 年前
GitHub
6b3902c9
Merge pull request #382 from Unity-Technologies/Branch_NewLayeredFix
Fixes for updated LayeredLit shader
7 年前
Felipe Lira
6d592a3d
Merge branch 'master' into LightweightPipeline
7 年前
sebastienlagarde
eacc4ecd
HDRenderPipeline: Update some comment in UI and code
7 年前
sebastienlagarde
c1c97c18
push draft
7 年前
Julien Ignace
9ddbd02b
Heightmaps are now parametrized with Min/Max values instead of amplitude.
7 年前
Julien Ignace
26608503
- "Opacity As Density" mode is now a checkbox
- Fixed Density mode when using Height based blend.
7 年前
GitHub
caa90067
Merge pull request #391 from Unity-Technologies/Branch_LitAndLayeredImprovements
Branch litandlayeredimprovements
7 年前
Julien Ignace
2d461ae1
Removed DetailMask and Emissive Mode.
- Detail mask is now always in the blue channel of the mask map
- Emissive is now EmissiveMap * EmissiveColor * lerp(1.0, Albedo, albedoAffectEmissive) with EmissiveMap being optional.
7 年前
GitHub
a7bad06d
Merge pull request #392 from Unity-Technologies/Branch_LitAndLayeredImprovements
Removed DetailMask and Emissive Mode.
7 年前
Julien Ignace
d2e6ad3c
Smoothness now has a min/max slider for remapping when a texture is provided (otherwise, the regular slider is still available).
7 年前
Sebastien Lagarde
f8e4f5df
Merge remote-tracking branch 'refs/remotes/origin/master' into bent-normal-and-specular-occlusion
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
Julien Ignace
d2441929
Unlocked UV sets for Layer0 and BlendMask for layered shader.
7 年前
Sebastien Lagarde
beedb90d
Add support for bent normal on lit and layered shader
Remove horizon fade as it is useless and produce artifact
7 年前
Julien Ignace
008bb5f3
Layered shader: Moved Material reference UI at the bottom and added the possibility to synchronize everything but the UV related properties of all the layers.
7 年前
GitHub
dd6ac2f3
Merge pull request #393 from Unity-Technologies/Branch_LitAndLayeredImprovements
Branch litandlayeredimprovements
7 年前
Sebastien Lagarde
22b1a958
Merge remote-tracking branch 'refs/remotes/origin/master' into bent-normal-and-specular-occlusion
7 年前
GitHub
77fe7881
Merge pull request #394 from Unity-Technologies/bent-normal-and-specular-occlusion
add bent normal support
7 年前
sebastienlagarde
93ab200c
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-multibounce-approximation-on-AO-
7 年前
Sebastien Lagarde
23bcdad7
add support of basic specular occlusion (intersection of cone)
7 年前
sebastienlagarde
05c7d851
Fix issue with last merge + make bent normal work
7 年前
GitHub
465a57d0
Merge pull request #396 from Unity-Technologies/specular-occlusion
Specular occlusion - draft
7 年前
Sebastien Lagarde
1641bba9
HDRenderPipeline: Fix various warning in csharp and shader
7 年前
sebastienlagarde
402645af
HDRenderPipeline: Update a variable name in layered shader UI based on feedback
7 年前
Peter Andreasen
a2e029a1
merge with master + a few samplegame fixes
7 年前
Julien Ignace
af05920d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DeferredDirShadow
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
# ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/RenderPipelineResources.cs
7 年前
Julien Ignace
9e3a6300
Fixed directional shadow for transparent shaders by adding the right defines.
7 年前
GitHub
02239cb4
Merge pull request #398 from Unity-Technologies/Branch_DeferredDirShadow
Branch deferreddirshadow
7 年前
Peter Andreasen
69c448b2
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Felipe Lira
e56800ee
Merge branch 'master' into LightweightPipeline
# Conflicts:
7 年前
Julien Ignace
36d8a5e0
Move Layered shader Material reference UI to the top and split the synchronize layer buttons in each layer.
7 年前
Julien Ignace
879855a5
Missing property in LayeredLitTessellation.shader
7 年前
GitHub
0e0ab9d7
Merge pull request #408 from Unity-Technologies/Branch_MoveMatRefUI
Move Layered shader Material reference UI to the top and split the sy…
7 年前
GitHub
c2e4fad0
Merge pull request #410 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Felipe Lira
68c6f48c
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Julien Ignace
60566108
Properly implemented Depth pre-pass in HDRP for Alpha tested geometry (do pre-pass with clip in the shader and then main pass without to avoid bypassing HiZ on GCN hardware)
7 年前
Peter Andreasen
867c8236
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Julien Ignace
bc57fd4a
Small fixes based on PR feedback
7 年前
GitHub
19d4cf14
Merge pull request #427 from Unity-Technologies/Branch_DepthPrepass
Branch depth prepass
7 年前
sebastienlagarde
771c8d04
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
Evgenii Golubev
ea499710
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
GitHub
d5b454e5
Merge pull request #429 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
b9915628
HDRenderPipeline: First draft of support of vertex displacement
7 年前
Julien Ignace
47674b38
- Added color to Material reference labels for LayeredLit Shader
- Changing material reference now no longer synchronize UVs info as well.
7 年前
GitHub
10e0fdad
Merge pull request #431 from Unity-Technologies/Branch_SmallLayerFix
- Added color to Material reference labels for LayeredLit Shader
7 年前
Evgenii Golubev
cf6b206c
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
sebastienlagarde
54f30000
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-support-of-vertex-displacement
7 年前
sebastienlagarde
5d0125b2
HDRenderPipeline: Rename diplacement to vertex displacement and add a per pixel dispalcement scale (not done)
- And expose debug display properties
7 年前
GitHub
4d5e7be6
Merge pull request #433 from Unity-Technologies/Add-support-of-vertex-displacement
Add support of vertex displacement
7 年前
GitHub
c540af87
Merge pull request #434 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
0f756112
HDRenderPipeline: Rename Use Opacity as density
7 年前
Julien Ignace
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
sebastienlagarde
b81f5db7
HDRenderPipeline: Change name of Opacity as Density as request by doc team
7 年前
sebastienlagarde
5a6d78c4
Update project from sratch
7 年前
Evgenii Golubev
84d9b5a3
Fix POM using the primitive size
7 年前
sebastienlagarde
cd5fd6d3
merge latest 2017.3
7 年前
Sebastien Lagarde
78609ffc
Merge branch 'Unity-2017.3' into YibingProject
7 年前
GitHub
1137cfb3
Merge pull request #441 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
df6297b3
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
7 年前
Thomas
076b0d65
Cleaned up unused usings
7 年前
Evgenii Golubev
6610eebb
Precompute '_InvPrimScale' and '_InvTilingScale'
7 年前
GitHub
89072748
Merge pull request #449 from Unity-Technologies/refactor-episode-2
Refactoring: Episode 2 - The Editor Strikes Back
7 年前
sebastienlagarde
71713559
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
GitHub
f49bc2d1
Merge pull request #450 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
a40f87a0
Clean/update for distortion + add a transparent depth prepass
- Rename All ForwardDisplayDebug to ForwardDebugDisplay
- Clean/factor code for distortion and SetEnablePass
- Add support for a RenderTransparentDepthPrepass (can be use for hair)
- Distortion pass is now consider as always a separate pass (no MRT
during particles rendering)
7 年前
Peter Andreasen
2ef7d649
merged with master
7 年前
Sebastien Lagarde
f62941c5
Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale
7 年前
Evgenii Golubev
8d403196
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Evgenii Golubev
ea93b8f4
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
GitHub
28e0a528
Merge pull request #452 from Unity-Technologies/Distortion-cleanup-and-transparent-depth-pass
Distortion cleanup and transparent depth pass
7 年前
sebastienlagarde
cb146691
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
7 年前
sebastienlagarde
551e98f0
Refactor the UI to have vertex, pixel and tessellation displacement
- This commit will break the data that use displacement
7 年前
sebastienlagarde
4c55d7e9
Merge pixel and vertex locak object scale, they are identical and the feature are mutually exclusive
7 年前
Sebastien Lagarde
30675a6f
HDRenderPipeline: LayeredLit - Remove layerTilingBlendMask parameter and replace it by propoer scale/bias attribute
- Remove layerTilingBlendMask parameter and replace it by propoer
scale/bias attribute from LayerBlendMask texture
- This also fix an issue with wrong tiling apply from layer0 on blend
mask
- Artists will require to report the ex-value of layerTilingBlendMask
to the new scale/bias, this must be done manually
7 年前
Felipe Lira
5f970d63
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
sebastienlagarde
2bfcb077
Push draft of layered lit work
7 年前
sebastienlagarde
956f0a26
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
7 年前
Sebastien Lagarde
0f381168
Fix issue with InvTilingScale not working with layered
7 年前
sebastienlagarde
6d6ac1f7
Change Range of DetailXXXScale parameter
7 年前
Sebastien Lagarde
77bd4a4c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-Scale-Seb
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
7 年前
GitHub
5ed5cb24
Merge pull request #464 from Unity-Technologies/Update-detail-texture-blend-formula
Update detail textures blend formula
7 年前
GitHub
8b761a36
Merge pull request #461 from Unity-Technologies/Add-Per-Pixel-Scale-Seb
Add per pixel scale seb
7 年前
sebastienlagarde
3946f7cd
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
7 年前
sebastienlagarde
9700ad93
Rename Displacement mode to more artists friendly name
7 年前
Sebastien Lagarde
3fec7c83
Update of the UI
Make it more clear that influence mask depends on mapping of UV0
7 年前
sebastienlagarde
7357d706
- Roolback to applyPerPixelDisplacement in litData + Add keyword _INFLUENCEMASK_MAP
7 年前
Sebastien Lagarde
5a035109
Add warning message inside the UI to prevent wrong mapping with Pixel displacement
7 年前
Sebastien Lagarde
1007f823
Working individual layer
7 年前
sebastienlagarde
3305fbf3
Merge remote-tracking branch 'refs/remotes/origin/Add-Per-Pixel-scale' into Add-Per-Pixel-Scale-Seb-Test
7 年前
GitHub
3f0ee0ec
Merge pull request #465 from Unity-Technologies/Add-Per-Pixel-Scale-Seb-Test
Add per pixel scale seb test
7 年前
GitHub
2002ee68
Merge pull request #466 from Unity-Technologies/Add-Per-Pixel-scale
Revamp of Parallax occlusoin mapping + depth offset
7 年前
Evgenii Golubev
86fe9ae4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
GitHub
6213cc0b
Merge pull request #470 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
22664053
HDRenderPipeline: fix missing _LinkDetailsWithBase attribute on Layered shader
7 年前
GitHub
17bdc932
Merge pull request #476 from Unity-Technologies/Unity-2017.3
Merge 2017.3
7 年前
Felipe Lira
cdc50657
Merge branch 'Unity-2017.3' into LightweightPipeline
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Peter Andreasen
e2332032
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Sebastien Lagarde
ff69034b
HDRenderPipeline: PRovide correct default value for Amplitude property of displacement
7 年前
Sebastien Lagarde
f3fffa10
HDRenderPipeline: Fix Distortion UI (Correctly replicate attribute on shader)
- Lit/LitTessellation have distortion
- LayeredLit/LayeredLitTessellation haven't
7 年前
GitHub
21c95ebc
Merge pull request #491 from Unity-Technologies/Fix-distortion-UI-issue
HDRenderPipeline: Fix Distortion UI (Correctly replicate attribute on shader)
7 年前
Frédéric Vauchelles
8814a24e
Updated shaders with transparency properties
7 年前
GitHub
4d41fcaa
Merge pull request #496 from Unity-Technologies/feature/transparentPrepass
Feature/transparent prepass
7 年前
sebastienlagarde
522098e8
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
Evgenii Golubev
350fd652
Fix broken includes
7 年前
Julien Ignace
1e8876bf
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForwardUnlit.hlsl
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 年前
Frédéric Vauchelles
025b17dc
Added pre refraction toggle in layered shader
7 年前
Julien Ignace
7da1ae05
Added "enable fog" parameter to layered shader.
7 年前
GitHub
6ef6a1b3
Merge pull request #503 from Unity-Technologies/Branch_FogAndProceduralSky
Branch fog and procedural sky
7 年前
sebastienlagarde
aa798d74
HDRenderPipeline: Remove useless _BLENDMODE_SOFT_ADD
7 年前
GitHub
2df3e46a
Merge branch 'Unity-2017.3' into feature/transparentSpecularBlending
7 年前
GitHub
6773024c
Merge pull request #504 from Unity-Technologies/feature/transparentSpecularBlending
Feature/transparent specular blending
7 年前
Sebastien Lagarde
cd755f87
Add _SURFACE_TYPE_TRANSPARENT keyword (so fog work with rough refraction)
7 年前
GitHub
c7d467a6
Merge pull request #505 from Unity-Technologies/Fix-fog-rough-refraction
Fix fog rough refraction
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 年前
sebastienlagarde
d33ee23f
more renaming
- Rename _EnableTransparentFog to _EnableFogOnTransparent
- Rename _BLENDMODE_ACCURATE_LIGHTING to
_BLENDMODE_PRESERVE_SPECULAR_LIGHTING
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 年前
Sebastien Lagarde
e435361c
HDRenderPipeline: Add support of SSS to LayeredLit
7 年前
GitHub
735db2ae
Merge pull request #509 from Unity-Technologies/Add-SSS-support-to-LayeredLit
HDRenderPipeline: Add support of SSS to LayeredLit
7 年前
Evgenii Golubev
733171ce
Merge branch 'Unity-2017.3'
7 年前
Frédéric Vauchelles
1e05f581
Merge Unity-2017.3
7 年前
GitHub
bd071d2c
Merge pull request #515 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Robert Srinivasiah
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
Felipe Lira
6ddf3f73
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Mikko Strandborg
a2a3c47b
Add vulkan to the list of only_renderers in all the shaders
7 年前
GitHub
18d42f5f
Merge pull request #524 from Unity-Technologies/vulkan
Vulkan support for scriptable renderpipe.
7 年前
sebastienlagarde
4287ed02
HDRenderPipeline: Split Lit and LayeredLit data file in several part to make it more readable
7 年前
GitHub
3ed7e798
Merge pull request #526 from Unity-Technologies/Refactor-Lit-shader
HDRenderPipeline: Split Lit and LayeredLit data file in several part to make it more readable
7 年前
Remy
cffd854a
Merge remote-tracking branch 'origin/Unity-2017.3' into Reorganize-HDRP-GraphicTests
7 年前
Julien Ignace
eb9b38db
Hack for GI to handle Alpha Test correctly: Filled the hard-coded property used by the GI system to resolve opacity with our own equivalent so that GI works correctly with alpha-test. Disabled for now for Unlit because of a name conflict.
7 年前
Evgenii Golubev
9e8db4ba
Add a thickness remap for the thickness map (on the material itself)
7 年前
GitHub
ffcd395f
Merge pull request #531 from EvgeniiG/Unity-2017.3
Add a thickness remap for the thickness map (on the material itself)
7 年前
GitHub
068e18e4
Merge pull request #532 from Unity-Technologies/Branch_FixPVROpacity
Hack for GI to handle Alpha Test correctly: Filled the hard-coded pro…
7 年前
sebastienlagarde
6c9a5ca6
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-refraction-cubemap-support
7 年前
sebastienlagarde
5fab912f
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Refactor-LightLoop-Glue-Code
7 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
GitHub
06f28ec2
Merge pull request #538 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
11388041
HDRenderPipeline: Add tile/scale uv control to emissive color map
7 年前
GitHub
0bf4e0e7
Merge pull request #547 from Unity-Technologies/Update-Emissive-color-with-tile/scale
HDRenderPipeline: Add tile/scale uv control to emissive color map
7 年前
GitHub
b6cf8abe
Merge pull request #549 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
uygar
20767512
Added programmatic control of depth clipping. Depth clipping is disabled for shadow cascades and enabled for everything else.
7 年前
GitHub
1886d3d6
Merge pull request #555 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
a1929730
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Character.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/ComplexMaterial/Textures.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/0xxx.meta
7 年前
sebastienlagarde
bc549388
HDRenderPipeline: Update Metapass to do correct ifdef test
7 年前
GitHub
9e651ebf
Merge pull request #558 from Unity-Technologies/Update-metapass
HDRenderPipeline: Update Metapass to do correct ifdef test
7 年前
sebastienlagarde
2d587903
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Sebastien Lagarde
36f3cfd4
merge unity 2017.3
7 年前
GitHub
64affbce
Merge pull request #559 from Unity-Technologies/Unity-2017.3
Unity 2017 3
7 年前
Sebastien Lagarde
69f19bc0
HDRenderPipeline: Add support of shadow mask (Disabled in 2017.3) - require C++ change
- Create clearColorAllBlack to have color with alpha channel with 0 for
clear.
- Add shadowmask and occlusion probe sampling functions
- Add various debug feature for shadow mask
- Refactor GBuffer manager
- Add SHADOWS_SHADOWMASK keyword to our various lit and debug shader
- In deferred, SHADOWS_SHADOWMASK add an extra GBuffer
- Create a BakeLightingData that contain bakeDiffuseLighting +
bakeShadowMask
- Update all lightLoop call with this new BakeLightingData struct, pass
it to EvaluateBSDF_XXX function
- Move #pragma multi_compile from .shader to pass that require it
(unsure if this save variant)
7 年前
GitHub
59ecf389
Merge pull request #563 from Unity-Technologies/prepare-code-for-shadowmask
HDRenderPipeline: Add support of shadow mask (Disabled in 2017.3) - require C++ change
7 年前
Evgenii Golubev
6e30e2d6
Merge branch 'Unity-2017.3'
7 年前
GitHub
aeb0b914
Merge pull request #565 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Salvador Jacobi
4bd00346
Merge branch 'master' into organize-menu-items
7 年前
Julien Ignace
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
Evgenii Golubev
d57bf9b9
Fix tessellation frustum culling, clean and optimize
7 年前
Evgenii Golubev
b452c309
Merge branch 'Unity-2017.3'
7 年前
Julien Ignace
220e0aff
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
GitHub
72c20791
Merge pull request #570 from EvgeniiG/Unity-2017.3
Fix cracks in tessellation
7 年前
GitHub
9ef5873f
Merge pull request #571 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
f9690423
HDRenderPipeline: Update UI for AO (Remap), Distortion (ScaleBias) and UnlitColor (UVs mapping)
7 年前
GitHub
25e3b085
Merge pull request #572 from Unity-Technologies/Update-various-UI
HDRenderPipeline: Update UI for AO (Remap), Distortion (ScaleBias) an…
7 年前
GitHub
569840ef
Merge pull request #573 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
6cea0d27
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
Evgenii Golubev
fdcd7680
Merge branch 'Unity-2017.3' of https://github.com/EvgeniiG/ScriptableRenderLoop into volumetrics
7 年前
Peter Andreasen
f052451a
merged from master
7 年前
Felipe Lira
e4ffdd2d
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Sebastien Lagarde
370d90c0
HDRenderPipeline: Fix various shader compiler warning
7 年前
Evgenii Golubev
d1c74bcb
Merge branch 'master'
7 年前
Julien Ignace
0a60dd2a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
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 年前
Evgenii Golubev
a3165a72
Merge branch 'master'
7 年前
Peter Andreasen
5d36f104
Merged master
7 年前
Peter Bay Bastian
9dd5e5c5
Change shader include paths to take advantage of Core being an include path now
7 年前
Sebastien Lagarde
ccb1518c
HDRenderPipeline: Re-enable option to have forward opaque cluster (for MSAA)
-reintroduce previously removed enabledFptlwhenCluster and rename it to
enableFptlForForwardOpaque
New rules are:
// Deferred opaque always use FPTL, forward opaque can use FPTL or
cluster, transparent always use cluster
// When MSAA is enabled, we only support cluster (Fptl is too slow with
MSAA), and we don't support MSAA for
7 年前
GitHub
894dac3c
Merge pull request #591 from Unity-Technologies/Remove-clustered-opaque-option
Update tile/cluster management for forward/deferred
7 年前
Peter Andreasen
1432e316
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Evgenii Golubev
7b797ff7
Merge branch 'master'
7 年前
Peter Bay Bastian
85e38a3c
Merge branch 'master' into shader-include-paths-2
7 年前
Sebastien Lagarde
8e92ddef
HDRenderPipeline: Remove multiply blend mode
- Multiply make it easy to do mistake (inf, negative number, NaN) and
prevent optimization like half res rendering or offscreen compositing
7 年前
GitHub
36c8a29b
Merge pull request #595 from Unity-Technologies/Remove-multiply-blendmode
Remove multiply blendmode
7 年前
Antti Tapaninen
355ac358
enable tess shaders for metal
7 年前
GitHub
8e4b370d
Merge pull request #596 from Unity-Technologies/metal
metal fixes
7 年前
Sebastien Lagarde
fd96ccd7
HDRenderPipeline: Add ColorMask0 to depth and shadow pass
7 年前
GitHub
3dfc1b66
Merge pull request #598 from Unity-Technologies/Add-ColorMask-0-to-depth-and-shadow-pass
HDRenderPipeline: Add ColorMask0 to depth and shadow pass
7 年前
Sebastien Lagarde
407e1d7d
Merge remote-tracking branch 'refs/remotes/origin/master' into Implement-depth-post-pass
7 年前
Evgenii Golubev
e84fe4b6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
sebastienlagarde
09427415
HDRenderPipeline: Remove comment
7 年前
Evgenii Golubev
6be2053b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Peter Bay Bastian
b7db3ef9
Merge branch 'shader-include-paths-2'
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
0ed1b80b
Global rename
positionSS -> positionNDC
unPositionSS -> positionSS
unTileCoord -> tileCoord
ComputeScreenSpacePosition() -> ComputeNormalizedDeviceCoordinates()
7 年前
GitHub
bd823915
Merge pull request #616 from EvgeniiG/master
Global rename
7 年前
Remy
c22205d7
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Evgenii Golubev
8ee2d44f
Merge 'master'
7 年前
Sebastien Lagarde
15b64fff
Replace SetKeyword by CoreUtils.SetKeyword
7 年前
GitHub
bb9d2f89
Merge pull request #628 from Unity-Technologies/update-SetKeyword-to-UnityEngine.Experimental.RenderingCoreUtils.SetKeyword
Replace SetKeyword by CoreUtils.SetKeyword
7 年前
Evgenii Golubev
228fd56b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Sebastien Lagarde
2d0640a5
Draft 2
7 年前
Remy
5b6ad5e8
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Frédéric Vauchelles
6541de0b
Merge master
7 年前
Peter Andreasen
b6423cf9
merge
7 年前
Sebastien Lagarde
13cec969
Make it work in full forward, fix other compil issue. Disney/Jimenez ok, transmission not working
7 年前
Robert Srinivasiah
ea2646a5
Merge remote-tracking branch 'origin/master' into xr-hdrp_options
Merge conflicts had to do with moved RenderingDebugSettings and TilePass->LightLoop rename
7 年前
Felipe Lira
e45df6b6
Merge branch 'master' into LightweightPipeline
7 年前
Peter Bay Bastian
14ac0ce2
Initial work on support assembly definition files
7 年前
GitHub
b04739d1
Merge pull request #641 from Unity-Technologies/Support-forward-SSS
Add support for forward sss
7 年前
Julien Ignace
256c35aa
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
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 年前
sebastienlagarde
0feb39a6
HDRenderPipeline: Add xboxone support
7 年前
Remy
5d52724a
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Felipe Lira
711a16fb
Merge branch 'master' into LightweightPipeline
7 年前
GitHub
4b15e9fc
Merge pull request #651 from Unity-Technologies/add-xbone-one-support
Add xbone one support
7 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
7 年前
sebastienlagarde
04b2dec6
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
7 年前
sebastienlagarde
2f16949c
HDRenderPipeline decals: Addressed PR feedback
7 年前
GitHub
bb442f25
Merge pull request #645 from Unity-Technologies/prototype/decals
Prototype/decals
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 年前
Evgenii Golubev
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
sebastienlagarde
d093aa76
Add EnableMotionVectorForVertexAnimation option on Lit shader
7 年前
sebastienlagarde
d032f5a2
Update all shader with correct stencil write mask
7 年前
GitHub
21a5d864
Merge pull request #694 from Unity-Technologies/Update-motion-vector-behavior
Update motion vector behavior
7 年前
sebastienlagarde
0491acf4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Evgenii Golubev
78563feb
Merge branch 'master'
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 年前
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 年前
Sebastien Lagarde
1d7b259e
HDRenderPipeline: Remove None mode of double sided
- IT have no sense and cause artifact
7 年前
Sebastien Lagarde
7330925f
Let Mirror at the same value as before, so less headhache with update material
7 年前
GitHub
1dff3972
Merge pull request #717 from Unity-Technologies/Remove-None-mode-of-double-sided
Remove none mode of double sided
7 年前
sebastienlagarde
d024e832
HDRenderPipeline: Fix issue with silouette selection
7 年前
GitHub
13c269f1
Merge pull request #720 from Unity-Technologies/Fix-issue-with-silhouette
HDRenderPipeline: Fix issue with silhouette selection
7 年前
Julien Ignace
f6a78dc5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
sebastienlagarde
a865a5ea
HDRenderPipeline: Remove vertex and pixel displacement on tessellation
7 年前
GitHub
bc5e73a0
Merge pull request #725 from Unity-Technologies/Remove-vertex-and-pixel-displacement-on-tessellation
HDRenderPipeline: Remove vertex and pixel displacement on tessellation
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 年前
Sebastien Lagarde
35500d91
Fix compil of layer shader - all graphic test green
7 年前
GitHub
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
Raymond Graham
e93f78ef
Bring over Instancing support to HDRP shaders.
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 年前
lyndon homewood
9b9d85af
Tidied up mip map debugging in shaders based on PR feedback
7 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
GitHub
74479f14
Merge pull request #757 from Unity-Technologies/Update-CheapClearCoat
Refactor clear coat to be more usable in game
7 年前
Sebastien Lagarde
c3a7633d
Rename SubsurfaceProfile to DiffusionProfile and SubsurfaceRadius to SubsurfaceMask
7 年前
GitHub
76304378
Merge pull request #758 from Unity-Technologies/Rename-Subsurface-Profile-=---Diffusion--profile
Update Subsurface profile
7 年前
Sebastien Lagarde
e059a00a
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Sebastien Lagarde
965b935f
Update UI accordindly, don't touch materialId yet
7 年前
Julien Ignace
05efe29c
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
sebastienlagarde
5c6016d5
Fix issue with layered shader
7 年前
Sebastien Lagarde
64caa505
Fix last issues, now pass green test and working material classification
7 年前
sebastienlagarde
97898a85
Move everything to bitfield
7 年前
sebastienlagarde
221cd4e1
Merge remote-tracking branch 'refs/remotes/origin/refactor-gbuffer-bitfield' into Refactor-GBuffer-with-material-feature
7 年前
Sebastien Lagarde
65173ac3
draft
7 年前
GitHub
19ff5eb4
Merge pull request #764 from Unity-Technologies/Refactor-GBuffer-with-material-feature
Rearrange GBuffer and material classification to switch to material features
7 年前
Frédéric Vauchelles
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Thomas
5a369878
Missed LayeredLit
7 年前
Sebastien Lagarde
f83a3287
Update of all shader to zwrite on
7 年前
GitHub
34136f65
Merge pull request #774 from Unity-Technologies/movecs-depth-fix
Fixed motion vectors not having any depth and rendering in "passthrough mode"
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 年前
GitHub
544aba56
Merge pull request #777 from Unity-Technologies/Branch_HeightMapParametrization
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
sebastienlagarde
c20bc336
Remove LIGHTMAP_OFF, DIRLIGHTMAP_OFF and DYNAMICLIGHTMAP_OFF keyword
7 年前
GitHub
a7ace80f
Merge pull request #782 from Unity-Technologies/Remove-LIGHTMAP_OFF-keyword
Remove LIGHTMAP_OFF, DIRLIGHTMAP_OFF and DYNAMICLIGHTMAP_OFF keyword
7 年前
Thomas
4b33a1b6
Merge branch 'master' into lw-gc-optim
7 年前
sebastienlagarde
7f5f1c1a
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
GitHub
ed6465fd
Merge pull request #749 from Unity-Technologies/feature/mip-debug
Added mip debug visualisation
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 年前
Kay Chang
42c358c5
Added Switch support for SRP sample project.
C# scripts modified to build without XR support on Switch.
7 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
sebastienlagarde
313ca6c5
Emissive color: add support for uv mapping selection
7 年前
Remy
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 年前
GitHub
6244dba8
Merge pull request #799 from Unity-Technologies/Add-uv-mapping-selection-for-emissive
Add uv mapping selection for emissive
7 年前
sebastienlagarde
4bae05ba
Merge remote-tracking branch 'refs/remotes/origin/master' into gpuInstancingSupport
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/LayeredLitData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/LitData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/LitProperties.hlsl
7 年前
GitHub
273faca1
Merge pull request #795 from Unity-Technologies/gpuInstancingSupport
Bring over Instancing support to HDRP shaders.
7 年前
Sebastien Lagarde
1ebf9456
Merge remote-tracking branch 'refs/remotes/origin/master' into FixFix_TestFrameworkTools
7 年前
Sebastien Lagarde
a79042e5
Merge branch 'master' into pr/798
7 年前
GitHub
9d3b9c14
Merge pull request #801 from Unity-Technologies/pr/798
Pr 798
7 年前
sebastienlagarde
52ad48ce
Update tessellation factor limit to 64
7 年前
GitHub
ea509246
Merge pull request #803 from Unity-Technologies/Update-tessellation-factor-limit-to-64
Update tessellation factor limit to 64
7 年前
Remy
2289f880
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/Scripts/Editor/GraphicTests/HDRenderPipeline/DebugViewController_Editor.cs.meta
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
4172199d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScreenSpaceShadows
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/Sphere/Sphere.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.meta
7 年前
Arnaud Carre
074f76bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into lwrp_batcher
7 年前
Sebastien Lagarde
61ca3c01
Replace all toggleOff by ToggleUI [2018.1.b4 feature]
7 年前
GitHub
4263f9df
Merge pull request #813 from Unity-Technologies/Replace-all-ToggleOff-by-ToggleUI--2018.1.b4-feature]
Replace all toggleoff by toggleui [2018 1 b4 feature]
7 年前
Remy
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Sebastien Lagarde
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Paul Melamed
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Frédéric Vauchelles
ca10cd2f
Merge
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
sebastienlagarde
f93d0245
Fix typo in material feature SSS
7 年前
GitHub
bfee2e9d
Merge pull request #836 from Unity-Technologies/Fix-issue-with-SSS-and-layering
Fix issue with sss and layering
7 年前
Paul Melamed
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
Sebastien Lagarde
b32a2d17
Merge remote-tracking branch 'refs/remotes/origin/master' into HDRP_GraphicTests
7 年前
Sebastien Lagarde
541ff0be
Split transmission and SSS
- Move IOR field to both transmission and specular
- Split transmission and SSS
- Still need to add the UI in the Lit/layeredLit interface
7 年前
GitHub
a0390c6e
Merge pull request #840 from Unity-Technologies/Update-SSS-and-transmission
Update sss and transmission
7 年前
Sebastien Lagarde
27bcab4c
HDRenderPipeline: Update SSS test and rename diffusion profile in layered lit
7 年前
Sebastien Lagarde
3fcd02ac
Update material feature debuggin
- Init materialFeatures during GBuffer pass to
MATERIALFEATUREFLAGS_LIT_STANDARD for coherency
- override output of materialFeatures in debug to be readable by color
picker
7 年前
GitHub
0d53d2a3
Merge pull request #841 from Unity-Technologies/Update-material-feature-debug
Update material feature debuggin
7 年前
Sebastien Lagarde
b9df7908
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
Remy
c3c7eec1
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity
7 年前
Sebastien Lagarde
a5003db5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/PlanarReflection
7 年前
sebastienlagarde
1d94ca60
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow
7 年前
John
cf25c602
Merge master
7 年前
sebastienlagarde
02e0282c
Add default decal material + add support dbuffer on lit material
Add DefaultDecalMaterial assign automatically when creating a decal
Add option to disable receiving of decal on materials
7 年前
GitHub
1f961a99
Merge pull request #849 from Unity-Technologies/prototype/decals_workflow
Don't check textures slots in decal material validation
7 年前
sebastienlagarde
10a938eb
Add support for transparent queue priority
7 年前
GitHub
4cb77cb7
Merge pull request #851 from Unity-Technologies/Add-transparent-priority-support
Add transparent priority support
7 年前
sebastienlagarde
2345a375
Rename transparentQueuePriority to transparentSortPriority
+ rename GeometryLast => OpaqueLast
7 年前
GitHub
7d86032b
Merge pull request #852 from Unity-Technologies/Add-transparent-priority-support
Add transparent priority support
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Remy
ae087b6d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
John
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Frédéric Vauchelles
d6743fba
Merge branch 'master' into feature/PlanarReflection
7 年前
John
3023e8c8
Merge Screen Space Shadows
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
sebastienlagarde
f966b1cd
First draft
7 年前
Julien Ignace
19029ddd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
sebastienlagarde
172e38d1
first draft
7 年前
sebastienlagarde
5d53f892
fix end of line issue
7 年前
sebastienlagarde
a762caad
Remove transmission mode, now there is only two (and no none mode)
7 年前
GitHub
c0bd137f
Merge pull request #882 from Unity-Technologies/Updating-UI-for-material-feature-ID
Updating UI for clear coat and transmission
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 年前
Paul Melamed
8668ed75
decals working on transparency
7 年前
Evgenii Golubev
19824028
Use ClampNdotV() everywhere except where vector addition/subtraction is involved
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
sebastienlagarde
3d4d194e
Debug display is now a multi compile option
7 年前
GitHub
14257e27
Merge pull request #909 from Unity-Technologies/debug-display-as-multicompile
Debug display is now a multi compile option
7 年前
Frédéric Vauchelles
78ba9e5b
Merge master
7 年前
Julien Ignace
22b0a3ac
Removed redundant(and broken) layered specific height offset.
7 年前
sebastienlagarde
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
GitHub
2c2b8b4d
Merge pull request #916 from Unity-Technologies/Branch_RemovedLayeredHeightOffset
Removed redundant(and broken) layered specific height offset.
7 年前
sebastienlagarde
2a18503e
First draft of SSS and Transmisison UI
7 年前
GitHub
4656dcdb
Merge pull request #919 from Unity-Technologies/Update-SSS-and-transmisison-UI
Update sss and transmisison ui
7 年前
Alex Lian
35f03c7a
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
Sebastien Lagarde
106566dc
Update the UI for iridescence
7 年前
Sebastien Lagarde
e2c88f24
update code
7 年前
John
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
John
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
7 年前
sebastienlagarde
301dbf72
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
7 年前
GitHub
3e753c62
Merge pull request #934 from Unity-Technologies/Improve-normal-shading
Improve normal shading
7 年前
Sebastien Lagarde
76cc874d
Re-introduce none case for double sided
7 年前
Sebastien Lagarde
4866a7dc
Fix missing coma
7 年前
GitHub
3b36aa0b
Merge pull request #936 from Unity-Technologies/support-none-case-for-doublesided
Support none case for doublesided
7 年前
sebastienlagarde
5e5e46c8
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Remy
619cd52e
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
35560656
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Paul Melamed
75b17fab
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/Decal.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/DecalUtilities.hlsl
7 年前
Evgenii Golubev
070349c8
Merge branch 'master'
7 年前
sebastienlagarde
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Tim Cooper
aeefe219
Merge branch 'master2' into LW-LightOptimizations
7 年前
sebastienlagarde
8a1d7457
Forward pass now control its depth test. Optimization with clip and depth prepass is only for Lit/layeredLit shader
7 年前
Robert Srinivasiah
7427bb14
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Sebastien Lagarde
dae7599d
Remove modification on convertSurfaceDataToBSDFData and EncodeToGBuffer
7 年前
sebastienlagarde
2522428b
Better default test
7 年前
Sebastien Lagarde
2ad2a458
Update IOR to be a mask map
7 年前
GitHub
bbd2c5ef
Merge pull request #946 from Unity-Technologies/Improve-forward-opaque-pass
Remove the constrain to have a depth prepass for a forward material
7 年前
sebastienlagarde
44c4a197
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
GitHub
f618fcd9
Merge pull request #944 from Unity-Technologies/support-iridescence
Add support for Iridescence in Lit
7 年前
Remy
d56ea57d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Robert Srinivasiah
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Thomas Hourdel
3236b136
Fixed mismatched line-endings warning
7 年前
GitHub
b33ffb82
Merge pull request #954 from Unity-Technologies/line-endings-warning
Fixed mismatched line-endings warning
7 年前
Robert Srinivasiah
2e77d205
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
sebastienlagarde
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Sebastien Lagarde
45283ab4
Adress iridescence PR feedback
7 年前
GitHub
2298dc56
Merge pull request #957 from Unity-Technologies/Adress-iridescence-PR-feedback
Adress iridescence pr feedback
7 年前
uygar
275279fa
Introduced new macros for flow control attributes.
7 年前
Robert Srinivasiah
2d5b988d
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
sebastienlagarde
e347d974
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
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 年前
GitHub
e8bd5bcf
Merge pull request #966 from Unity-Technologies/decals/clustered
Decals/clustered
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 年前
Evgenii Golubev
0a2033df
Merge upstream/master
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
sebastienlagarde
003ed8ce
Add pipeline subshader tags for HD
7 年前
sebastienlagarde
9630d754
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
7 年前
Matt Dean
938ae294
Add pipeline subshader tags for HD
7 年前
sebastienlagarde
2e64322b
Rename HDPipeline => HDRenderPipeline + Fix issue with decal.shader
7 年前
GitHub
41034aa7
Merge pull request #1016 from Unity-Technologies/pr/1014
Pr 1014
7 年前
Robert Srinivasiah
7733d48a
Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前
Paul Melamed
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
John Parsaie
0fe793d7
Merge 2018.1
7 年前
sebastienlagarde
35d83109
Commented out Single pass lighting to decrease shader compilation time.
7 年前
Felipe Lira
e630eecd
Merge branch 'master' into LW-Bugfix
7 年前
sebastienlagarde
0d28adac
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materials now always have a depth prepass.
7 年前
Julien Ignace
4c9ec94f
Commented out Single pass lighting to decrease shader compilation time.
7 年前
Felipe Lira
47a2960a
Merge branch 'master' into LW-Bugfix
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl
7 年前
GitHub
dce1ca66
Merge pull request #1064 from Unity-Technologies/Branch_RemoveSinglePassLighting
Commented out Single pass lighting to decrease shader compilation time.
7 年前
sebastienlagarde
88378544
Bring back dynamic branch for cluster/tile in forward to reduce the number of shader variant
- Bring back dynamic branch for cluster/tile in forward to reduce the
number of shader variant
7 年前
sebastienlagarde
fa95ec27
Reduce number of variant by bring back FPTL/CLuster choice with dynamic branch for forward
- Make selection between FPTL/Cluster in forward dynamic (with
_UseTileLightList)
- Remove USE_CLUSTERED_LIGHTLIST define, only use USE_FPTL_LIGHTLIST
- Remove #pragma multi_compile USE_FPTL_LIGHTLIST
USE_CLUSTERED_LIGHTLIST from LitXXX shader
7 年前
Julien Ignace
f00d20a6
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materials now always have a depth prepass.
7 年前
sebastienlagarde
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
7 年前
Evgenii Golubev
720c8a19
Merge branch 'master'
7 年前
GitHub
bd98e302
Merge pull request #1067 from Unity-Technologies/Branch_RemoveGBufferWithPrepass
Removed GBufferWithPrepass pass from lit*.shader. Alpha tested materi…
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 年前
Evgenii Golubev
a3e9bdfc
Improve the support of orthographic rendering
7 年前
Sebastien Lagarde
7fa77a07
Fix up layered lit materials with a subsurface mask map
7 年前
GitHub
08de75b2
Merge pull request #1135 from Unity-Technologies/Fix-up-layered-lit-materials-with-a-subsurface-mask-map
Fix up layered lit materials with a subsurface mask map
7 年前
Paul Melamed
ac77aad6
For opaques use decal diffuse alpha for all channels.
For transparent, if material alpha is less than decal alpha replace it with decal alpha.
7 年前
Raymond Graham
b987da15
Merge branch '2018.1' into projects/system-shock/2018.1
7 年前
GitHub
e34444b0
Merge pull request #1136 from Unity-Technologies/decals/alpha_refactor
For opaques use decal diffuse alpha for all channels.
7 年前
Paul Melamed
d37105f2
Merge branch 'master' into decals/texture_atlas
7 年前
Julien Ignace
ac765a69
- Fixed Layered material UI where Density As Opacity checkbox would not be shown in some cases
- Fixed Vertex Color handling in Depth/Velocity passes.
7 年前
GitHub
8358f08b
Merge pull request #1151 from Unity-Technologies/Branch_LayeredSmallFix
- Fixed Layered material UI where Density As Opacity checkbox would n…
7 年前
Stephane Laroche
42a50cf0
Merge branch 'master' into StackLitWork
7 年前
Frédéric Vauchelles
a39254c9
Merge branch 'master' into feature/RefractionModes
7 年前
Felipe Lira
35cef52a
Fixed shader include paths
7 年前
Felipe Lira
0a312f93
Some files were not saved in the editor and were missing from last commit.
7 年前
GitHub
1108f618
Merge pull request #1171 from Unity-Technologies/fix-shader-include-paths
Fix shader include paths
7 年前
Evgenii Golubev
8d663ac4
Merge upstream/master
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 年前
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 年前
Felipe Lira
e3f706be
Fix shader include case sensitiviness
7 年前
GitHub
e3cbd9c5
Merge pull request #1190 from Unity-Technologies/backport/fix-shader-includes
Fix shader include case sensitiviness
7 年前
Frédéric Vauchelles
4bd00e90
Merge master
7 年前
GitHub
858b64ad
Merge pull request #1197 from EvgeniiG/rename_unity_per_camera
Rename UnityPerCamera CBuffer variables (and set them from C#)
7 年前
Evgenii Golubev
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Yao Xiaoling
5639b1fc
Added Terrain shader and TerrainUI based on layered lit shader.
7 年前
Yao Xiaoling
9a2fed6e
Remove vertex wind animation.
7 年前
Yao Xiaoling
846b792e
Small fixes due to removal of vertex animation and transparent mode.
7 年前
Yao Xiaoling
9b87080c
Removed displacement mode.
7 年前
Yao Xiaoling
37aae303
Removed vertex color mode which was intended to alter the blend mask.
7 年前
Yao Xiaoling
ed866ff3
Renamed: Terrain -> TerrainLit. Added TerrainLitData.hlsl by duplicating LayeredLit.hlsl.
7 年前
Yao Xiaoling
479defc9
Remove other material features from terrain other than StandardLit.
7 年前
Yao Xiaoling
534a3864
Remove unused shader code. Compute terrain tangent in code.
7 年前
Yao Xiaoling
be7b742d
Remove per-pixel displacement related properties.
7 年前
Yao Xiaoling
3abb8dfa
Removed layer settings and material references.
7 年前
Yao Xiaoling
caf64a4f
Remove LayerCount. Treat as 4.
7 年前
Yao Xiaoling
4f246aa2
Rename: _LayerMaskMap -> _Control because the terrain uses it.
7 年前
Yao Xiaoling
59ed7708
Remove detail related properties.
7 年前
Kay Chang
53b01e3a
WIP adding Switch support.
7 年前
Yao Xiaoling
5836d560
Remove subsurface related properties.
7 年前
Kay Chang
f5303717
Revert "WIP adding Switch support."
This reverts commit 9af0c8f34d9c5f809e96bd5f5502d6ac28b1f330.
7 年前
Yao Xiaoling
1f8112c9
Fix terrain control map channels.
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 年前
Kay Chang
c279dc9c
Re-added modified files for Switch without BOM.
7 年前
Yao Xiaoling
3c65014c
Pass terrain layer smoothness and metallic to terrainlit shader and stop using _BaseColor properties.
7 年前
Yao Xiaoling
7f12e881
Remove heightmap editor parameters.
7 年前
Frédéric Vauchelles
09596c67
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Yao Xiaoling
9296804c
Remove thickness maps.
7 年前
Yao Xiaoling
59296c5d
Comment out planar/triplanar uvmapping mode.
7 年前
Yao Xiaoling
46f3df70
Added normal map support. Need engine changes so that _NORMALMAP0-_NORMALMAP3 keywords can be selected.
7 年前
Yao Xiaoling
6d5e665d
Delete diffusion profiles. They are only for SSS.
7 年前
Yao Xiaoling
e7aff361
Remove bent normal maps.
7 年前
Yao Xiaoling
265fbfcb
Remove influence stuff.
7 年前
Stephane Laroche
61ee5830
Merge branch 'master' into stacklit
7 年前
Yao Xiaoling
fe1e3424
Remove uvmapping for blend mask because terrain always uses uv0.
7 年前
Yao Xiaoling
47a99e08
Remove leftover influence properties.
7 年前
Yao Xiaoling
95e207c6
Some minor adjustments.
7 年前
Yao Xiaoling
d04063c7
Use terrain layer count keywords. Need engine change to enable the keywords.
7 年前
Yao Xiaoling
10c48c2c
Implemented terrain instancing. Updated UnityInstancing.hlsl for SRP.
7 年前
Yao Xiaoling
cc470684
Add back picking pass for instanced terrain.
7 年前
Yao Xiaoling
e1a96e2e
Fix lightmap UVs for instanced terrain.
7 年前
Yao Xiaoling
972939f5
Moved terrain shader to TerrainLit folder.
7 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
7 年前
GitHub
f8e74a10
Merge pull request #1277 from Unity-Technologies/switch_support
Switch support
7 年前
Stephane Laroche
ecc9d71b
Merge remote-tracking branch 'mainrepo/master' into stacklit
7 年前
sebastienlagarde
2c1c78cf
Merge branch 'master' into 2018.1-experimental
7 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
7 年前
Raymond Graham
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
7 年前
Evgenii Golubev
91dc696c
Merge upstream/master
7 年前
Frédéric Vauchelles
4bfaa623
merge master
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 年前
Sebastien Lagarde
2ca0621d
Add scene selection pass to HDRP
For lit, lit tessellation, unlit, layeredLit, LayereLitTessellation
7 年前
GitHub
dc326439
Merge pull request #1375 from Unity-Technologies/Add-scene-selection-pass-to-HDRP
Add scene selection pass to HDRP
7 年前
Sebastien Lagarde
265dfd2e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Alex Lian
0d975dea
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
Matt Dean
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
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 年前
sebastienlagarde
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
sebastienlagarde
730f3273
HDRP: add geometric filtering to lit shader
7 年前
GitHub
70ff7802
Merge pull request #1388 from Unity-Technologies/add-geometric-filtering-to-lit
HDRP: add geometric filtering to lit shader
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 年前
Sebastien Lagarde
079ea329
Add support of Texture filtering (seems to not work yet)
7 年前
GitHub
1ab5c8d6
Merge pull request #1411 from Unity-Technologies/StackLit2
Add support of texture normal filtering to stacklit
7 年前
sebastienlagarde
55b91556
Replace EmissiveIntesnity by EmissveColor HDR
Remove all occurrence of EmissiveIntensity. Emissive color is now HDR (with HDR color picker). Data need to be updated
7 年前
GitHub
a3255733
Merge pull request #1445 from Unity-Technologies/Replace-EmissiveIntesnity-by-EmissveColor-HDR
Replace EmissiveIntesnity by EmissiveColor HDR
7 年前
sebastienlagarde
661eacb1
HDRP: Update default value of emissiveColor
7 年前
sebastienlagarde
56693471
Improve upgrade material system + Add versionning via HDRPProjectVersion.txt to project settings
7 年前
GitHub
274022c0
Merge pull request #1457 from Unity-Technologies/Improve-upgrade-material-system
Improve upgrade material system + Add versionning via HDRPProjectVers…
7 年前
Paul Melamed
9f1637c0
Merge branch 'master' into decals/NoHDRP_exception
7 年前
Sebastien Lagarde
dcbff94f
refactor shader variant per material + Add variant stripper for stacklit and selection
7 年前
Stephane Laroche
d85052d9
Merge branch 'master' into StackLit2
7 年前
Remy
0a6396d8
Add a minimum value when calculing the height blend factors to avoid a division by zero when all layers are set to zero in the layer mask map.
7 年前
GitHub
38834134
Merge pull request #1472 from Unity-Technologies/hdrp/LayeredLit-zero-value-height-blend
Add a minimum value when calculing the height blend factors to avoid …
7 年前
Stephane Laroche
f7d6e7db
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
Oliver Schnabel
97ac5bf9
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
Chris Tchou
e8ce5056
Merge branch 'master' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
7 年前
GitHub
51a1873e
Merge branch 'master' into update-changelog
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
sebastienlagarde
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
7 年前
GitHub
1ea2f496
Merge pull request #1481 from Unity-Technologies/refactor-shader-variant-per-material
Refactor shader variant to allow stripping per material
7 年前
Remy
7bf53f3c
Merge branch 'master' into HDRP-Tests
7 年前
Stephane Laroche
7933fd8d
Merge branch 'master' into StackLit2
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
sebastienlagarde
6c870111
Merge branch 'master' into FalseColorMode
7 年前
Sebastien Lagarde
23c3f077
various fix + backport change of WRITE_NORMAL_BUFFER on all shader + add shader preprocessor
7 年前
GitHub
84c9e15c
Merge pull request #1505 from Unity-Technologies/normal-buffer-support
Add export of normal+Roughness during depth prepass for forward
7 年前
Stephane Laroche
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
Oliver Schnabel
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
7 年前
Remy
98989fb6
Merge branch 'master' into HDRP-Tests
7 年前
Felipe Lira
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
7 年前
Thomas
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
Chris Tchou
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
Paul Melamed
30ddbe57
renamed and added the pragma multi_compile for decals to Lit shaders
7 年前
sebastienlagarde
c1827b93
Rename positionWS to positionRWS + update shader graph template
7 年前
GitHub
853ed68c
Merge pull request #1587 from Unity-Technologies/Improve-camera-relative-rendering
HDRP: Improve camera relative rendering precision on object
7 年前
Sebastien Lagarde
34ae5a69
Merge branch 'master' into ios-texture-format
7 年前
Sebastien Lagarde
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
7 年前
Antoine Lelievre
a452a9db
Merge branch 'master' into LightUnits
7 年前
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
7 年前
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...
7 年前
Paul Melamed
1fc5aacc
adressed PR comments
moved DecalProjector transform update check to LateUpdate so it works correctly when attached to bones.
7 年前
Matt Dean
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
7 年前
Matt Dean
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
7 年前
Stephane Laroche
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
7 年前
Tim Cooper
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
7 年前
Nerites
9b69a952
Merge xrconfig branch into xrsettings
7 年前
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
b4a3f127
Merge pull request #1674 from Unity-Technologies/decals/v2/per_channel_mask_new_ui
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 年前
sebastienlagarde
f222f97c
Rename DBuffer -> Decals + Add decal multicompile option
- Rename DBuffer -> Decals
- Add multicompile for no decals at all (for support decals)
- TODO: Shader stripping
6 年前
Sebastien Lagarde
65ea94ef
Update the material upgrader system to be per material and not per project
6 年前
GitHub
b57e1824
Merge pull request #1747 from Unity-Technologies/Decal-compilation
Decal shader stripping and upgrade script + fix
6 年前
GitHub
449e311f
Merge pull request #1749 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
Sebastien Lagarde
cb44566e
Rename _DECALS_3RT to DECALS_3RT and lower variant count
6 年前
GitHub
0bdf96cc
Merge pull request #1754 from Unity-Technologies/Update-name-of-decal-keyword
Reduce number of decal shader variant
6 年前
Sebastien Lagarde
fbcdb866
Add DECAL_OFF for decal to remove more variant + rename
6 年前
GitHub
019f3227
Merge pull request #1757 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
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 年前
Remy
b425d23e
Merge branch 'master' into tests/hdrp/distortion
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 年前
Sebastien Lagarde
56790568
Refactor GetBakedDiffuseLighting
- Shader code change: Rename GetBakedDiffuseLighting to ModifyBakedDiffuseLighting. This function now handle lighting model for transmission too. Lux meter debug mode is factor outisde.
- Shader code change: GetBakedDiffuseLighting is not call anymore in GBuffer or forward pass, including the ConvertSurfaceDataToBSDFData and GetPreLightData, this is done in ModifyBakedDiffuseLighting now
- Shader code change: Added a backBakeDiffuseLighting to BuiltinData to handle lighting for transmission
- Shader code change: Material must now call InitBuiltinData (Init all to zero + init bakeDiffuseLighting and backBakeDiffuseLighting ) and PostInitBuiltinData
- Update shader graph associate code
6 年前
GitHub
03616069
Merge pull request #1784 from Unity-Technologies/Improve-bakeDiffuseLighting-code
Refactor GetBakedDiffuseLighting
6 年前
GitHub
6f8854ba
Merge pull request #1786 from Unity-Technologies/HDRP/staging
Hdrp/staging
6 年前
Antoine Lelievre
71ec7369
Merge HDRP/staging
6 年前
Remy
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
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
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
Sebastien Lagarde
9c4acb91
Import various stacklit branch change
Move specular funciton in commonlighting.hlsl
Fix issue in TextureNormalVariance
Fix issue with colorPicker not working in forward
Misc format/comment/code sharing
6 年前
GitHub
2808870d
Merge pull request #1848 from Unity-Technologies/import-stacklit-change
Apply some stacklit change (fix and formatting)
6 年前
Remy
106a0d43
Merge branch 'hdrp/staging' into hdrp/refactor-reflectionProbe/merge-probe-editors
6 年前
GitHub
9a93b084
Merge pull request #1853 from Unity-Technologies/HDRP/staging
Merging Hdrp/staging
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 年前
Sebastien Lagarde
82c30969
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
egomeh
e7c59a70
Resolve merge conflicts
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前