浏览代码
Merge branch 'master' into batch_rendering
Merge branch 'master' into batch_rendering
# Conflicts: # Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader # Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl # Assets/TestScenes/Big # Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Lit_Emissive_Blue.mat/batch_rendering
Arnaud Carre
8 年前
当前提交
3c290788
共有 468 个文件被更改,包括 5366 次插入 和 4385 次删除
-
2Assets/Editor/Tests/RenderloopTests/RenderPipelineTestFixture.cs
-
122Assets/TestScenes/FPTL/Materials/Custom_NewSurfaceShader.mat
-
206Assets/TestScenes/FPTL/Materials/gray.mat
-
35Assets/TestScenes/HDTest/CascadedShadowsTest.unity
-
20Assets/TestScenes/HDTest/CascadedShadowsTest/Lit_Gray.mat
-
27Assets/TestScenes/HDTest/GlobalIlluminationTest/Material/Chrome.mat
-
24Assets/TestScenes/HDTest/GlobalIlluminationTest/Material/Lit_Green.mat
-
25Assets/TestScenes/HDTest/GlobalIlluminationTest/Material/Lit_Grey.mat
-
23Assets/TestScenes/HDTest/GlobalIlluminationTest/Material/Lit_Red.mat
-
2Assets/TestScenes/HDTest/GlobalIlluminationTest/TestRealtime.cs
-
4Assets/TestScenes/HDTest/GraphicTest/Common/Dragon/DragonStatue.mat
-
25Assets/TestScenes/HDTest/GraphicTest/Common/Material/Lit_Blue.mat
-
25Assets/TestScenes/HDTest/GraphicTest/Common/Material/Lit_Green.mat
-
23Assets/TestScenes/HDTest/GraphicTest/Common/Material/Lit_Red.mat
-
23Assets/TestScenes/HDTest/GraphicTest/Common/Material/Lit_White.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_0.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_1.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_2.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_3.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_4.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_5.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_6.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_7.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_8.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_9.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smooth1_1.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_0.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_1.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_2.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_3.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_4.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_5.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_6.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_7.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_8.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_9.mat
-
280Assets/TestScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric1_0.mat
-
30Assets/TestScenes/HDTest/GraphicTest/Parallax Occlusion Mapping/Material/POM - Rock.mat
-
32Assets/TestScenes/HDTest/GraphicTest/Parallax Occlusion Mapping/Material/POM - Wood.mat
-
33Assets/TestScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation - Rock.mat
-
30Assets/TestScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation - Wood.mat
-
34Assets/TestScenes/HDTest/GraphicTest/Two Sided/Material/GroundLeaf_DoubleSided.mat
-
26Assets/TestScenes/HDTest/GraphicTest/Two Sided/Material/GroundLeaf_DoubleSidedFlip.mat
-
28Assets/TestScenes/HDTest/GraphicTest/Two Sided/Material/GroundLeaf_DoubleSidedMirror.mat
-
3Assets/TestScenes/HDTest/GraphicTest/Two Sided/Material/GroundLeaf_DoubleSidedMirror.mat.meta
-
3Assets/TestScenes/HDTest/GraphicTest/Unlit/Material/TestUnlit Mask.mat
-
4Assets/TestScenes/HDTest/GraphicTest/Unlit/Material/TestUnlit Transparent.mat
-
4Assets/TestScenes/HDTest/GraphicTest/Unlit/Material/TestUnlit.mat
-
802Assets/TestScenes/HDTest/HDRenderLoopTest.unity
-
132Assets/TestScenes/HDTest/LayeredLitTest.unity
-
55Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_BlendColor.mat
-
54Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_BlendMask.mat
-
34Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_HeightBased.mat
-
23Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Planar.mat
-
25Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Triplanar.mat
-
20Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_UV0.mat
-
87Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_Planar.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_Planar.mat.meta
-
84Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_Triplanar.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_Triplanar.mat.meta
-
19Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV0.mat
-
82Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV1.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV1.mat.meta
-
82Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV2.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV2.mat.meta
-
82Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV3.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV3.mat.meta
-
90Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_Planar.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_Planar.mat.meta
-
87Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_Triplanar.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_Triplanar.mat.meta
-
87Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV0.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV0.mat.meta
-
87Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV1.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV1.mat.meta
-
85Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV2.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV2.mat.meta
-
85Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV3.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV3.mat.meta
-
92Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_Planar.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_Planar.mat.meta
-
89Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_Triplanar.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_Triplanar.mat.meta
-
90Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV0.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV0.mat.meta
-
90Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV1.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV1.mat.meta
-
87Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV2.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV2.mat.meta
-
87Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV3.mat
-
1Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV3.mat.meta
-
4Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Blue.mat
-
4Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Green.mat
-
4Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Ground_01_2x2.mat
-
4Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Moss_02_2x2.mat
-
4Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Red.mat
-
21Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Sand01_2x2.mat
-
4Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Spheres.mat
-
40Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_UVChart_Layer0_Detail.mat
-
39Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_UVChart_Layer1_Detail.mat
|
|||
fileFormatVersion: 2 |
|||
guid: 88b4fe239bea7fa469847fd5e76d0dfd |
|||
timeCreated: 1460562588 |
|||
timeCreated: 1487150909 |
|||
mainObjectFileID: -1 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
802
Assets/TestScenes/HDTest/HDRenderLoopTest.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue