浏览代码
Merge branch 'master' into feature/PlanarReflection
Merge branch 'master' into feature/PlanarReflection
# Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl/main
Frédéric Vauchelles
7 年前
当前提交
790cee43
共有 494 个文件被更改,包括 2657 次插入 和 1519 次删除
-
83SampleScenes/HDTest/AnimTest.unity
-
9SampleScenes/HDTest/AnimTest/Cube.mat
-
15SampleScenes/HDTest/AnimTest/NeoLowMan/Materials/body.mat
-
9SampleScenes/HDTest/AnimTest/Sphere.mat
-
15SampleScenes/HDTest/AnimTest/ThreeDScans/Gutenberg/Gutenberg.mat
-
15SampleScenes/HDTest/AnimTest/ThreeDScans/Gutenberg/Materials/Gutenberg.mat
-
87SampleScenes/HDTest/AnimTest2.unity
-
93SampleScenes/HDTest/BasicProfiling.unity
-
9SampleScenes/HDTest/BasicProfiling/Lit_Regular.mat
-
9SampleScenes/HDTest/BasicProfiling/Lit_Regular_Aniso.mat
-
10SampleScenes/HDTest/BasicProfiling/Lit_Regular_Aniso_Tess.mat
-
10SampleScenes/HDTest/BasicProfiling/Lit_Regular_Tess.mat
-
11SampleScenes/HDTest/BasicProfiling/Lit_SSS.mat
-
9SampleScenes/HDTest/BasicProfiling/Lit_SSS_Tess.mat
-
11SampleScenes/HDTest/BasicProfiling/Lit_SpecColor.mat
-
11SampleScenes/HDTest/BasicProfiling/Lit_SpecColor_Tess.mat
-
12SampleScenes/HDTest/Data/Fern/Fern_01.mat
-
9SampleScenes/HDTest/Data/Rock/rcgRock012/Materials/rcgRock012Material.mat
-
11SampleScenes/HDTest/Data/Tree/Thorn.mat
-
11SampleScenes/HDTest/Data/Tree/Tree_03_Branches.mat
-
11SampleScenes/HDTest/Data/Tree/Tree_03_Trunk.mat
-
31SampleScenes/HDTest/Data/Tree/Tree_03_Trunk_Layer.mat
-
11SampleScenes/HDTest/Data/Tree/Tree_03_Trunk_NoTesselation.mat
-
719SampleScenes/HDTest/DistortionTest.unity
-
69SampleScenes/HDTest/GIParityTest.unity
-
85SampleScenes/HDTest/GIParityTest/LightingData.asset
-
3SampleScenes/HDTest/GIParityTest/LightingData.asset.meta
-
65SampleScenes/HDTest/GIParityTest/Lightmap-0_comp_dir.png
-
1001SampleScenes/HDTest/GIParityTest/Lightmap-0_comp_light.exr
-
10SampleScenes/HDTest/GIParityTest/LitColorsRough.mat
-
10SampleScenes/HDTest/GIParityTest/LitWhiteRough.mat
-
1001SampleScenes/HDTest/GIParityTest/ReflectionProbe-0.exr
-
58SampleScenes/HDTest/GammaTest.unity
-
10SampleScenes/HDTest/GammaTest/Lit_Gray_127.mat
-
10SampleScenes/HDTest/GammaTest/Lit_Gray_127_sRGB.mat
-
77SampleScenes/HDTest/GlobalIlluminationTest.unity
-
10SampleScenes/HDTest/GlobalIlluminationTest/Material/Chrome.mat
-
9SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Green.mat
-
9SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Grey.mat
-
9SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Red.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalOS.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalTS.mat
-
10SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatue.mat
-
11SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatueSpecular.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Blue.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Blue.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Green.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Red.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_White.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Green.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Red.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Lit_White.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_0.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_1.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_2.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_3.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_4.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_5.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_6.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_7.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_8.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_9.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth1_0.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_0.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_1.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_2.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_3.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_4.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_5.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_6.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_7.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_8.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_9.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric1_0.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise_PreTransparent.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Mirror.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Clear_ior101.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Clear_ior15.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Dragon.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_EarthMap.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Clear_ior101.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Clear_ior15.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Dragon.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_EarthMap.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_EarthMap_RefractionMask.mat
-
7SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_EarthMap_pretransparent.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_0.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_1.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_3.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_4.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_5.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_6.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_7.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_8.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_9.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth1_0.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_0.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_1.mat
-
9SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_2.mat
719
SampleScenes/HDTest/DistortionTest.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
85
SampleScenes/HDTest/GIParityTest/LightingData.asset
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: 080b950fe4787dd49ad5ab1c32a27b13 |
|||
timeCreated: 1494364989 |
|||
licenseType: Pro |
|||
externalObjects: {} |
|||
mainObjectFileID: 25800000 |
|||
userData: |
|||
assetBundleName: |
1001
SampleScenes/HDTest/GIParityTest/Lightmap-0_comp_light.exr
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
1001
SampleScenes/HDTest/GIParityTest/ReflectionProbe-0.exr
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue