Merge v0.5.0 (#131)

.yamato/yamato-config.yml

@@ -8,7 +8,7 @@ variables:
 commands:
     - git submodule update --init --recursive
     - python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-    - unity-downloader-cli -u 2020.2.0b9 -c editor -c StandaloneSupport-IL2CPP -c Linux --wait --published
+    - unity-downloader-cli -u 2020.3.11f1 -c editor -c StandaloneSupport-IL2CPP -c Linux --wait --published
     - git clone [email protected]:unity/utr.git utr
     - utr/utr --testproject=./TestUrdfImporter --editor-location=.Editor --reruncount=0 --artifacts_path=test-results --suite=playmode --suite=editor --platform=Editor --enable-code-coverage --coverage-results-path=../test-results --coverage-options="assemblyFilters:+Unity.Robotics.URDFImporter,+Unity.Robotics.URDFImporter.Editor;generateHtmlReport;generateBadgeReport;generateAdditionalMetrics"
     # check test coverage

README.md

@@ -1,6 +1,8 @@
 # URDF Importer 
 
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Version](https://img.shields.io/github/v/tag/Unity-Technologies/URDF-Importer)](https://github.com/Unity-Technologies/URDF-Importer/releases)
+[![License](https://img.shields.io/badge/license-Apache--2.0-green.svg)](LICENSE.md)
+![Unity](https://img.shields.io/badge/unity-2020.2+-brightgreen)
 
 URDF Importer allows you to import a robot defined in [URDF](http://wiki.ros.org/urdf/XML) format in a Unity scene. URDF defines the geometry, visual meshes, kinematic and dynamic attributes of a Robot. Importer parses a URDF file and imports it into Unity using PhyX 4.0 articulation bodies.
 
@@ -14,7 +16,7 @@ URDF Importer allows you to import a robot defined in [URDF](http://wiki.ros.org
 
 <img src = "images~/Package_manager_add.png">
 
-3. Enter the git URL for the URDF Importer with the latest version tag (currently v0.4.0) `https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer#v0.4.0` in the text box and press `Enter`.
+3. Enter the git URL for the URDF Importer with the latest version tag (currently v0.5.0) `https://github.com/Unity-Technologies/URDF-Importer.git?path=/com.unity.robotics.urdf-importer#v0.5.0` in the text box and press `Enter`.
 
 4. Click `Import URDF`.
 

TestUrdfImporter/Assets/Settings/ForwardRenderer.asset

@@ -13,14 +13,19 @@ MonoBehaviour:
   m_Name: ForwardRenderer
   m_EditorClassIdentifier: 
   m_RendererFeatures: []
+  m_RendererFeatureMap: 
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+  xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
   shaders:
     blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
     copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
-    screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd,
-      type: 3}
+    screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3}
     samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+    tileDepthInfoPS: {fileID: 0}
+    tileDeferredPS: {fileID: 0}
+    stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
     fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+    materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
   m_OpaqueLayerMask:
     serializedVersion: 2
     m_Bits: 4294967295
@@ -34,3 +39,6 @@ MonoBehaviour:
     passOperation: 0
     failOperation: 0
     zFailOperation: 0
+  m_ShadowTransparentReceive: 1
+  m_RenderingMode: 0
+  m_AccurateGbufferNormals: 0

TestUrdfImporter/Packages/manifest.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.3.9",
+    "com.unity.collab-proxy": "1.5.7",
     "com.unity.ide.rider": "2.0.7",
-    "com.unity.ide.visualstudio": "2.0.3",
-    "com.unity.ide.vscode": "1.2.2",
-    "com.unity.render-pipelines.universal": "10.0.0-preview.26",
+    "com.unity.ide.visualstudio": "2.0.8",
+    "com.unity.ide.vscode": "1.2.3",
+    "com.unity.render-pipelines.universal": "10.5.0",
     "com.unity.robotics.urdf-importer": "file:../../com.unity.robotics.urdf-importer",
-    "com.unity.test-framework": "1.1.20",
+    "com.unity.test-framework": "1.1.24",
     "com.unity.testtools.codecoverage": "1.0.0",
-    "com.unity.textmeshpro": "3.0.1",
-    "com.unity.timeline": "1.4.3",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.4.8",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

TestUrdfImporter/Packages/packages-lock.json

@@ -1,10 +1,12 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": {
-      "version": "1.3.9",
+      "version": "1.5.7",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.nuget.newtonsoft-json": "2.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.editorcoroutines": {
@@ -31,14 +33,16 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.3",
+      "version": "2.0.8",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.2",
+      "version": "1.2.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -51,8 +55,15 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "2.0.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.render-pipelines.core": {
-      "version": "10.0.0-preview.30",
+      "version": "10.5.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -61,13 +72,13 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.universal": {
-      "version": "10.0.0-preview.26",
+      "version": "10.5.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.mathematics": "1.1.0",
-        "com.unity.render-pipelines.core": "10.0.0-preview.30",
-        "com.unity.shadergraph": "10.0.0-preview.27"
+        "com.unity.render-pipelines.core": "10.5.0",
+        "com.unity.shadergraph": "10.5.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -80,7 +91,7 @@
       }
     },
     "com.unity.searcher": {
-      "version": "4.3.1",
+      "version": "4.3.2",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
@@ -94,17 +105,17 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "10.0.0-preview.27",
+      "version": "10.5.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.render-pipelines.core": "10.0.0-preview.30",
-        "com.unity.searcher": "4.3.1"
+        "com.unity.render-pipelines.core": "10.5.0",
+        "com.unity.searcher": "4.3.2"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.20",
+      "version": "1.1.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -125,7 +136,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "3.0.1",
+      "version": "3.0.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -134,7 +145,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.4.3",
+      "version": "1.4.8",
       "depth": 0,
       "source": "registry",
       "dependencies": {

TestUrdfImporter/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.2.0b9
-m_EditorVersionWithRevision: 2020.2.0b9 (ef2968fa77ae)
+m_EditorVersion: 2020.3.11f1
+m_EditorVersionWithRevision: 2020.3.11f1 (99c7afb366b3)

TestUrdfImporter/ProjectSettings/URPProjectSettings.asset

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_LastMaterialVersion: 2
+  m_LastMaterialVersion: 4

Third Party Notices.md

@@ -1,16 +1,39 @@
-Component name: siemens/ros-sharp<br/>
-Copyright 2017-2020 Siemens AG<br/>
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at<br/>
+Component name: ROS# (siemens/ros-sharp)
 
-   http://www.apache.org/licenses/LICENSE-2.0<br/>
+License Type: Apache 2.0
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-<hr/>
+Copyright 2017-2020 Siemens AG
 
-Component name: jasonmeisel/v-hacd-unity<br/>
-Copyright 2017-2020 Jason Meisel<br/>
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at<br/>
+```
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the 
+License at
 
-   http://www.apache.org/licenses/LICENSE-2.0<br/>
+   http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed 
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+specific language governing permissions and limitations under the License.
+```
+
+---
+
+Component name: VHACD Unity (jasonmeisel/v-hacd-unity)
+
+License Type: Apache 2.0
+
+Copyright 2017-2020 Jason Meisel
+
+```
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the 
+License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed 
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+specific language governing permissions and limitations under the License.
+```

com.unity.robotics.urdf-importer/CHANGELOG.md

@@ -20,6 +20,37 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ### Fixed
 
+## [0.5.0-preview] - 2021-07-15
+
+### Upgrade Notes
+Update third party notices
+
+Upgrade namespace from RosSharp.Urdf to Unity.Robotics.UrdfImporter
+
+### Known Issues
+
+### Added
+Adding badges to main README
+
+### Changed
+STL files will not be automatically processed to create .prefab files when copied into the Assets directory or when assets are reimported. Instead the processing happens during the URDF import and required .prefab files will be created if they don't exist already or if the "Overwrite Existing Prefabs" option is checked in the URDF Import settings dialog.
+
+Renamed "URDF" to "Urdf" in class names, function names and source filenames.
+
+Renamed RuntimeURDFImporter to RuntimeUrdfImporterExample for clarification
+
+### Deprecated
+
+### Removed
+
+### Fixed
+Bug where-in URDF Importer would throw an error when installed via Package Manager because it can't save prefabs to its own directories
+
+Compile error "Plugin 'assimp.dll' is used from several locations" when creating a Universal Windows Platform build (#122) 
+
+Fix no material issue in Export robot to URDF (#127)
+
+Fix the inconsistent casing of meta files (#128)
 
 ## [0.4.0-preview] - 2021-05-27
 
@@ -46,4 +77,4 @@ Add unit tests and test coverage reporting
 ### Fixed
 Correct collider rotation so that the collider meshes matches visual meshes for both Y-axis and Z-axis
 
-Replace "../" with the expected "package://" and throw more warnings if things still don't match up
+Replace "../" with the expected "package://" and throw more warnings if things still don't match up