浏览代码
Merge branch 'master' into LightweightPipeline
Merge branch 'master' into LightweightPipeline
# Conflicts: # Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances.meta # Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances/Challenge-Brick.meta/main
Felipe Lira
7 年前
当前提交
c6543428
共有 993 个文件被更改,包括 1434 次插入 和 1040 次删除
-
999ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode.unity.png
-
14ImageTemplates/LightweightPipeline/Scenes/001_SimpleCube.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/002_Camera_Clip.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/003_Camera_Ortho.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/004_Camera_TargetTexture.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/005_LitBakedEmission.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/006_LitShaderLightProbes.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/008_LitShaderReflection.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/009_LightweightShading.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/010_MultiplePointLights.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/011_UnlitSprites.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/012_PBS_EnvironmentBRDF_Spheres.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/017_Lighting_Scene_DirectionalBaked.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/019_Lighting_Scene_PointLights.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/020_Lighting_BasicDirectional.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/021_Lighting_BasicPoint.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/022_Lighting_BasicSpot.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/024_Shader_PBRvalidation_Specular.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/025_Shader_PBRvalidation_Metallic.unity.png.meta
-
12ImageTemplates/LightweightPipeline/Scenes/035_Shader_TerrainShaders.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/037_Particles.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/038_Lighting_DirectionalCookie.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/039_Lighting_SpotCookie.unity.png.meta
-
14ImageTemplates/LightweightPipeline/Scenes/041_Lighting_BasicArea.unity.png.meta
-
48SampleScenes/HDTest/BasicProfiling.unity
-
8SampleScenes/HDTest/BasicProfiling/Lit_Regular.mat
-
8SampleScenes/HDTest/BasicProfiling/Lit_Regular_Aniso.mat
-
8SampleScenes/HDTest/BasicProfiling/Lit_Regular_Aniso_Tess.mat
-
8SampleScenes/HDTest/BasicProfiling/Lit_Regular_Tess.mat
-
10SampleScenes/HDTest/BasicProfiling/Lit_SSS.mat
-
8SampleScenes/HDTest/BasicProfiling/Lit_SSS_Tess.mat
-
8SampleScenes/HDTest/BasicProfiling/Lit_SpecColor.mat
-
8SampleScenes/HDTest/BasicProfiling/Lit_SpecColor_Tess.mat
-
8SampleScenes/HDTest/Data/Fern/Fern_01.mat
-
8SampleScenes/HDTest/Data/Rock/rcgRock012/Materials/rcgRock012Material.mat
-
8SampleScenes/HDTest/Data/Tree/Thorn.mat
-
8SampleScenes/HDTest/Data/Tree/Tree_03_Branches.mat
-
8SampleScenes/HDTest/Data/Tree/Tree_03_Trunk.mat
-
5SampleScenes/HDTest/Data/Tree/Tree_03_Trunk_Layer.mat
-
8SampleScenes/HDTest/Data/Tree/Tree_03_Trunk_NoTesselation.mat
-
213SampleScenes/HDTest/GIParityTest.unity
-
8SampleScenes/HDTest/GIParityTest/LitColorsRough.mat
-
8SampleScenes/HDTest/GIParityTest/LitWhiteRough.mat
-
61SampleScenes/HDTest/GammaTest.unity
-
8SampleScenes/HDTest/GammaTest/Lit_Gray_127.mat
-
8SampleScenes/HDTest/GammaTest/Lit_Gray_127_sRGB.mat
-
284SampleScenes/HDTest/GlobalIlluminationTest.unity
-
8SampleScenes/HDTest/GlobalIlluminationTest/Material/Chrome.mat
-
8SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Green.mat
-
8SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Grey.mat
-
8SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Red.mat
-
7SampleScenes/HDTest/GlobalIlluminationTest/TestRealtime.cs
-
8SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalOS.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalTS.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatue.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatueSpecular.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Blue.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Blue.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Green.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Red.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_White.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Green.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Red.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Lit_White.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_0.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_1.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_2.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_3.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_4.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_5.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_6.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_7.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_8.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_9.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth1_0.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_0.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_1.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_2.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_3.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_4.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_5.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_6.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_7.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_8.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_9.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric1_0.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise_PreTransparent.mat
-
3SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_Reject.mat
-
3SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Only_2DNoise.mat
-
3SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Only_Ripple.mat
-
3SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Reject.mat
-
3SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Unlit_Voronoi.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Mirror.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Clear_ior101.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Clear_ior15.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Dragon.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_EarthMap.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Clear_ior101.mat
-
8SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Clear_ior15.mat
999
ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1202_Lit_DoubleSideNormalMode.unity.png
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue