浏览代码

Merge pull request #877 from Unity-Technologies/HDRP_GraphicTests

Fix cornel box materials
/main
GitHub 7 年前
当前提交
60d0a1a7
共有 6 个文件被更改,包括 129 次插入33 次删除
  1. 57
      Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2103_BakeMixed.unity
  2. 1
      Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Cornell Box.fbx.meta
  3. 1
      Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/040_UpgradeScene/Models/Environment/Floor.fbx.meta
  4. 87
      Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.prefab
  5. 8
      Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.prefab.meta
  6. 8
      SampleScenes/HDTest/PlanarReflectionTests.meta

57
Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2103_BakeMixed.unity


blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &126909927
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &398276648
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &569393405
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &573256290
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &585362627
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &591582530
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &658105329
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &752846307
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &886840555
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &976312494
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &1106453251
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &1142614819
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &1252875748
MeshRenderer:
m_ObjectHideFlags: 2

shadowResolution: 512
shadowDimmer: 1
shadowFadeDistance: 10000
enableContactShadows: 0
contactShadowLength: 0
contactShadowDistanceScaleFactor: 0.5
contactShadowMaxDistance: 50
contactShadowFadeDistance: 5
contactShadowSampleCount: 8
shadowCascadeCount: 4
shadowCascadeRatios:
- 0.05

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &1546213938
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &1589059864
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &1636907145
MeshRenderer:
m_ObjectHideFlags: 2

blendNormalDistanceNegative: {x: 0, y: 0, z: 0}
boxSideFadePositive: {x: 1, y: 1, z: 1}
boxSideFadeNegative: {x: 1, y: 1, z: 1}
proxyVolumeComponent: {fileID: 0}
--- !u!23 &1828705049
MeshRenderer:
m_ObjectHideFlags: 2

m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
- target: {fileID: 4048380051118816, guid: 9c31666db73c94448ad9133b2aeff0e5, type: 2}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
- target: {fileID: 4048380051118816, guid: 9c31666db73c94448ad9133b2aeff0e5, type: 2}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
- target: {fileID: 4048380051118816, guid: 9c31666db73c94448ad9133b2aeff0e5, type: 2}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
- target: {fileID: 4048380051118816, guid: 9c31666db73c94448ad9133b2aeff0e5, type: 2}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
- target: {fileID: 4048380051118816, guid: 9c31666db73c94448ad9133b2aeff0e5, type: 2}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
- target: {fileID: 4048380051118816, guid: 9c31666db73c94448ad9133b2aeff0e5, type: 2}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
- target: {fileID: 4048380051118816, guid: 9c31666db73c94448ad9133b2aeff0e5, type: 2}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
- target: {fileID: 4048380051118816, guid: 9c31666db73c94448ad9133b2aeff0e5, type: 2}
- target: {fileID: 100000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
propertyPath: m_StaticEditorFlags
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
propertyPath: m_LocalScale.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
propertyPath: m_LocalScale.y
value: 3
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
propertyPath: m_LocalScale.z
value: 3
objectReference: {fileID: 0}
m_ParentPrefab: {fileID: 100100000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}
m_ParentPrefab: {fileID: 100100000, guid: 9c31666db73c94448ad9133b2aeff0e5, type: 2}
m_IsPrefabParent: 0

1
Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Cornell Box.fbx.meta


2186277476908879416: ImportLogs
2186277476908879418: ImportLogs
2186277476908879420: ImportLogs
2186277476908879422: ImportLogs
externalObjects:
- first:
type: UnityEngine:Material

1
Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/040_UpgradeScene/Models/Environment/Floor.fbx.meta


2186277476908879416: ImportLogs
2186277476908879418: ImportLogs
2186277476908879420: ImportLogs
2186277476908879422: ImportLogs
externalObjects:
- first:
type: UnityEngine:Material

87
Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.prefab


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1837566155010132}
m_IsPrefabParent: 1
--- !u!1 &1837566155010132
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4048380051118816}
- component: {fileID: 33686852384577776}
- component: {fileID: 23804808622393114}
m_Layer: 0
m_Name: Cornell Box
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &4048380051118816
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1837566155010132}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23804808622393114
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1837566155010132}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: 75d48353f7ed9d04683bb9f74b121d21, type: 2}
- {fileID: 2100000, guid: ccb6d265c4315eb46bc2af89bda5b225, type: 2}
- {fileID: 2100000, guid: 9e230cd3dd687c74f9fd71088a260bb3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33686852384577776
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1837566155010132}
m_Mesh: {fileID: 4300000, guid: ec3442293e1c1fb4cbdc0a199ebb03f0, type: 3}

8
Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.prefab.meta


fileFormatVersion: 2
guid: 9c31666db73c94448ad9133b2aeff0e5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

8
SampleScenes/HDTest/PlanarReflectionTests.meta


fileFormatVersion: 2
guid: 16f734fc26685a24ea74c071cf024b43
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存