Commit 4f88557
Merge Dev to Main (#115)
* Adding ROS# link (#39)
* Adding ROS# link
* Fixing Unity 2020.1.8f1 compatability issues.
* Adding precompile error if an older version of Unity is used
* Fixing spacing
* Removing 2020.1 version enforcement
* Remove degree to rad conversions (#44)
* AIRO-331 Re-organizing package directory and adding Yamato integration (#41)
* Moving package into package folder
* Adding test project.
* Adding boilerplate tests.
* Add yamato config
* Disabling audio in test project and adding submodule checkout to Yamato cfg
* Adding Unity .gitattributes and normalizing line endings. (#42)
* Vidur/remove controller limits for free joints (#45)
* AIRO - 365 Add feedback while URDF is being imported (#43)
* Convert RobotExtensions to an iterator
* Adding EditorCorutine to package manifest
* Adding import status data
* Updating the assembly file.
* Adding option to add or remove progressbar
* Update git links with tags(#48)
* Regenerating meta files for tests copied from ROS-TCP-Connector
* Latest VHACD (#49)
* Remove the submodule for now, to avoid a packman bug. (#52)
* Update version (#53)
* VHACD license -> root folder (#55)
* VHACD dlls should not be in LFS
* update latest version in readme (#58)
* Disable RigidbodyEditor controls at runtime
Fix for #59
* test.txt
* deleting the txt file added by mistake
* Adding default values for Articulation Body Parameters (#57)
* Adding a default value if mass is zero.
* Correct the null value error in Articulation Body attributes
* Adding return value of Create function as GameObject
* Adding default values variables for damping and friction
* Update link branch from master to main. (#66)
* Updating Contribution Content (#68)
* Contributing content
* PR feedback
* Adding PR template (#73)
* Resolve conflicts (#80)
Merge main to dev and resolve all the conflicts
* Update package.json (#84)
* Fix bad merge
* Fix bad merge
* support for runtime urdf importing (#67)
* moved "NeedsRuntimeConversion" to Runtime and adjusted namespace
* moved MeshProcessing and AssetHandler to Runtime
* move all editor only calls to RuntimeURDF.cs
* fixed compile issues: builds in runtime, but does nothing
* URDF can now be imported in runtime (STL only)
* cleanup: moved files into corresponding runtime directories.
* Added UnityMeshImporter and AssimpNet plugin
* Loading collada files in runtime (using AssimpNet plugin).
* Proper creation of materials for HDRP/Standard when loading collada files
* disable Assimpnet for IL2CPP builds
* added parameter to URDFRobotExtensions.Create() to allow the option of using the runtime import mode in editor.
* cleaning up material extensions
* disable controller component during import to avoid incorrect configuration.
* fix for the default diffuse material in HDRP
* minor clean up and code convention fixes
* added support for .obj visual meshes
* don't enable the controller automatically in runtime mode.
* variable name typo fix
* Broke the Create() function into pipeline stages to reuse the code for both the none-blocking coroutine and blocking function call.
* Added RuntimeURDFImporter component as an example usage of runtime import functionality
* fix the bug with editor dialogs
* random code formatting fixes
* Moved and renamed the Transform extension function FindChildByQuery
* fixed materials for URP projects.
* removed unused code.
* minor code formatting
* removed unused code
* URDF imported objects lose mesh colliders when made into prefabs (#72)
* Saving decomposed mesh
* checks to make the newly added vhacd mesh creation be compatible with the runtime mode.
* minor code formatting
Co-authored-by: Hamid Younesy <hamid.younesy@unity3d.com>
* removing lfs as causes issues with the plugin dlls
* deleting plugin to add it back without lfs
* adding back AssimpNet libraries without lfs
* deleting vhacd library to add it back without lfs
* adding back VHACD libraries without lfs
* Fixed the overexposed highlight color
Co-authored-by: vidurvij-Unity <60901103+vidurvij-Unity@users.noreply.github.com>
* Hamid/fix bad merge (#87)
* Merge 0.3.0 into main (#86)
* Adding ROS# link (#39)
* Adding ROS# link
* Fixing Unity 2020.1.8f1 compatability issues.
* Adding precompile error if an older version of Unity is used
* Fixing spacing
* Removing 2020.1 version enforcement
* Remove degree to rad conversions (#44)
* AIRO-331 Re-organizing package directory and adding Yamato integration (#41)
* Moving package into package folder
* Adding test project.
* Adding boilerplate tests.
* Add yamato config
* Disabling audio in test project and adding submodule checkout to Yamato cfg
* Adding Unity .gitattributes and normalizing line endings. (#42)
* Vidur/remove controller limits for free joints (#45)
* AIRO - 365 Add feedback while URDF is being imported (#43)
* Convert RobotExtensions to an iterator
* Adding EditorCorutine to package manifest
* Adding import status data
* Updating the assembly file.
* Adding option to add or remove progressbar
* Update git links with tags(#48)
* Regenerating meta files for tests copied from ROS-TCP-Connector
* Latest VHACD (#49)
* Remove the submodule for now, to avoid a packman bug. (#52)
* Update version (#53)
* VHACD license -> root folder (#55)
* VHACD dlls should not be in LFS
* update latest version in readme (#58)
* Disable RigidbodyEditor controls at runtime
Fix for #59
* test.txt
* deleting the txt file added by mistake
* Adding default values for Articulation Body Parameters (#57)
* Adding a default value if mass is zero.
* Correct the null value error in Articulation Body attributes
* Adding return value of Create function as GameObject
* Adding default values variables for damping and friction
* Update link branch from master to main. (#66)
* Updating Contribution Content (#68)
* Contributing content
* PR feedback
* Adding PR template (#73)
* Resolve conflicts (#80)
Merge main to dev and resolve all the conflicts
* Update package.json (#84)
* Fix bad merge
* Fix bad merge
Co-authored-by: vidurvij-Unity <60901103+vidurvij-Unity@users.noreply.github.com>
Co-authored-by: Devin Miller (Unity) <mrpropellers@users.noreply.github.com>
Co-authored-by: Devin Miller <devin.miller@unity3d.com>
Co-authored-by: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com>
Co-authored-by: Hamid Younesy <hamid.younesy@unity3d.com>
Co-authored-by: Amanda <31416491+at669@users.noreply.github.com>
* removing unused meta file
Co-authored-by: LaurieCheers-unity <73140792+LaurieCheers-unity@users.noreply.github.com>
Co-authored-by: vidurvij-Unity <60901103+vidurvij-Unity@users.noreply.github.com>
Co-authored-by: Devin Miller (Unity) <mrpropellers@users.noreply.github.com>
Co-authored-by: Devin Miller <devin.miller@unity3d.com>
Co-authored-by: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com>
Co-authored-by: Amanda <31416491+at669@users.noreply.github.com>
* [AIRO-589] Model and collision rotation mismatch (#78)
correct collider rotation only for y-axis and add null check
* Replace ../ with package://, throw more warnings otherwise (#90)
* Replace ../ with package://, throw more warnings otherwise
* PR feedback: more descriptive warning message
* add changelog (#92)
add changelog
* Save assets for generated cylinder meshes (#91)
* Initial GeneratedMeshes directory commit
* Cylinder mesh saving
* PR feedback: new cylinder method, Unity decomposer support
* PR feedback: non-VHACD cylinder, unit tests
* PR feedback: unit test conventions
* Forum links to README, config.yml (#96)
* Add test coverage (#93)
* Math, VHACD Unit Tests (#94)
* Math, VHACD tests
* Organization for Math, VHACD
* Vector3 fixes
* fix the bash numeric error (#99)
* RuntimeURDF tests (#97)
* RuntimeURDF tests, skippping dialogs
* PR feedback: removing unused blocks
* Geometry, GeometryCollision Tests (#95)
* UrdfGeometry tests
* Folder organization
* PR feedback: test fixes, Yamato config
* Added sample STL for Geometry tests
* UrdfCollisionExtensions, UrdfCollisionsExtensions Tests (#98)
* UrdfCollisionExtensions tests
* UrdfCollisionsExtensions tests
* Destroy objects, naming conventions
* UrdfCollision(s) minor cleanup, reorganization
* Fixing line coverage typo
* Cleaning up Geometry tests, fixes to Collisions tests
* Remove class member
* add unit tests for UrdfJoint (#100)
* BuiltInExtensions Tests (#103)
* BuiltInExtensions Tests
* Removed debug logs
* PR feedback: internal BuiltIn class
* Add unit tests for UrdfJoints (#102)
* UrdfAssetPathHandler Tests (#104)
* UrdfAssetPathHandler Tests
* UrdfAssetPathHandler test cleanup
* PR feedback
* update version to 0.4.0 (#109)
Co-authored-by: vidurvij-Unity <60901103+vidurvij-Unity@users.noreply.github.com>
Co-authored-by: Devin Miller (Unity) <mrpropellers@users.noreply.github.com>
Co-authored-by: Devin Miller <devin.miller@unity3d.com>
Co-authored-by: LaurieCheers-unity <73140792+LaurieCheers-unity@users.noreply.github.com>
Co-authored-by: peifeng-unity <56408141+peifeng-unity@users.noreply.github.com>
Co-authored-by: Hamid Younesy <hamid.younesy@unity3d.com>
Co-authored-by: Amanda <31416491+at669@users.noreply.github.com>
Co-authored-by: Hamid Younesy <hyounesy@users.noreply.github.com>1 parent c412085 commit 4f88557
File tree
168 files changed
+17428
-1087
lines changed- .github
- ISSUE_TEMPLATE
- .yamato
- TestUrdfImporter/Packages
- com.unity.robotics.urdf-importer
- Editor
- CustomEditors
- MenuItems
- MeshProcessing
- NeedsRuntimeConversion/Extensions
- Runtime
- AssetHandlers
- Controller
- Extensions
- Math
- MeshProcessing
- RosSharpDefinitions
- RuntimeImport
- UnityMeshImporter
- Plugins
- AssimpNet
- Native
- linux
- x86_64
- osx
- x86_64
- win
- x86_64
- x86
- UrdfComponents
- UrdfJoints
- VHACD
- Tests/Runtime
- AssetHandlers
- Assets
- URDF
- cube
- meshes
- Extensions
- Math
- RuntimeImport
- UrdfComponents
- UrdfJoints
- VHACD
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
168 files changed
+17428
-1087
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | 2 | | |
4 | | - | |
5 | 3 | | |
6 | 4 | | |
7 | 5 | | |
| |||
29 | 27 | | |
30 | 28 | | |
31 | 29 | | |
32 | | - | |
33 | 30 | | |
34 | 31 | | |
35 | 32 | | |
| |||
42 | 39 | | |
43 | 40 | | |
44 | 41 | | |
45 | | - | |
46 | 42 | | |
47 | 43 | | |
48 | 44 | | |
49 | 45 | | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
| 32 | + | |
| 33 | + | |
32 | 34 | | |
33 | 35 | | |
34 | 36 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
14 | 19 | | |
15 | 20 | | |
16 | 21 | | |
17 | | - | |
| 22 | + | |
18 | 23 | | |
19 | | - | |
20 | | - | |
| 24 | + | |
| 25 | + | |
21 | 26 | | |
22 | 27 | | |
23 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
54 | | - | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
55 | 56 | | |
56 | | - | |
57 | | - | |
| 57 | + | |
| 58 | + | |
58 | 59 | | |
59 | 60 | | |
60 | 61 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
17 | 24 | | |
18 | 25 | | |
19 | 26 | | |
| |||
68 | 75 | | |
69 | 76 | | |
70 | 77 | | |
71 | | - | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
72 | 81 | | |
73 | 82 | | |
74 | 83 | | |
| |||
77 | 86 | | |
78 | 87 | | |
79 | 88 | | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
80 | 96 | | |
81 | 97 | | |
82 | 98 | | |
| |||
88 | 104 | | |
89 | 105 | | |
90 | 106 | | |
91 | | - | |
| 107 | + | |
92 | 108 | | |
93 | 109 | | |
94 | 110 | | |
95 | | - | |
| 111 | + | |
96 | 112 | | |
97 | 113 | | |
98 | 114 | | |
99 | 115 | | |
100 | 116 | | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
101 | 127 | | |
102 | 128 | | |
103 | 129 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
105 | | - | |
| 105 | + | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
| 123 | + | |
123 | 124 | | |
| 125 | + | |
124 | 126 | | |
125 | 127 | | |
126 | 128 | | |
| |||
0 commit comments