diff --git a/.yamato/promotion.yml b/.yamato/promote.yml similarity index 93% rename from .yamato/promotion.yml rename to .yamato/promote.yml index 781abf2f7..99d9dff64 100644 --- a/.yamato/promotion.yml +++ b/.yamato/promote.yml @@ -33,15 +33,13 @@ promotion_test_trigger: {% for platform in publish_platforms %} {% for suite in suites %} {% for project in projects %} - {% for variant in package_variants %} - .yamato/promote.yml#promotion_test_{{platform.name}}_{{editor.version}} - - .yamato/upm-ci-full.yml#pkg_test_{{variant.name}}_{{platform.name}}_{{editor.version}} + - .yamato/upm-ci-full.yml#pkg_test_Perception_{{platform.name}}_{{editor.version}} - .yamato/upm-ci-testprojects.yml#{{project.name}}_windows_{{suite.name}}_{{editor.version}} {% endfor %} {% endfor %} {% endfor %} {% endfor %} - {% endfor %} promote: diff --git a/.yamato/publish.yml b/.yamato/publish.yml index 56a7e8326..eb6382520 100644 --- a/.yamato/publish.yml +++ b/.yamato/publish.yml @@ -1,9 +1,9 @@ {% metadata_file .yamato/environments.yml %} --- -{% for variant in package_variants %} + publish: - name: Publish {{ variant.name }} package to internal registry + name: Publish Perception package to internal registry agent: type: Unity::VM image: package-ci/win10:stable @@ -14,16 +14,21 @@ publish: triggers: tags: only: - - "/^(r|R)(c|C)-+(-preview(+)?)?$/" + - /^(r|R)(c|C)-\d+\.\d+\.\d+(-preview(\.\d+)?)?$/ artifacts: artifacts: paths: - "upm-ci~/packages/*.tgz" dependencies: - - .yamato/upm-ci-full.yml#pack_{{ variant.name }} - {% for editor in test_editors %} - {% for platform in test_platforms %} - - .yamato/upm-ci-full.yml#pkg_test_{{variant.name}}_{{platform.name}}_{{editor.version}} + - .yamato/upm-ci-full.yml#pack_Perception + {% for editor in publish_editors %} + {% for platform in publish_platforms %} + {% for suite in suites %} + {% for project in projects %} + - .yamato/upm-ci-full.yml#pkg_test_Perception_{{platform.name}}_{{editor.version}} + - .yamato/upm-ci-testprojects.yml#{{project.name}}_windows_{{suite.name}}_{{editor.version}} + {% endfor %} {% endfor %} {% endfor %} -{% endfor %} + {% endfor %} + diff --git a/TestProjects/PerceptionHDRP/Assets/IdLabelConfig.asset b/TestProjects/PerceptionHDRP/Assets/IdLabelConfig.asset index c5f5b7318..aded98ff9 100644 --- a/TestProjects/PerceptionHDRP/Assets/IdLabelConfig.asset +++ b/TestProjects/PerceptionHDRP/Assets/IdLabelConfig.asset @@ -13,11 +13,11 @@ MonoBehaviour: m_Name: IdLabelConfig m_EditorClassIdentifier: Unity.Perception.Runtime:UnityEngine.Perception.GroundTruth:IdLabelConfig m_LabelEntries: - - label: Box + - label: Crate id: 1 - label: Cube id: 2 - - label: Crate + - label: Box id: 3 autoAssignIds: 1 startingLabelId: 1 diff --git a/TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity b/TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity index 2b1ccaef8..bbdca458a 100644 --- a/TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity +++ b/TestProjects/PerceptionHDRP/Assets/Scenes/SampleScene.unity @@ -785,34 +785,31 @@ MonoBehaviour: asm: Unity.Perception.Runtime} data: enabled: 1 - foldout: 0 annotationId: F9F22E05-443F-4602-A422-EBE4EA9B55CB - labelingConfiguration: {fileID: 11400000, guid: be3971a848968144e8d07d9136a5bf49, + idLabelConfig: {fileID: 11400000, guid: 034ffd4e09ffb7348b2fe6634259058a, type: 2} 00000001: type: {class: SemanticSegmentationLabeler, ns: UnityEngine.Perception.GroundTruth, asm: Unity.Perception.Runtime} data: enabled: 1 - foldout: 0 annotationId: 12F94D8D-5425-4DEB-9B21-5E53AD957D66 labelConfig: {fileID: 11400000, guid: c140c5aa05dd09e4fadaa26de31b1f39, type: 2} + m_TargetTextureOverride: {fileID: 0} 00000002: type: {class: ObjectCountLabeler, ns: UnityEngine.Perception.GroundTruth, asm: Unity.Perception.Runtime} data: enabled: 1 - foldout: 0 objectCountMetricId: 51DA3C27-369D-4929-AEA6-D01614635CE2 - m_LabelingConfiguration: {fileID: 11400000, guid: be3971a848968144e8d07d9136a5bf49, + m_LabelConfig: {fileID: 11400000, guid: 034ffd4e09ffb7348b2fe6634259058a, type: 2} 00000003: type: {class: RenderedObjectInfoLabeler, ns: UnityEngine.Perception.GroundTruth, asm: Unity.Perception.Runtime} data: enabled: 1 - foldout: 0 objectInfoMetricId: 5BA92024-B3B7-41A7-9D3F-C03A6A8DDD01 - labelingConfiguration: {fileID: 11400000, guid: be3971a848968144e8d07d9136a5bf49, + idLabelConfig: {fileID: 11400000, guid: 034ffd4e09ffb7348b2fe6634259058a, type: 2} --- !u!1 &1640252278 GameObject: diff --git a/com.unity.perception/Documentation~/GettingStarted.md b/com.unity.perception/Documentation~/GettingStarted.md index 0fdf54be4..4317f5bd5 100644 --- a/com.unity.perception/Documentation~/GettingStarted.md +++ b/com.unity.perception/Documentation~/GettingStarted.md @@ -10,7 +10,7 @@ This step can be skipped for HDRP projects. 1. Select your project's `ScriptableRenderer` asset and open the inspector window. In most projects it is located at `Assets/Settings/ForwardRenderer.asset`. 2. Click `Add Renderer Feature` and select `Ground Truth Renderer Feature` - + ## Step 3: Create a new scene and camera 1. Create a new scene using File -> New Scene @@ -20,35 +20,33 @@ This step can be skipped for HDRP projects. 1. In the inspector panel of the main camera select Add Component 2. Add a **Perception Camera** component - + ## Step 4: Create labeled objects 1. Create a cube by right-clicking in the Hierarchy window, select 3D Object -> Cube -1. Create 2 more cubes this way -1. Change the names of the cubes to Cube, Box, and Crate -1. Position the Cubes in front of the main Camera +2. Create 2 more cubes this way +3. Change the names of the cubes to Cube, Box, and Crate +4. Position the Cubes in front of the main Camera -1. On each cube, from the inspector panel add a **Labeling** component +5. On each cube, from the inspector panel add a **Labeling** component 1. Click the **+** 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 + -1. In the Project panel right click -> Perception -> Labeling Configuration -1. Select the new **Labeling Configuration** +6. In the Project panel right click -> Perception -> Labeling Configuration +7. Select the new **ID Label Config** 1. Click the **+** 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) - 3. Add a numerical value to the value field - 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 - - + -1. Select the Main Camera in the Hierarchy panel -1. In the Perception Camera attach the Labeling Configuration created in previous step +8. Select the Main Camera in the Hierarchy panel +9. In the Perception Camera attach the ID Label Config created in previous step for each ID Label config - + ## Step 5: Run simulation and generate dataset 1. Press play in the editor, allow the scene to run for a few seconds, and then exit playmode diff --git a/com.unity.perception/Documentation~/images/IDLabelingConfigurationFinished.PNG b/com.unity.perception/Documentation~/images/IDLabelingConfigurationFinished.PNG new file mode 100644 index 000000000..3e6aa4100 Binary files /dev/null and b/com.unity.perception/Documentation~/images/IDLabelingConfigurationFinished.PNG differ diff --git a/com.unity.perception/Documentation~/images/LabelingConfigurationFinished.PNG b/com.unity.perception/Documentation~/images/LabelingConfigurationFinished.PNG deleted file mode 100644 index b078823d1..000000000 Binary files a/com.unity.perception/Documentation~/images/LabelingConfigurationFinished.PNG and /dev/null differ diff --git a/com.unity.perception/Documentation~/images/MainCameraConfig.PNG b/com.unity.perception/Documentation~/images/MainCameraConfig.PNG deleted file mode 100644 index 845a37375..000000000 Binary files a/com.unity.perception/Documentation~/images/MainCameraConfig.PNG and /dev/null differ diff --git a/com.unity.perception/Documentation~/images/MainCameraLabelConfig.PNG b/com.unity.perception/Documentation~/images/MainCameraLabelConfig.PNG new file mode 100644 index 000000000..c346180d8 Binary files /dev/null and b/com.unity.perception/Documentation~/images/MainCameraLabelConfig.PNG differ diff --git a/com.unity.perception/Documentation~/images/PerceptionCamera.png b/com.unity.perception/Documentation~/images/PerceptionCamera.png deleted file mode 100644 index 8852ba74d..000000000 Binary files a/com.unity.perception/Documentation~/images/PerceptionCamera.png and /dev/null differ diff --git a/com.unity.perception/Documentation~/images/PerceptionCameraFinished.png b/com.unity.perception/Documentation~/images/PerceptionCameraFinished.png new file mode 100644 index 000000000..14e600722 Binary files /dev/null and b/com.unity.perception/Documentation~/images/PerceptionCameraFinished.png differ diff --git a/com.unity.perception/package.json b/com.unity.perception/package.json index 73329e11b..338cff14a 100644 --- a/com.unity.perception/package.json +++ b/com.unity.perception/package.json @@ -10,5 +10,5 @@ "displayName": "Perception", "name": "com.unity.perception", "unity": "2019.3", - "version": "0.1.0-preview.4" + "version": "0.3.0-preview.1" }