浏览代码
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
# Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs/feature-ReflectionProbeFit
Julien Ignace
7 年前
当前提交
f6a78dc5
共有 79 个文件被更改,包括 3729 次插入 和 2614 次删除
-
999ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode.unity.png
-
8SampleScenes/HDTest/AnimTest/Cube.mat
-
8SampleScenes/HDTest/AnimTest/Sphere.mat
-
721SampleScenes/HDTest/HDRenderLoopTest/ReflectionProbe-0.exr
-
799SampleScenes/HDTest/SkyFogTest.unity
-
4SampleScenes/HDTest/SkyFogTest/Rough_Refraction_Transparent.mat
-
60ScriptableRenderPipeline/Core/CoreRP/Editor/CoreEditorUtils.cs
-
23ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
-
15ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/HDAssetFactory.cs
-
4ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/HDEditorUtils.cs
-
2ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/HDRenderPipelineInspector.Styles.cs
-
20ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/HDRenderPipelineInspector.cs
-
31ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/HDReflectionProbeEditor.Data.cs
-
128ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/HDReflectionProbeEditor.Drawers.cs
-
464ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/HDReflectionProbeEditor.Handles.cs
-
103ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/HDReflectionProbeEditor.cs
-
11ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs
-
5ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/LitUI.cs
-
20ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Unlit/BaseUnlitUI.cs
-
2ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDCustomSamplerId.cs
-
24ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
-
22ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.cs
-
9ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDStringConstants.cs
-
15ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/HDAdditionalReflectionData.cs
-
23ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightDefinition.cs
-
72ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightDefinition.cs.hlsl
-
58ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
-
25ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightUtilities.hlsl
-
5ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/LayeredLit.shader
-
5ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/LayeredLit/LayeredLitTessellation.shader
-
106ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
-
10ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.shader
-
10ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/LitTessellation.shader
-
92ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Unlit/Unlit.shader
-
18ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/FrameSettings.cs
-
5ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/DepthDownsample.compute
-
3ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/HDRenderPipelineResources.asset
-
4ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/RenderPipelineResources.cs
-
5ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/VaryingMesh.hlsl
-
1ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
-
10TestbedPipelines/OnTileDeferredPipeline/Shaders/UnityStandardForwardMobile.cginc
-
536Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode.unity
-
880Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
-
854Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1206_Lit_Transparent_Distortion.unity
-
3ScriptableRenderPipeline/LightweightPipeline/LWRP/Data/LightweightPipelineAsset.cs
-
5ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/ShaderGUI.meta
-
4ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
-
2ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightShaderLibrary.meta
-
8ScriptableRenderPipeline/LightweightPipeline/LWRP.meta
-
8ScriptableRenderPipeline/LightweightPipeline/LWRP/Data.meta
-
8ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor.meta
-
8ScriptableRenderPipeline/LightweightPipeline/LWRP/Materials.meta
-
8ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders.meta
-
16ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightShaderIncludePaths.cs
-
11ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightShaderIncludePaths.cs.meta
-
9ScriptableRenderPipeline/LightweightPipeline/Editor.meta
-
9ScriptableRenderPipeline/LightweightPipeline/Shaders.meta
-
9ScriptableRenderPipeline/LightweightPipeline/Materials.meta
-
8ScriptableRenderPipeline/LightweightPipeline/Data.meta
-
8Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/030_Shader_RenderOrder.meta
-
0/ScriptableRenderPipeline/Core/CoreRP/com.unity.render-pipelines.core.Runtime.asmdef
-
0/ScriptableRenderPipeline/Core/CoreRP/com.unity.render-pipelines.core.Runtime.asmdef.meta
-
0/ScriptableRenderPipeline/HDRenderPipeline/HDRP/com.unity.render-pipelines.high-definition.Runtime.asmdef.meta
-
0/ScriptableRenderPipeline/HDRenderPipeline/HDRP/com.unity.render-pipelines.high-definition.Runtime.asmdef
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs.meta
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipelineUtils.cs.meta
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightConstantBuffer.cs.meta
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightConstantBuffer.cs
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipelineUtils.cs
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/Materials
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShaderUtils.cs
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShaderUtils.cs.meta
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/com.unity.render-pipelines.lightweight.Runtime.asmdef
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/com.unity.render-pipelines.lightweight.Runtime.asmdef.meta
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/Data
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
-
0/ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders
999
ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode.unity.png
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
v/1 channels chlist 7 B G R compression compression dataWindow box2i � displayWindow box2i � lineOrder lineOrder pixelAspectRatio float �?screenWindowCenter v2f screenWindowWidth float �? Y � u � � ~ @ ������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������ � � ~ @ ������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������@ � � ~ @ ������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������` � � ~ @ ������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������ |
|||
v/1 channels chlist 7 B G R compression compression dataWindow box2i � displayWindow box2i � lineOrder lineOrder pixelAspectRatio float �?screenWindowCenter v2f screenWindowWidth float �? Y �g ^� �/ 9f � � � @ � � @ � @ @ " |