浏览代码
Merge branch 'master' into feature/ScreenSpaceProjection
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs # ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta # Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta/feature-ScreenSpaceProjection
Frédéric Vauchelles
7 年前
当前提交
672c909b
共有 592 个文件被更改,包括 2600 次插入 和 1391 次删除
-
978ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity.png
-
999ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1102_Unlit_Distortion.unity.png
-
999ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1103_Unlit_Distortion_DepthTest.unity.png
-
3SampleScenes/Common/Materials/Mat_Test_Unlit.mat
-
12SampleScenes/HDTest/AnimTest/Cube.mat
-
12SampleScenes/HDTest/AnimTest/NeoLowMan/Materials/body.mat
-
12SampleScenes/HDTest/AnimTest/Sphere.mat
-
12SampleScenes/HDTest/AnimTest/ThreeDScans/Gutenberg/Gutenberg.mat
-
12SampleScenes/HDTest/AnimTest/ThreeDScans/Gutenberg/Materials/Gutenberg.mat
-
12SampleScenes/HDTest/BasicProfiling/Lit_Regular.mat
-
12SampleScenes/HDTest/BasicProfiling/Lit_Regular_Aniso.mat
-
12SampleScenes/HDTest/BasicProfiling/Lit_Regular_Aniso_Tess.mat
-
12SampleScenes/HDTest/BasicProfiling/Lit_Regular_Tess.mat
-
12SampleScenes/HDTest/BasicProfiling/Lit_SSS.mat
-
12SampleScenes/HDTest/BasicProfiling/Lit_SSS_Tess.mat
-
12SampleScenes/HDTest/BasicProfiling/Lit_SpecColor.mat
-
12SampleScenes/HDTest/BasicProfiling/Lit_SpecColor_Tess.mat
-
3SampleScenes/HDTest/BasicProfiling/Unlit.mat
-
10SampleScenes/HDTest/Data/Fern/Fern_01.mat
-
12SampleScenes/HDTest/Data/Rock/rcgRock012/Materials/rcgRock012Material.mat
-
10SampleScenes/HDTest/Data/Tree/Thorn.mat
-
10SampleScenes/HDTest/Data/Tree/Tree_03_Branches.mat
-
12SampleScenes/HDTest/Data/Tree/Tree_03_Trunk.mat
-
5SampleScenes/HDTest/Data/Tree/Tree_03_Trunk_Layer.mat
-
12SampleScenes/HDTest/Data/Tree/Tree_03_Trunk_NoTesselation.mat
-
12SampleScenes/HDTest/GIParityTest/LitColorsRough.mat
-
12SampleScenes/HDTest/GIParityTest/LitWhiteRough.mat
-
12SampleScenes/HDTest/GammaTest/Lit_Gray_127.mat
-
12SampleScenes/HDTest/GammaTest/Lit_Gray_127_sRGB.mat
-
3SampleScenes/HDTest/GammaTest/Unlit_Gray_127.mat
-
3SampleScenes/HDTest/GammaTest/Unlit_Gray_127_sRGB.mat
-
12SampleScenes/HDTest/GlobalIlluminationTest/Material/Chrome.mat
-
12SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Green.mat
-
12SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Grey.mat
-
12SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Red.mat
-
3SampleScenes/HDTest/GlobalIlluminationTest/Material/Unlit_Blue.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalOS.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalTS.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatue.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatueSpecular.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Blue.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Blue.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Green.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Red.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_White.mat
-
20SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Earth.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Green.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Red.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Lit_White.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_0.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_1.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_2.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_3.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_4.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_5.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_6.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_7.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_8.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_9.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth1_0.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_0.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_1.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_2.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_3.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_4.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_5.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_6.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_7.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_8.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_9.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric1_0.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise_PreTransparent.mat
-
1SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Reject.mat
-
1SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_2DNoise.mat
-
1SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_2DNoise_PreTransparent.mat
-
1SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Only_2DNoise.mat
-
1SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Only_Ripple.mat
-
1SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Reject.mat
-
1SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Voronoi.mat
-
1SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Fire.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Mirror.mat
-
11SampleScenes/HDTest/GraphicTest/Common/Material/Mat_NoisedRoughMirror.mat
-
26SampleScenes/HDTest/GraphicTest/Common/Material/Mat_RockWall.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Clear_ior101.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Clear_ior15.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Dragon.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_EarthMap.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Clear_ior101.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Clear_ior15.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Dragon.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_EarthMap.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_EarthMap_RefractionMask.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_EarthMap_pretransparent.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_0.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_1.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_2.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_3.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_4.mat
-
12SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_5.mat
978
ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity.png
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
999
ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1102_Unlit_Distortion.unity.png
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
999
ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1103_Unlit_Distortion_DepthTest.unity.png
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue