Skip to content

Commit 996468e

Browse files
JonathanHUnityWesley201StevenBorkman
authored
Merge 0.2.0-staging to master (#41)
* updating the pack ver * updating change log for 0.2 release * Fixing sample scene and steps * fixing publish step * updating images * updating images * fixing broken links * updated publish trigger * testing publish test * updating change log number * updating tests for publish * pub fix * updating changelog * fixing file name * changelog fix * fixing changelog version * updated code to use capture camera flipy and removed perception flip … (#35) * updated code to use capture camera flipy and removed perception flip y code * updated changelog for bug fix * Upgrading dependencies on capture and core packages (#36) * Upgrading dependencies on capture and core packages * Update package version to 0.2.0-preview.2 * Fix warnings 0.2.0 (#39) * Fixing compilation warnings and ensure warnings are treated as errors in test projects. * Updating changelog Co-authored-by: Wesley Mareovich Smith <[email protected]> Co-authored-by: Steve Borkman <[email protected]>
1 parent 0e84d6f commit 996468e

File tree

12 files changed

+34
-36
lines changed

12 files changed

+34
-36
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ promotion_test_trigger:
3333
{% for platform in publish_platforms %}
3434
{% for suite in suites %}
3535
{% for project in projects %}
36-
{% for variant in package_variants %}
3736
- .yamato/promote.yml#promotion_test_{{platform.name}}_{{editor.version}}
38-
- .yamato/upm-ci-full.yml#pkg_test_{{variant.name}}_{{platform.name}}_{{editor.version}}
37+
- .yamato/upm-ci-full.yml#pkg_test_Perception_{{platform.name}}_{{editor.version}}
3938
- .yamato/upm-ci-testprojects.yml#{{project.name}}_windows_{{suite.name}}_{{editor.version}}
4039
{% endfor %}
4140
{% endfor %}
4241
{% endfor %}
4342
{% endfor %}
44-
{% endfor %}
4543

4644

4745
promote:

.yamato/publish.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% metadata_file .yamato/environments.yml %}
22

33
---
4-
{% for variant in package_variants %}
4+
55
publish:
6-
name: Publish {{ variant.name }} package to internal registry
6+
name: Publish Perception package to internal registry
77
agent:
88
type: Unity::VM
99
image: package-ci/win10:stable
@@ -14,16 +14,21 @@ publish:
1414
triggers:
1515
tags:
1616
only:
17-
- "/^(r|R)(c|C)-+(-preview(+)?)?$/"
17+
- /^(r|R)(c|C)-\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
1818
artifacts:
1919
artifacts:
2020
paths:
2121
- "upm-ci~/packages/*.tgz"
2222
dependencies:
23-
- .yamato/upm-ci-full.yml#pack_{{ variant.name }}
24-
{% for editor in test_editors %}
25-
{% for platform in test_platforms %}
26-
- .yamato/upm-ci-full.yml#pkg_test_{{variant.name}}_{{platform.name}}_{{editor.version}}
23+
- .yamato/upm-ci-full.yml#pack_Perception
24+
{% for editor in publish_editors %}
25+
{% for platform in publish_platforms %}
26+
{% for suite in suites %}
27+
{% for project in projects %}
28+
- .yamato/upm-ci-full.yml#pkg_test_Perception_{{platform.name}}_{{editor.version}}
29+
- .yamato/upm-ci-testprojects.yml#{{project.name}}_windows_{{suite.name}}_{{editor.version}}
30+
{% endfor %}
2731
{% endfor %}
2832
{% endfor %}
29-
{% endfor %}
33+
{% endfor %}
34+

TestProjects/PerceptionHDRP/Assets/IdLabelConfig.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ MonoBehaviour:
1313
m_Name: IdLabelConfig
1414
m_EditorClassIdentifier: Unity.Perception.Runtime:UnityEngine.Perception.GroundTruth:IdLabelConfig
1515
m_LabelEntries:
16-
- label: Box
16+
- label: Crate
1717
id: 1
1818
- label: Cube
1919
id: 2
20-
- label: Crate
20+
- label: Box
2121
id: 3
2222
autoAssignIds: 1
2323
startingLabelId: 1

TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -785,34 +785,31 @@ MonoBehaviour:
785785
asm: Unity.Perception.Runtime}
786786
data:
787787
enabled: 1
788-
foldout: 0
789788
annotationId: F9F22E05-443F-4602-A422-EBE4EA9B55CB
790-
labelingConfiguration: {fileID: 11400000, guid: be3971a848968144e8d07d9136a5bf49,
789+
idLabelConfig: {fileID: 11400000, guid: 034ffd4e09ffb7348b2fe6634259058a,
791790
type: 2}
792791
00000001:
793792
type: {class: SemanticSegmentationLabeler, ns: UnityEngine.Perception.GroundTruth,
794793
asm: Unity.Perception.Runtime}
795794
data:
796795
enabled: 1
797-
foldout: 0
798796
annotationId: 12F94D8D-5425-4DEB-9B21-5E53AD957D66
799797
labelConfig: {fileID: 11400000, guid: c140c5aa05dd09e4fadaa26de31b1f39, type: 2}
798+
m_TargetTextureOverride: {fileID: 0}
800799
00000002:
801800
type: {class: ObjectCountLabeler, ns: UnityEngine.Perception.GroundTruth, asm: Unity.Perception.Runtime}
802801
data:
803802
enabled: 1
804-
foldout: 0
805803
objectCountMetricId: 51DA3C27-369D-4929-AEA6-D01614635CE2
806-
m_LabelingConfiguration: {fileID: 11400000, guid: be3971a848968144e8d07d9136a5bf49,
804+
m_LabelConfig: {fileID: 11400000, guid: 034ffd4e09ffb7348b2fe6634259058a,
807805
type: 2}
808806
00000003:
809807
type: {class: RenderedObjectInfoLabeler, ns: UnityEngine.Perception.GroundTruth,
810808
asm: Unity.Perception.Runtime}
811809
data:
812810
enabled: 1
813-
foldout: 0
814811
objectInfoMetricId: 5BA92024-B3B7-41A7-9D3F-C03A6A8DDD01
815-
labelingConfiguration: {fileID: 11400000, guid: be3971a848968144e8d07d9136a5bf49,
812+
idLabelConfig: {fileID: 11400000, guid: 034ffd4e09ffb7348b2fe6634259058a,
816813
type: 2}
817814
--- !u!1 &1640252278
818815
GameObject:

com.unity.perception/Documentation~/GettingStarted.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This step can be skipped for HDRP projects.
1010
1. Select your project's `ScriptableRenderer` asset and open the inspector window. In most projects it is located at `Assets/Settings/ForwardRenderer.asset`.
1111
2. Click `Add Renderer Feature` and select `Ground Truth Renderer Feature`
1212

13-
<img src="images/ScriptableRendererStep.PNG" align="middle"/>
13+
<img src="images/ScriptableRendererStep.png" align="middle"/>
1414

1515
## Step 3: Create a new scene and camera
1616
1. Create a new scene using File -> New Scene
@@ -20,35 +20,33 @@ This step can be skipped for HDRP projects.
2020
1. In the inspector panel of the main camera select Add Component
2121
2. Add a **Perception Camera** component
2222

23-
<img src="images/MainCameraConfig.PNG" align="middle"/>
23+
<img src="images/PerceptionCameraFinished.png" align="middle"/>
2424

2525
## Step 4: Create labeled objects
2626
1. Create a cube by right-clicking in the Hierarchy window, select 3D Object -> Cube
27-
1. Create 2 more cubes this way
28-
1. Change the names of the cubes to Cube, Box, and Crate
29-
1. Position the Cubes in front of the main Camera
27+
2. Create 2 more cubes this way
28+
3. Change the names of the cubes to Cube, Box, and Crate
29+
4. Position the Cubes in front of the main Camera
3030

3131
<img src="images/CompletedScene.PNG" align="middle"/>
3232

33-
1. On each cube, from the inspector panel add a **Labeling** component
33+
5. On each cube, from the inspector panel add a **Labeling** component
3434
1. Click the **+**
3535
2. In the text field add the name of the object i.e Crate. This will be the label used in the semantic segmentation images
36+
3637
<img src="images/LabeledObject.PNG" align="middle"/>
3738

38-
1. In the Project panel right click -> Perception -> Labeling Configuration
39-
1. Select the new **Labeling Configuration**
39+
6. In the Project panel right click -> Perception -> Labeling Configuration
40+
7. Select the new **ID Label Config**
4041
1. Click the **+**
4142
2. In the label text field add the same text that the Label script contains on the objects created in the scene (i.e Cube, Box, Crate)
42-
3. Add a numerical value to the value field
4343
44-
Make sure the labels all have different values, for this example use increments of 10,000 to ensure they show up as very distinct colors in the segmentation images
45-
46-
<img src="images/LabelingConfigurationFinished.PNG" align="middle"/>
44+
<img src="images/IDLabelingConfigurationFinished.PNG" align="middle"/>
4745

48-
1. Select the Main Camera in the Hierarchy panel
49-
1. In the Perception Camera attach the Labeling Configuration created in previous step
46+
8. Select the Main Camera in the Hierarchy panel
47+
9. In the Perception Camera attach the ID Label Config created in previous step for each ID Label config
5048

51-
<img src="images/MainCameraConfig.PNG" align="middle"/>
49+
<img src="images/MainCameraLabelConfig.PNG" align="middle"/>
5250

5351
## Step 5: Run simulation and generate dataset
5452
1. Press play in the editor, allow the scene to run for a few seconds, and then exit playmode
11.8 KB
Loading
Binary file not shown.
-55.5 KB
Binary file not shown.
76 KB
Loading
-20.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)