Skip to content

Commit 857d2d5

Browse files
Wesley201Wesley201
authored
Merge pull request #241 from Unity-Technologies/fix_wrong_label
Fix wrong labels on 2d bounding boxes
2 parents 0532e91 + d84805b commit 857d2d5

26 files changed

+343
-347
lines changed

‎TestProjects/PerceptionHDRP/Packages/packages-lock.json‎

Lines changed: 11 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"com.unity.burst": {
4-
"version": "1.3.9",
4+
"version": "1.4.6",
55
"depth": 1,
66
"source": "registry",
77
"dependencies": {
@@ -17,29 +17,12 @@
1717
"url": "https://packages.unity.com"
1818
},
1919
"com.unity.collections": {
20-
"version": "0.7.0-preview.2",
21-
"depth": 3,
22-
"source": "registry",
23-
"dependencies": {
24-
"com.unity.test-framework.performance": "1.3.3-preview",
25-
"com.unity.burst": "1.3.0-preview.5"
26-
},
27-
"url": "https://packages.unity.com"
28-
},
29-
"com.unity.entities": {
30-
"version": "0.8.0-preview.8",
20+
"version": "0.9.0-preview.6",
3121
"depth": 1,
3222
"source": "registry",
3323
"dependencies": {
34-
"com.unity.burst": "1.3.0-preview.5",
35-
"com.unity.properties": "0.10.4-preview",
36-
"com.unity.mathematics": "1.1.0",
37-
"com.unity.serialization": "0.6.4-preview",
38-
"com.unity.test-framework.performance": "1.3.3-preview",
39-
"nuget.mono-cecil": "0.1.5-preview",
40-
"com.unity.jobs": "0.2.7-preview.11",
41-
"com.unity.scriptablebuildpipeline": "1.6.4-preview",
42-
"com.unity.platforms": "0.2.1-preview.4"
24+
"com.unity.test-framework.performance": "2.0.8-preview",
25+
"com.unity.burst": "1.3.0-preview.12"
4326
},
4427
"url": "https://packages.unity.com"
4528
},
@@ -66,16 +49,6 @@
6649
"dependencies": {},
6750
"url": "https://packages.unity.com"
6851
},
69-
"com.unity.jobs": {
70-
"version": "0.2.7-preview.11",
71-
"depth": 2,
72-
"source": "registry",
73-
"dependencies": {
74-
"com.unity.collections": "0.7.0-preview.2",
75-
"com.unity.mathematics": "1.1.0"
76-
},
77-
"url": "https://packages.unity.com"
78-
},
7952
"com.unity.mathematics": {
8053
"version": "1.2.1",
8154
"depth": 2,
@@ -84,8 +57,8 @@
8457
"url": "https://packages.unity.com"
8558
},
8659
"com.unity.nuget.newtonsoft-json": {
87-
"version": "1.1.2",
88-
"depth": 1,
60+
"version": "2.0.0-preview",
61+
"depth": 3,
8962
"source": "registry",
9063
"dependencies": {},
9164
"url": "https://packages.unity.com"
@@ -104,37 +77,15 @@
10477
"depth": 0,
10578
"source": "local",
10679
"dependencies": {
80+
"com.unity.burst": "1.4.6",
81+
"com.unity.collections": "0.9.0-preview.6",
10782
"com.unity.nuget.newtonsoft-json": "1.1.2",
10883
"com.unity.render-pipelines.core": "7.1.6",
109-
"com.unity.burst": "1.3.9",
110-
"com.unity.entities": "0.8.0-preview.8",
111-
"com.unity.simulation.client": "0.0.10-preview.10",
11284
"com.unity.simulation.capture": "0.0.10-preview.19",
85+
"com.unity.simulation.client": "0.0.10-preview.10",
11386
"com.unity.simulation.core": "0.0.10-preview.22"
11487
}
11588
},
116-
"com.unity.platforms": {
117-
"version": "0.2.1-preview.4",
118-
"depth": 2,
119-
"source": "registry",
120-
"dependencies": {
121-
"com.unity.nuget.newtonsoft-json": "1.1.2",
122-
"com.unity.properties": "0.10.4-preview",
123-
"com.unity.searcher": "4.0.9",
124-
"com.unity.serialization": "0.6.4-preview"
125-
},
126-
"url": "https://packages.unity.com"
127-
},
128-
"com.unity.properties": {
129-
"version": "0.10.4-preview",
130-
"depth": 2,
131-
"source": "registry",
132-
"dependencies": {
133-
"com.unity.collections": "0.1.1-preview",
134-
"com.unity.test-framework.performance": "1.0.9-preview"
135-
},
136-
"url": "https://packages.unity.com"
137-
},
13889
"com.unity.render-pipelines.core": {
13990
"version": "7.3.1",
14091
"depth": 0,
@@ -165,34 +116,6 @@
165116
},
166117
"url": "https://packages.unity.com"
167118
},
168-
"com.unity.scriptablebuildpipeline": {
169-
"version": "1.6.4-preview",
170-
"depth": 2,
171-
"source": "registry",
172-
"dependencies": {},
173-
"url": "https://packages.unity.com"
174-
},
175-
"com.unity.searcher": {
176-
"version": "4.0.9",
177-
"depth": 3,
178-
"source": "registry",
179-
"dependencies": {},
180-
"url": "https://packages.unity.com"
181-
},
182-
"com.unity.serialization": {
183-
"version": "0.6.4-preview",
184-
"depth": 2,
185-
"source": "registry",
186-
"dependencies": {
187-
"com.unity.burst": "1.1.2",
188-
"com.unity.collections": "0.1.1-preview",
189-
"com.unity.jobs": "0.1.1-preview",
190-
"com.unity.mathematics": "1.1.0",
191-
"com.unity.properties": "0.10.4-preview",
192-
"com.unity.test-framework.performance": "1.0.9-preview"
193-
},
194-
"url": "https://packages.unity.com"
195-
},
196119
"com.unity.shadergraph": {
197120
"version": "7.3.1",
198121
"depth": 1,
@@ -237,12 +160,12 @@
237160
"url": "https://packages.unity.com"
238161
},
239162
"com.unity.test-framework.performance": {
240-
"version": "1.3.3-preview",
163+
"version": "2.0.8-preview",
241164
"depth": 2,
242165
"source": "registry",
243166
"dependencies": {
244167
"com.unity.test-framework": "1.1.0",
245-
"com.unity.modules.jsonserialize": "1.0.0"
168+
"com.unity.nuget.newtonsoft-json": "2.0.0-preview"
246169
},
247170
"url": "https://packages.unity.com"
248171
},

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

Lines changed: 11 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"com.unity.burst": {
4-
"version": "1.3.9",
4+
"version": "1.4.6",
55
"depth": 1,
66
"source": "registry",
77
"dependencies": {
@@ -17,29 +17,12 @@
1717
"url": "https://packages.unity.com"
1818
},
1919
"com.unity.collections": {
20-
"version": "0.7.0-preview.2",
21-
"depth": 3,
22-
"source": "registry",
23-
"dependencies": {
24-
"com.unity.test-framework.performance": "1.3.3-preview",
25-
"com.unity.burst": "1.3.0-preview.5"
26-
},
27-
"url": "https://packages.unity.com"
28-
},
29-
"com.unity.entities": {
30-
"version": "0.8.0-preview.8",
20+
"version": "0.9.0-preview.6",
3121
"depth": 1,
3222
"source": "registry",
3323
"dependencies": {
34-
"com.unity.burst": "1.3.0-preview.5",
35-
"com.unity.properties": "0.10.4-preview",
36-
"com.unity.mathematics": "1.1.0",
37-
"com.unity.serialization": "0.6.4-preview",
38-
"com.unity.test-framework.performance": "1.3.3-preview",
39-
"nuget.mono-cecil": "0.1.5-preview",
40-
"com.unity.jobs": "0.2.7-preview.11",
41-
"com.unity.scriptablebuildpipeline": "1.6.4-preview",
42-
"com.unity.platforms": "0.2.1-preview.4"
24+
"com.unity.test-framework.performance": "2.0.8-preview",
25+
"com.unity.burst": "1.3.0-preview.12"
4326
},
4427
"url": "https://packages.unity.com"
4528
},
@@ -66,16 +49,6 @@
6649
"dependencies": {},
6750
"url": "https://packages.unity.com"
6851
},
69-
"com.unity.jobs": {
70-
"version": "0.2.7-preview.11",
71-
"depth": 2,
72-
"source": "registry",
73-
"dependencies": {
74-
"com.unity.collections": "0.7.0-preview.2",
75-
"com.unity.mathematics": "1.1.0"
76-
},
77-
"url": "https://packages.unity.com"
78-
},
7952
"com.unity.mathematics": {
8053
"version": "1.2.1",
8154
"depth": 2,
@@ -84,8 +57,8 @@
8457
"url": "https://packages.unity.com"
8558
},
8659
"com.unity.nuget.newtonsoft-json": {
87-
"version": "1.1.2",
88-
"depth": 1,
60+
"version": "2.0.0-preview",
61+
"depth": 3,
8962
"source": "registry",
9063
"dependencies": {},
9164
"url": "https://packages.unity.com"
@@ -104,37 +77,15 @@
10477
"depth": 0,
10578
"source": "local",
10679
"dependencies": {
80+
"com.unity.burst": "1.4.6",
81+
"com.unity.collections": "0.9.0-preview.6",
10782
"com.unity.nuget.newtonsoft-json": "1.1.2",
10883
"com.unity.render-pipelines.core": "7.1.6",
109-
"com.unity.burst": "1.3.9",
110-
"com.unity.entities": "0.8.0-preview.8",
111-
"com.unity.simulation.client": "0.0.10-preview.10",
11284
"com.unity.simulation.capture": "0.0.10-preview.19",
85+
"com.unity.simulation.client": "0.0.10-preview.10",
11386
"com.unity.simulation.core": "0.0.10-preview.22"
11487
}
11588
},
116-
"com.unity.platforms": {
117-
"version": "0.2.1-preview.4",
118-
"depth": 2,
119-
"source": "registry",
120-
"dependencies": {
121-
"com.unity.nuget.newtonsoft-json": "1.1.2",
122-
"com.unity.properties": "0.10.4-preview",
123-
"com.unity.searcher": "4.0.9",
124-
"com.unity.serialization": "0.6.4-preview"
125-
},
126-
"url": "https://packages.unity.com"
127-
},
128-
"com.unity.properties": {
129-
"version": "0.10.4-preview",
130-
"depth": 2,
131-
"source": "registry",
132-
"dependencies": {
133-
"com.unity.collections": "0.1.1-preview",
134-
"com.unity.test-framework.performance": "1.0.9-preview"
135-
},
136-
"url": "https://packages.unity.com"
137-
},
13889
"com.unity.render-pipelines.core": {
13990
"version": "7.3.1",
14091
"depth": 1,
@@ -154,34 +105,6 @@
154105
},
155106
"url": "https://packages.unity.com"
156107
},
157-
"com.unity.scriptablebuildpipeline": {
158-
"version": "1.6.4-preview",
159-
"depth": 2,
160-
"source": "registry",
161-
"dependencies": {},
162-
"url": "https://packages.unity.com"
163-
},
164-
"com.unity.searcher": {
165-
"version": "4.0.9",
166-
"depth": 3,
167-
"source": "registry",
168-
"dependencies": {},
169-
"url": "https://packages.unity.com"
170-
},
171-
"com.unity.serialization": {
172-
"version": "0.6.4-preview",
173-
"depth": 2,
174-
"source": "registry",
175-
"dependencies": {
176-
"com.unity.burst": "1.1.2",
177-
"com.unity.collections": "0.1.1-preview",
178-
"com.unity.jobs": "0.1.1-preview",
179-
"com.unity.mathematics": "1.1.0",
180-
"com.unity.properties": "0.10.4-preview",
181-
"com.unity.test-framework.performance": "1.0.9-preview"
182-
},
183-
"url": "https://packages.unity.com"
184-
},
185108
"com.unity.shadergraph": {
186109
"version": "7.3.1",
187110
"depth": 1,
@@ -226,12 +149,12 @@
226149
"url": "https://packages.unity.com"
227150
},
228151
"com.unity.test-framework.performance": {
229-
"version": "1.3.3-preview",
152+
"version": "2.0.8-preview",
230153
"depth": 2,
231154
"source": "registry",
232155
"dependencies": {
233156
"com.unity.test-framework": "1.1.0",
234-
"com.unity.modules.jsonserialize": "1.0.0"
157+
"com.unity.nuget.newtonsoft-json": "2.0.0-preview"
235158
},
236159
"url": "https://packages.unity.com"
237160
},

‎com.unity.perception/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Randomizer tags now use OnEnable and OnDisable to manage lifecycle. This allows
5151

5252
The randomizer methods OnCreate(), OnStartRunning(), and OnStopRunning() are now deprecated and have been replaced with OnAwake(), OnEnable() and OnDisable() respectively to better reflect the existing MonoBehaviour lifecycle methods.
5353

54+
CameraLabeler methods OnBeginRendering() and OnEndRendering() have an added ScriptableRenderContext parameter.
55+
5456
Upgraded com.unity.simulation.capture package dependency to integrate new changes that prevent the API updater from looping infinitely when opening the project settings window on new URP projects.
5557

5658
### Deprecated
@@ -75,6 +77,8 @@ Fixed keypoints being reported in wrong locations on the first frame an object i
7577

7678
Fixed an out of range error if a keypoint template skeleton relies on a joint that is not available.
7779

80+
Fixed wrong labels on 2d bounding boxes when all labeled objects are deleted in a frame.
81+
7882
## [0.7.0-preview.2] - 2021-02-08
7983

8084
### Upgrade Notes

‎com.unity.perception/Editor/GroundTruth/KeypointTemplateEditor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace UnityEditor.Perception.GroundTruth
77
{
88
[CustomEditor(typeof(KeypointTemplate))]
9-
public class KeypointTemplateEditor: Editor
9+
class KeypointTemplateEditor: Editor
1010
{
1111
ReorderableList m_KeypointsList;
1212
ReorderableList m_SkeletonList;

‎com.unity.perception/Runtime/GroundTruth/DatasetCapture.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static EgoHandle RegisterEgo(string description)
4949
/// <param name="egoHandle">The ego container for the sensor. Sensor orientation will be reported in the context of the given ego.</param>
5050
/// <param name="modality">The kind of the sensor (ex. "camera", "lidar")</param>
5151
/// <param name="description">A human-readable description of the sensor (ex. "front-left rgb camera")</param>
52-
/// <param name="firstCaptureFrame">The time, in seconds, from the start of the sequence on which this sensor should first be scheduled.</param>
52+
/// <param name="firstCaptureFrame">The offset from the current frame on which this sensor should first be scheduled.</param>
5353
/// <param name="captureTriggerMode">The method of triggering captures for this sensor.</param>
5454
/// <param name="simulationDeltaTime">The simulation frame time (seconds) requested by this sensor.</param>
5555
/// <param name="framesBetweenCaptures">The number of frames to simulate and render between the camera's scheduled captures. Setting this to 0 makes the camera capture every frame.</param>

‎com.unity.perception/Runtime/GroundTruth/Labelers/BoundingBox3DLabeler.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Diagnostics.CodeAnalysis;
44
using Unity.Collections;
55
using Unity.Profiling;
6+
using UnityEngine.Rendering;
67

78
namespace UnityEngine.Perception.GroundTruth
89
{
@@ -174,7 +175,7 @@ static Vector3[] GetBoxCorners(Bounds bounds, Quaternion rotation)
174175
}
175176

176177
/// <inheritdoc/>
177-
protected override void OnBeginRendering()
178+
protected override void OnBeginRendering(ScriptableRenderContext scriptableRenderContext)
178179
{
179180
m_CurrentFrame = Time.frameCount;
180181

0 commit comments

Comments
 (0)