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 年前
Julien Ignace
705c2c66
Added proper support for Vertex Color in LayeredLit shader.
8 年前
sebastienlagarde
1225abd4
Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
Evgenii Golubev
fc0cb9a4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into SkySystem
8 年前
Paul Demeulenaere
ab48557b
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Evgenii Golubev
2df9af84
Merge branch 'SkySystem'
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
sebastienlagarde
b60bd965
HDRenderPipeline: Fix various issue with tesselatoin + depth offset
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
3566a95a
HDRenderPipeline: Upgrade after Julien change
8 年前
GitHub
789af10a
Merge pull request #89 from Unity-Technologies/Add-tesselation
Add tesselation
8 年前
Sebastien Lagarde
8f97c56c
HDRenderPipeline: Add Phong tesselation
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 年前
Felipe Lira
05e84b23
Merge branch 'master' into lowendmobile
8 年前
Sebastien Lagarde
fd23a655
HDRenderPipeline: Second part of modification still not compiling/working
8 年前
GitHub
531082c1
Merge pull request #98 from Unity-Technologies/Vertex-interpolator-and-tesselation-improvement
Change Vertex / attributes / Interpolator management
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 年前
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 年前
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 年前
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 年前
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 年前
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
3d558256
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
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 年前
runes
3b9f1e7d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
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 年前
sebastienlagarde
096f6f33
HDRenderPipeline: Add BlendMask tiling support
8 年前
Evgenii Golubev
c13b75bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
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
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
Filip Iliescu
9c290707
merge changes from remote to local branch
8 年前
Arnaud Carre
d070d1b8
Merge branch 'master' into Branch_Batching2
8 年前
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 年前
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
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 年前
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 年前
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 年前
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 年前
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 年前
Peter Andreasen
867c8236
Merge remote-tracking branch 'origin/master' into sample_game
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 年前
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 年前
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 年前
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 年前
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 年前
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
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
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 年前
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 年前
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 年前
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 年前
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 年前
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 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Peter Andreasen
f052451a
merged from 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 年前
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 年前
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 年前
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 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
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 年前
Sebastien Lagarde
14afb03c
More file update
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前
Sebastien Lagarde
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
lyndon homewood
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
Julien Ignace
43f6d6eb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
Julien Ignace
4919b7ad
Merge branch 'master' into Branch_ScreenSpaceShadows
# Conflicts:
# ScriptableRenderPipeline/Core/ShaderLibrary/Random.hlsl
# ScriptableRenderPipeline/Core/Shadow/AdditionalShadowData.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.Styles.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/DeferredDirectionalShadow.compute
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
sebastienlagarde
313ca6c5
Emissive color: add support for uv mapping selection
7 年前
sebastienlagarde
214f287d
Fix issue with layering emissive not working
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 年前
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 年前
Sebastien Lagarde
a8808353
Update UI for GPU instancing
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 年前
Julien Ignace
1a984f4b
Bundle of warning fixes.
7 年前
GitHub
a85fe8fe
Merge pull request #826 from Unity-Technologies/Branch_WarningFix
Bundle of warning fixes.
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
Frédéric Vauchelles
5f6876d6
Merge branch 'master' into feature/PlanarReflection
7 年前
John
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Paul Melamed
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
John
cf25c602
Merge master
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
sebastienlagarde
0b8efbbc
Add support of UV1 to UV3 set on base color
Note that if users select > UV1 this will have a perf impact as due to
surface gradient calculation
7 年前
GitHub
865a869a
Merge pull request #874 from Unity-Technologies/Support-UV0-UV3-on-lit-for-base
Support uv0 uv3 on lit for base
7 年前
sebastienlagarde
6feb2d00
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
Paul Melamed
19876ed2
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
Frédéric Vauchelles
9db916f8
Merge branch 'master' into feature/PlanarReflection2
7 年前
sebastienlagarde
22b5d138
Add support of clearcoat mask map and change coat mask as material feature
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
sebastienlagarde
48efe04c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
sebastienlagarde
e74963fd
push fix
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 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Julien Ignace
22b0a3ac
Removed redundant(and broken) layered specific height offset.
7 年前
Julien Ignace
c67a9be3
Hide Layering option category when there is nothing to show.
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 年前
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 年前
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 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
Julien Ignace
4f420674
Correctly shows HeightMap in LayeredLit shader UI when using height based blend without any displacement.
7 年前
GitHub
973b823f
Merge pull request #956 from Unity-Technologies/Branch_FixHeightUI
Correctly shows HeightMap in LayeredLit shader UI when using height b…
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 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Thomas
44dd9f42
Merge branch 'master' into debug-menu-refactor
7 年前
Evgenii Golubev
2d48e00b
Merge branch 'master'
7 年前
Evgenii Golubev
3ad3c7d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Julien Ignace
4b17c74c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling
# Conflicts:
# SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_10_5.mat
# SampleScenes/HDTest/Prefabs/Block_0.3x6.prefab
# SampleScenes/HDTest/Prefabs/Block_10x0.15.prefab
# SampleScenes/HDTest/Prefabs/Block_10x5.prefab
# SampleScenes/HDTest/Prefabs/Block_1x1.prefab
# SampleScenes/HDTest/Prefabs/Block_50x300.prefab
# ScriptableRenderPipeline/Core/CoreRP/Camera/CameraSwitcher.cs
7 年前
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 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前
sebastienlagarde
09911a1b
Make XXXGUI class public
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 年前
GitHub
a9f65e3e
Merge pull request #1097 from Unity-Technologies/Make-XXXGUI-class-public
Make XXXGUI class public
7 年前
Evgenii Golubev
1d711357
Merge 'upstream/master'
7 年前
Remy
75cf5fa5
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Matt Dean
f98f82d0
Merge remote-tracking branch 'origin/LWRP' into LW-DistortionPass
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 年前
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 年前
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
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
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 年前
Yao Xiaoling
5836d560
Remove subsurface related properties.
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 年前
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
e7aff361
Remove bent normal maps.
7 年前
Yao Xiaoling
265fbfcb
Remove influence stuff.
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
695625a5
Move TerrainLitUI.cs to TerrainLit folder.
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Frédéric Vauchelles
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
7 年前
sebastienlagarde
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 年前
GitHub
51a1873e
Merge branch 'master' into update-changelog
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
7 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前