3187dab5
New StackLit forward only material: Can serve as a basic template for a new lit material creation with a different lighting code path glued in material.hlsl.
Only supports base unlit material parameters with the addition of : analytical lights with a diffuse lambert BSDF, interpolated geometric normal and double sided option.
7 年前
ad31624f
-Add base 2 lobe specular GGX along with inputs and UI.
-Fix missing base* keyword setting and gui virtual function callbacks (in addition to their abstract equivalent already handled) (see BaseUnlitUI)
7 年前
4858dea7
Merge pull request #1227 from Unity-Technologies/stacklit
Stacklit
7 年前
e5b6c4fb
Implement vertically layered BSDF model with anisotropy.
6 年前
059f098f
First working version of the UI.
Still missing implementation for UVs and channels.
6 年前
f5a4da8f
-Added foldouts.
-Added channel variables to textures.
6 年前
2d4b30ed
Fixed groups, now they stay in the same state as they were when you go back to the material.
6 年前
83ab42b8
-Implemented texture parameters UI + shader code.
-Added UV types as the usual UV set + Planar (and eventually triplanar)
6 年前
9c81e0d8
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2102_GI_Emission.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2103_BakeMixed.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/9xxx_Other/9002_Deferr...
7 年前
d9f5b4f5
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Textures/RTHandleSystem.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/BufferPyramid.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyManager.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyRenderingContext.cs
7 年前
50087a8c
Merge pull request #1253 from Unity-Technologies/stacklit
Stacklit
6 年前
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
e03580d8
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
6 年前
8676f2e5
Merge master
6 年前
6dfee119
Merge pull request #1275 from Unity-Technologies/stacklit
Stacklit
6 年前
44ad647c
Add support for triplanar + handle local/world space
6 年前
1cd7186d
Merge pull request #1276 from Unity-Technologies/stacklit-support-planar
Add support for triplanar + handle local/world space
6 年前
f0baa14d
HDRP: StackLit Triplanar - handling of local and world correctly per attribute
6 年前
4913285a
Merge pull request #1278 from Unity-Technologies/StackLit-Triplanar
HDRP: StackLit Triplanar - handling of local and world correctly per attribute
6 年前
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
6 年前
5777e7c0
Added button to output all shader properties in the debug log.
6 年前
10f8090a
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
6 年前
e0d326d4
Add coat and anisotropy UI.
6 年前
443e7841
Merge pull request #1282 from Unity-Technologies/stacklit
Added button to output all shader properties in the debug log.
6 年前
dd45564c
Update Stacklit normal map - Add support for triplanar normal map + obj space / tangent space
6 年前
b89283a5
Merge pull request #1285 from Unity-Technologies/Update-Stacklit-normal-map
Update Stacklit normal map - Add support for triplanar normal map + obj space / tangent space
6 年前
ecc9d71b
Merge remote-tracking branch 'mainrepo/master' into stacklit
6 年前
2c1c78cf
Merge branch 'master' into 2018.1-experimental
6 年前
6a42ea81
Uniformity, dual lobe material feature keyword.
6 年前
acb97536
Merge pull request #1287 from Unity-Technologies/stacklit
Stacklit
6 年前
6f2a25cc
SSS + Transmission
6 年前
f9da3920
Merge branch 'master' into Cleanup-stacklit
6 年前
bac63c51
Add ambient occlusion properties on Stacklit
6 年前
f5c025d5
Add support for ambient occlusion on stacklit + misc fix in UI
6 年前
8042dcaf
Merge pull request #1292 from Unity-Technologies/Cleanup-stacklit
Cleanup stacklit
6 年前
f022bbc2
Merge branch 'master' into stacklit
6 年前
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
6 年前
088b48f1
Bug fix (swapped a lobe id somewhere, looks better now), vlayering anisotropic "matching" hack, energy compensation per lobe, debug mode
6 年前
9f8080f8
Added SSS (works, untested) and Transmission (untested).
6 年前
41b2865b
Merge pull request #1293 from Unity-Technologies/stacklit
Stacklit
6 年前
2de26e3b
Adding various UI for stacklit (iridescence + clean) first draft
6 年前
c53df482
Fix various problem + add DielectricIor
6 年前
96a51c41
Minor reodering
6 年前
931ae208
Merge pull request #1297 from Unity-Technologies/Clean-UI-for-StackLit
Clean ui for stack lit
6 年前
b9939e8b
Various fix for coat smoothness of stacklit
6 年前
66bad7b7
Merge pull request #1298 from Unity-Technologies/Clean-UI-for-StackLit
Clean ui for stacklit - coat smoothness
6 年前
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
6 年前
c24e9827
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
6 年前
197757a7
Fix UI bug for anisotropy.
6 年前
877657e9
Add Transmisison support to stacklit
6 年前
8035cbd7
Merge pull request #1300 from Unity-Technologies/Add-Transmisison-support-to-stacklit
Add Transmisison support to stacklit
6 年前
91dc696c
Merge upstream/master
6 年前
f816f1cd
Merge branch 'master' into 2018.1-experimental
6 年前
4bfaa623
merge master
6 年前
39777104
Independent Coat Normal Map: Input management
6 年前
48ae99ff
Fix normal map scaling to work properly.
6 年前
994a42d3
Added geometric filtering for spec AA.
6 年前
ed9250ea
Fix vlayering recompute per light option and make it a shader feature for easier testing.
6 年前
c91916ff
Merge pull request #1339 from Unity-Technologies/stacklit
Stacklit
6 年前
64f35bd6
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
6 年前
7c5c2c6d
Expose more config options and make them work with dual normal maps. Streamline more code for BSDF evaluation wrt all config switches.
6 年前
6b170d6a
Merge pull request #1347 from Unity-Technologies/stacklit
Stacklit
6 年前
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
6 年前
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
6 年前
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
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
6 年前
fafb59af
Run code formatter.
6 年前
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
6 年前
fc4da057
Clean UI for specularAA
6 年前
bdf1aae0
Merge pull request #1409 from Unity-Technologies/StackLit2
Add proper specularAA to stacklit
6 年前
079ea329
Add support of Texture filtering (seems to not work yet)
6 年前
1ab5c8d6
Merge pull request #1411 from Unity-Technologies/StackLit2
Add support of texture normal filtering to stacklit
6 年前
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
6 年前
a3255733
Merge pull request #1445 from Unity-Technologies/Replace-EmissiveIntesnity-by-EmissveColor-HDR
Replace EmissiveIntesnity by EmissiveColor HDR
6 年前
6830f5c5
Added iridescence on the bottom of the stack (needs a bit of work still, had to hack to avoid TIR, dual normal will still cause artefacts because of the fake refraction through the geometric normal. Also to check/fix f0 handling and conversion).
6 年前
dcbff94f
refactor shader variant per material + Add variant stripper for stacklit and selection
6 年前
23e50c80
Rename SahderPreprocessorMaterial to BaseShaderPreprocessor
6 年前
51a1873e
Merge branch 'master' into update-changelog
6 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
6 年前
1ea2f496
Merge pull request #1481 from Unity-Technologies/refactor-shader-variant-per-material
Refactor shader variant to allow stripping per material
6 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
6 年前
7933fd8d
Merge branch 'master' into StackLit2
6 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
6 年前
6c870111
Merge branch 'master' into FalseColorMode
6 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
6 年前
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
6 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
144723e3
Merge pull request #1476 from Unity-Technologies/StackLit2
Stack lit2
6 年前
7bc5d1b4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
32210ac9
Merge branch 'master' into switch-support
6 年前
d4c5fff5
HDRP: Add support of detail normal and smoothness to Stacklit
- Fix an issue in the UI with Remap and Range
- Add detail normal and smoothness map (overlay for smoothness)
- Fix compilation issue with GetGGXAnisotropicModifiedNormalAndRoughness refactor
6 年前
81a8dd28
Merge pull request #1591 from Unity-Technologies/Add-details-map-to-StackLit
HDRP: Add support of detail normal and smoothness to Stacklit
6 年前
fa92c52f
Merge branch 'master' into Improve-camera-relative-rendering
6 年前
a5e0fbca
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
6 年前
34ae5a69
Merge branch 'master' into ios-texture-format
6 年前
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
6 年前
a452a9db
Merge branch 'master' into LightUnits
6 年前
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
6 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
6a34e975
StackLit: proper ambient occlusion, specular occlusion and bentnormals
-Make the AO and SO path clean since we're forward based (no more double occlusion and occlusion on emissive).
-Configurable per-lobe specular occlusion on environment lights and debug options. Also use GTAOMultiBounce tint in the context of vertical layering.
(Enabling SO is orthogonal to bentnormals presence, the choosen algo for the data-based occlusion will use the normal or bentnormal if present)
-Bentnormal map which piggy backs on all normal map parameters (add UI code to allow this too)
-Fix GGX energy compensation term application
-Reuse some Lit shader_feature keywords
6 年前
12aebb34
StackLit: New base parametrization and dual lobe hazy gloss parametrization.
-SpecularColor mode now selectable
-Dual specular lobe has two parametrization: direct and hazy gloss (Barla et al. 2018-07)
-UI changes to support multiple parametrizations and also avoid useless keyword switching in some instances
-Additional note on specular occlusion and anisotropy
6 年前
09d96a6f
Add a UIBufferedProperty and implement a limiting option for hazy gloss parametrization's output f0 for dielectrics when metallic input is used.
Also move static property forwarding setup functions in BaseMaterialUI.
6 年前
8e152582
Add secondary lobe independent anisotropy control (also used for hazeExtent in the hazyGloss parametrization of dual specular lobes)
6 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
80c5393b
Remove a warning.
6 年前
26eb1cae
add decals to stacklit material
decals correctly affect normal buffer in forward and for stacklit in deferred
6 年前
376207de
Address PR comments and fix player build
6 年前
92fa3473
Merge pull request #1857 from Unity-Technologies/HDRP/decals/v2_1/normal_buffer
Hdrp/decals/v2 1/normal buffer
6 年前
Stephane Laroche
GitHub
Jean-François F Fortin
Remy
Frédéric Vauchelles
Evgenii Golubev
sebastienlagarde
Yao Xiaoling
Raymond Graham
Felipe Lira
Tim Cooper
Sebastien Lagarde
Peter Bay Bastian
Paul Melamed
Thomas
Chris Tchou
Nerites
Antoine Lelievre
Matt Dean
Aleksandr Kirillov