浏览代码

Fixing test on HDRP. Also updating project to latest HDRP.

/fix-editor-pause
Jon Hogins 4 年前
当前提交
f7061d01
共有 7 个文件被更改,包括 28 次插入13 次删除
  1. 8
      TestProjects/PerceptionHDRP/Packages/manifest.json
  2. 5
      TestProjects/PerceptionHDRP/ProjectSettings/HDRPProjectSettings.asset
  3. 4
      TestProjects/PerceptionHDRP/ProjectSettings/ProjectVersion.txt
  4. 8
      TestProjects/PerceptionHDRP/ProjectSettings/VFXManager.asset
  5. 2
      com.unity.perception/Runtime/GroundTruth/PerceptionCamera.cs
  6. 3
      com.unity.perception/Tests/Editor/PerceptionCameraEditorTests.cs
  7. 11
      com.unity.perception/Tests/Editor/Unity.Perception.Editor.Tests.asmdef

8
TestProjects/PerceptionHDRP/Packages/manifest.json


"com.unity.ext.nunit": "1.0.0",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.1.4",
"com.unity.render-pipelines.core": "7.1.8",
"com.unity.render-pipelines.high-definition": "7.1.8",
"com.unity.perception": "file:../../../com.unity.perception",
"com.unity.render-pipelines.core": "7.3.1",
"com.unity.render-pipelines.high-definition": "7.3.1",
"com.unity.perception": "file:../../../com.unity.perception",
"com.unity.test-framework": "1.1.11",
"com.unity.test-framework": "1.1.13",
"com.unity.testtools.codecoverage": "0.2.2-preview",
"com.unity.textmeshpro": "2.0.1",
"com.unity.ugui": "1.0.0",

5
TestProjects/PerceptionHDRP/ProjectSettings/HDRPProjectSettings.asset


m_DefaultDXRScenePrefabSaved: {fileID: 0}
m_ProjectSettingFolderPath: HDRPDefaultResources
m_WizardPopupAtStart: 0
m_WizardPopupAlreadyShownOnce: 0
m_PackageVersionForMaterials: 7.1.8
m_WizardNeedRestartAfterChangingToDX12: 0
m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
m_LastMaterialVersion: 2

4
TestProjects/PerceptionHDRP/ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.3.6f1
m_EditorVersionWithRevision: 2019.3.6f1 (5c3fb0a11183)
m_EditorVersion: 2019.3.9f1
m_EditorVersionWithRevision: 2019.3.9f1 (e6e740a1c473)

8
TestProjects/PerceptionHDRP/ProjectSettings/VFXManager.asset


--- !u!937362698 &1
VFXManager:
m_ObjectHideFlags: 0
m_IndirectShader: {fileID: 0}
m_CopyBufferShader: {fileID: 0}
m_SortShader: {fileID: 0}
m_StripUpdateShader: {fileID: 0}
m_IndirectShader: {fileID: 7200000, guid: 84a17cfa13e40ae4082ef42714f0a81c, type: 3}
m_CopyBufferShader: {fileID: 7200000, guid: 23c51f21a3503f6428b527b01f8a2f4e, type: 3}
m_SortShader: {fileID: 7200000, guid: ea257ca3cfb12a642a5025e612af6b2a, type: 3}
m_StripUpdateShader: {fileID: 7200000, guid: 8fa6c4009fe2a4d4486c62736fc30ad8, type: 3}
m_RenderPipeSettingsPath:
m_FixedTimeStep: 0.016666668
m_MaxDeltaTime: 0.05

2
com.unity.perception/Runtime/GroundTruth/PerceptionCamera.cs


// ReSharper disable once ParameterHidesMember
bool ShouldFlipY(Camera camera)
{
Debug.Log(camera);
Debug.Log(hdAdditionalCameraData);
//Based on logic in HDRenderPipeline.PrepareFinalBlitParameters
return camera.targetTexture != null || hdAdditionalCameraData.flipYMode == HDAdditionalCameraData.FlipYMode.ForceFlipY || camera.cameraType == CameraType.Game;

3
com.unity.perception/Tests/Editor/PerceptionCameraEditorTests.cs


var camera = cameraObject.AddComponent<Camera>();
camera.orthographic = true;
camera.orthographicSize = 1;
#if HDRP_PRESENT
cameraObject.AddComponent<UnityEngine.Rendering.HighDefinition.HDAdditionalCameraData>();
#endif
var perceptionCamera = cameraObject.AddComponent<PerceptionCamera>();
perceptionCamera.LabelingConfiguration = labelingConfiguration;

11
com.unity.perception/Tests/Editor/Unity.Perception.Editor.Tests.asmdef


"Unity.Perception.Editor",
"Unity.Collections",
"Unity.Entities",
"Unity.Simulation.Core"
"Unity.Simulation.Core",
"Unity.RenderPipelines.HighDefinition.Runtime"
],
"includePlatforms": [
"Editor"

"defineConstraints": [
"UNITY_INCLUDE_TESTS"
],
"versionDefines": [],
"versionDefines": [
{
"name": "com.unity.render-pipelines.high-definition",
"expression": "",
"define": "HDRP_PRESENT"
}
],
"noEngineReferences": false
}
正在加载...
取消
保存