浏览代码
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky
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/stochastic_alpha_test
Julien Ignace
7 年前
当前提交
1e8876bf
共有 1147 个文件被更改,包括 3656 次插入 和 156 次删除
-
151ImageTemplates/HDRenderPipeline/Scenes/0002-Subsurface scattering.unity.png
-
2ImageTemplates/HDRenderPipeline/Scenes/0002-Subsurface scattering.unity.png.meta
-
40SampleScenes/HDTest/Data/Rock/rcgRock012/Materials/rcgRock012Material.mat
-
42SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalOS.mat
-
42SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalTS.mat
-
42SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatue.mat
-
26SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatueSpecular.mat
-
40SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Blue.mat
-
20SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Blue.mat
-
20SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Green.mat
-
22SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Red.mat
-
28SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_White.mat
-
40SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Green.mat
-
42SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Red.mat
-
40SampleScenes/HDTest/GraphicTest/Common/Material/Lit_White.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_0.mat
-
26SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_1.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_2.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_3.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_4.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_5.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_6.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_7.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_8.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_9.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth1_0.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_0.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_1.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_2.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_3.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_4.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_5.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_6.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_7.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_8.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_9.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric1_0.mat
-
25SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thickplane_Clear_ior101.mat
-
25SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thickplane_Clear_ior15.mat
-
27SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thickplane_Dragon.mat
-
26SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thickplane_EarthMap.mat
-
25SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thicksphere_Clear_ior101.mat
-
25SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thicksphere_Clear_ior15.mat
-
27SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thicksphere_Dragon.mat
-
26SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thicksphere_EarthMap.mat
-
25SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thinplane_Clear_ior101.mat
-
25SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thinplane_Clear_ior15.mat
-
27SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thinplane_Dragon.mat
-
26SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_thinplane_EarthMap.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_0.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_1.mat
-
26SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_2.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_3.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_4.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_5.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_6.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_7.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_8.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_9.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth1_0.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_0.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_1.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_2.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_3.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_4.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_5.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_6.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_7.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_8.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_9.mat
-
24SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric1_0.mat
-
52SampleScenes/HDTest/GraphicTest/Parallax Occlusion Mapping/Material/POM - Rock.mat
-
65SampleScenes/HDTest/GraphicTest/Parallax Occlusion Mapping/Material/POM - Wood triplanar.mat
-
37SampleScenes/HDTest/GraphicTest/Parallax Occlusion Mapping/Material/POM - Wood.mat
-
28SampleScenes/HDTest/GraphicTest/SSS/Materials/SSSHead.mat
-
89SampleScenes/HDTest/GraphicTest/Scripts/MaterialPlacer.cs
-
50SampleScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation - Rock.mat
-
41SampleScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation - Wood.mat
-
51SampleScenes/HDTest/GraphicTest/Triplanar/Material/Wood triplanar.mat
-
11SampleScenes/HDTest/GraphicTest/Two Sided/Material/GroundLeaf_DoubleSided.mat
-
41SampleScenes/HDTest/GraphicTest/Two Sided/Material/GroundLeaf_DoubleSidedFlip.mat
-
39SampleScenes/HDTest/GraphicTest/Two Sided/Material/GroundLeaf_DoubleSidedFlipSSS.mat
-
42SampleScenes/HDTest/GraphicTest/Two Sided/Material/GroundLeaf_DoubleSidedMirror.mat
-
11SampleScenes/HDTest/GraphicTest/Unlit/Material/TestUnlit Mask.mat
-
13SampleScenes/HDTest/GraphicTest/Unlit/Material/TestUnlit Transparent.mat
-
11SampleScenes/HDTest/GraphicTest/Unlit/Material/TestUnlit.mat
-
48SampleScenes/HDTest/HDRenderLoopTest.unity
-
108SampleScenes/HDTest/LayeredLitTest/Material/Layered_BlendColor.mat
-
108SampleScenes/HDTest/LayeredLitTest/Material/Layered_BlendMask.mat
-
1SampleScenes/HDTest/LayeredLitTest/Material/Layered_BlendMask.mat.meta
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_HeightBased.mat
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Planar.mat
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Triplanar.mat
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_UV0.mat
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_Planar.mat
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_Triplanar.mat
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV0.mat
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV1.mat
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV2.mat
-
100SampleScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV3.mat
151
ImageTemplates/HDRenderPipeline/Scenes/0002-Subsurface scattering.unity.png
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue