浏览代码
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-Blend-Mask-Tiling-param
/Branch_Batching2
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-Blend-Mask-Tiling-param
/Branch_Batching2
sebastienlagarde
8 年前
当前提交
66d474dd
共有 19 个文件被更改,包括 324 次插入 和 90 次删除
-
4Assets/ScriptableRenderLoop/HDRenderPipeline/Debug/Resources/DebugDisplayShadowMap.shader
-
26Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
-
2Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/Resources/Deferred.shader
-
34Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
-
48Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
-
55Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader
-
1Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/Lit.hlsl
-
56Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/Lit.shader
-
60Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitTessellation.shader
-
2Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/Resources/CombineSubsurfaceScattering.shader
-
6Assets/ScriptableRenderLoop/HDRenderPipeline/SceneSettings/SubsurfaceScatteringParameters.cs
-
43Assets/ScriptableRenderLoop/HDRenderPipeline/Utilities.cs
-
4Assets/ScriptableRenderLoop/ShaderLibrary/Common.hlsl
-
2ProjectSettings/QualitySettings.asset
-
19Assets/TestScenes/HDTest/CascadedShadowsTest/CommonSettings_Cascaded.asset
-
20Assets/TestScenes/HDTest/CascadedShadowsTest/HDRISkyParameters_Cascaded.asset
-
9Assets/TestScenes/HDTest/CascadedShadowsTest/HDRISkyParameters_Cascaded.asset.meta
-
23Assets/TestScenes/HDTest/CascadedShadowsTest/CommonSettings.asset
-
0/Assets/TestScenes/HDTest/CascadedShadowsTest/CommonSettings_Cascaded.asset.meta
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &11400000 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 0 |
|||
m_PrefabParentObject: {fileID: 0} |
|||
m_PrefabInternal: {fileID: 0} |
|||
m_GameObject: {fileID: 0} |
|||
m_Enabled: 1 |
|||
m_EditorHideFlags: 0 |
|||
m_Script: {fileID: 11500000, guid: bc357c46587fc9d4cb8f311794d7d2f3, type: 3} |
|||
m_Name: CommonSettings_Cascaded |
|||
m_EditorClassIdentifier: |
|||
m_Settings: |
|||
m_ShadowMaxDistance: 450 |
|||
m_ShadowCascadeCount: 4 |
|||
m_ShadowCascadeSplit0: 0.015 |
|||
m_ShadowCascadeSplit1: 0.05 |
|||
m_ShadowCascadeSplit2: 0.2 |
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &11400000 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 0 |
|||
m_PrefabParentObject: {fileID: 0} |
|||
m_PrefabInternal: {fileID: 0} |
|||
m_GameObject: {fileID: 0} |
|||
m_Enabled: 1 |
|||
m_EditorHideFlags: 0 |
|||
m_Script: {fileID: 11500000, guid: 59b6606ef2548734bb6d11b9d160bc7e, type: 3} |
|||
m_Name: HDRISkyParameters_Cascaded |
|||
m_EditorClassIdentifier: |
|||
rotation: 0 |
|||
exposure: 0 |
|||
multiplier: 1 |
|||
resolution: 256 |
|||
updateMode: 0 |
|||
updatePeriod: 0 |
|||
skyHDRI: {fileID: 8900000, guid: 9b513842339ef704ca63ef696691bc34, type: 3} |
|
|||
fileFormatVersion: 2 |
|||
guid: e87251404948e274ab006302af9b80f8 |
|||
timeCreated: 1486126252 |
|||
licenseType: Pro |
|||
NativeFormatImporter: |
|||
mainObjectFileID: 11400000 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!114 &11400000 |
|||
MonoBehaviour: |
|||
m_ObjectHideFlags: 0 |
|||
m_PrefabParentObject: {fileID: 0} |
|||
m_PrefabInternal: {fileID: 0} |
|||
m_GameObject: {fileID: 0} |
|||
m_Enabled: 1 |
|||
m_EditorHideFlags: 0 |
|||
m_Script: {fileID: 11500000, guid: bc357c46587fc9d4cb8f311794d7d2f3, type: 3} |
|||
m_Name: CommonSettings |
|||
m_EditorClassIdentifier: |
|||
m_Settings: |
|||
m_ShadowMaxDistance: 400 |
|||
m_ShadowCascadeCount: 4 |
|||
m_ShadowCascadeSplit0: 0.015 |
|||
m_ShadowCascadeSplit1: 0.05 |
|||
m_ShadowCascadeSplit2: 0.2 |
|||
m_SssProfileStdDev1: {r: 0.3, g: 0.3, b: 0.3, a: 0} |
|||
m_SssProfileStdDev2: {r: 1, g: 1, b: 1, a: 0} |
|||
m_SssProfileLerpWeight: 0.5 |
|||
m_SssBilateralScale: 0.1 |
撰写
预览
正在加载...
取消
保存
Reference in new issue