比较提交

...
此合并请求有变更与目标分支冲突。
/TestProjects/PerceptionURP/Packages/manifest.json
/TestProjects/PerceptionURP/Packages/packages-lock.json
/com.unity.perception/Runtime/GroundTruth/PerceptionCamera.cs
/.gitmodules

2 次代码提交

作者 SHA1 备注 提交日期
Jon Hogins 5a551cf4 Fixing manifest 4 年前
Jon Hogins 002dcd16 Switching to justing/request-tracking-completion com.unity.simulation.core 4 年前
共有 4 个文件被更改,包括 13 次插入8 次删除
  1. 3
      .gitmodules
  2. 3
      com.unity.perception/Runtime/GroundTruth/PerceptionCamera.cs
  3. 4
      TestProjects/PerceptionURP/Packages/manifest.json
  4. 11
      TestProjects/PerceptionURP/Packages/packages-lock.json

3
.gitmodules


[submodule "com.unity.simulation.core"]
path = com.unity.simulation.core
url = https://github.cds.internal.unity3d.com/unity/com.unity.simulation.core

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


var ego = m_EgoMarker == null ? DatasetCapture.RegisterEgo("") : m_EgoMarker.EgoHandle;
SensorHandle = DatasetCapture.RegisterSensor(ego, "camera", description, period, startTime);
AsyncRequest.maxJobSystemParallelism = 0; // Jobs are not chained to one another in any way
AsyncRequest.maxAsyncRequestFrameAge = 4; // Match the max age of Allocator.TempJob
SetupInstanceSegmentation();
RenderPipelineManager.beginCameraRendering += OnBeginCameraRendering;

4
TestProjects/PerceptionURP/Packages/manifest.json


"com.unity.package-validation-suite": "0.9.1-preview",
"com.unity.perception": "file:../../../com.unity.perception",
"com.unity.render-pipelines.universal": "7.3.1",
"com.unity.simulation.capture": "0.0.10-preview.8",
"com.unity.simulation.core": "0.0.10-preview.14",
"com.unity.simulation.capture": "0.0.10-preview.9",
"com.unity.simulation.core": "file:../../../com.unity.simulation.core",
"com.unity.test-framework": "1.1.14",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.2.12",

11
TestProjects/PerceptionURP/Packages/packages-lock.json


"url": "https://packages.unity.com"
},
"com.unity.simulation.capture": {
"version": "0.0.10-preview.8",
"version": "0.0.10-preview.9",
"com.unity.simulation.core": "0.0.10-preview.12"
"com.unity.simulation.core": "0.0.10-preview.15"
"version": "0.0.10-preview.14",
"version": "file:../../../com.unity.simulation.core",
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
"source": "local",
"dependencies": {}
},
"com.unity.test-framework": {
"version": "1.1.14",

正在加载...
取消
保存