浏览代码

Fixed merge errors in the scene lightweight lights scene.

/main
Felipe Lira 7 年前
当前提交
a6a01a17
共有 3 个文件被更改,包括 544 次插入499 次删除
  1. 2
      Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
  2. 42
      Assets/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/Shaders/StandardBlinnPhongShader/LightweightLights.unity
  3. 999
      ImageTemplates/LightweightPipeline/Scenes/Shaders/StandardBlinnPhongShader/LightweightLights.unity.png

2
Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs


{
Vector3 shadowLightDir = Vector3.Normalize(shadowLight.localToWorld.GetColumn(2));
float bias = shadowLight.light.shadowBias;
float bias = shadowLight.light.shadowBias * 0.1f;
float normalBias = shadowLight.light.shadowNormalBias;
float shadowResolution = m_ShadowSlices[0].shadowResolution;

42
Assets/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/Shaders/StandardBlinnPhongShader/LightweightLights.unity


m_AmbientIntensity: 0.4
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3

m_ReflectionIntensity: 0.5
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.091603205, g: 0.113415994, b: 0.14733817, a: 0.5}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_GIWorkflowMode: 1
m_GIWorkflowMode: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1

m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1254169578
Transform:
m_ObjectHideFlags: 0

m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1366180536
Transform:
m_ObjectHideFlags: 0

- component: {fileID: 1447851827}
- component: {fileID: 1447851826}
- component: {fileID: 1447851831}
- component: {fileID: 1447851832}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera

m_GameObject: {fileID: 1447851825}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0

m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10

m_EditorClassIdentifier:
renderPipelineAsset: {fileID: 11400000, guid: e6987eea1dd29074597d54ed91a54a26,
type: 2}
--- !u!114 &1447851832
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1447851825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c20dfc007a9a74ad8a2bfd0d59abe398, type: 3}
m_Name:
m_EditorClassIdentifier:
renderPipeline: {fileID: 11400000, guid: e6987eea1dd29074597d54ed91a54a26, type: 2}
cameraToUse: {fileID: 1447851829}
hdr: 0
width: 1280
height: 720
--- !u!1 &1449522778
GameObject:
m_ObjectHideFlags: 0

m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1449522779
Transform:
m_ObjectHideFlags: 0

m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1659249726
Transform:
m_ObjectHideFlags: 0

m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!108 &1677622457
Light:
m_ObjectHideFlags: 0

m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1911408598
Transform:
m_ObjectHideFlags: 0

m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &2025477086
Transform:
m_ObjectHideFlags: 0

999
ImageTemplates/LightweightPipeline/Scenes/Shaders/StandardBlinnPhongShader/LightweightLights.unity.png
文件差异内容过多而无法显示
查看文件

正在加载...
取消
保存