Skip to content

Commit bbb411e

Browse files
LaurieCheers-unitympinolchris15josephvidurvij-Unitymrpropellers
authored
Merge dev into main - Version 0.2.0 (#56)
* Adding ROS# link (#39) * 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. * Add yamato config * Adding Unity .gitattributes and normalizing line endings. (#42) * AIRO - 365 Add feedback while URDF is being imported (#43) * Update git links with tags(#48) * Latest VHACD (#49) * VHACD license -> root folder (#55) Co-authored-by: mpinol <mpinol@users.noreply.github.com> Co-authored-by: Christopher Joseph <cjoseph@virtanatech.com> Co-authored-by: Christopher Joseph <38385529+chris15joseph@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>
1 parent 5ba94b3 commit bbb411e

File tree

272 files changed

+6545
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+6545
-99
lines changed

.gitattributes

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
* text=auto eol=lf
2+
3+
# EOL
4+
5+
*.py eol=lf
6+
*.pl eol=lf
7+
*.pm eol=lf
8+
*.t eol=lf
9+
*.it eol=lf
10+
*.h eol=lf
11+
*.cpp eol=lf
12+
*.cs eol=lf
13+
*.c eol=lf
14+
*.txt eol=lf
15+
*.bindings eol=lf
16+
*.sh eol=lf
17+
*.jam eol=lf
18+
*.as eol=lf
19+
*.boo eol=lf
20+
*.java eol=lf
21+
*.js eol=lf
22+
Makefile eol=lf
23+
*.shader eol=lf
24+
*.cginc eol=lf
25+
*.glslinc eol=lf
26+
*.meta eol=lf
27+
*.mm eol=lf
28+
*.md eol=lf
29+
Runtime/Export/common_* eol=lf
30+
Repositories.ini eol=lf
31+
.hgignore eol=lf
32+
33+
# vs can handle these as lf, but really wants them as crlf
34+
*.vcproj eol=crlf
35+
*.vcxproj eol=crlf
36+
*.vcxproj.filters eol=crlf
37+
*.csproj eol=crlf
38+
*.props eol=crlf
39+
*.targets eol=crlf
40+
*.sln eol=crlf
41+
*.sln.template eol=crlf
42+
*.bat eol=crlf
43+
*.cmd eol=crlf
44+
*.xaml eol=crlf
45+
46+
# the templating parser will actually fail on lf, inexplicably setting every #line directive as '1'
47+
*.tt eol=crlf
48+
*.t4 eol=crlf
49+
*.ttinclude eol=crlf
50+
51+
# LFS
52+
53+
# archives and well-known binary formats
54+
*.[zZ][iI][pP] filter=lfs diff=lfs merge=lfs -text
55+
*.7[zZ] filter=lfs diff=lfs merge=lfs -text
56+
*.[zZ]7 filter=lfs diff=lfs merge=lfs -text
57+
*.[tT][gG][zZ] filter=lfs diff=lfs merge=lfs -text
58+
*.[gG][zZ] filter=lfs diff=lfs merge=lfs -text
59+
*.[jJ][aA][rR] filter=lfs diff=lfs merge=lfs -text
60+
*.[nN][uU][pP][kK][gG] filter=lfs diff=lfs merge=lfs -text
61+
*.[eE][gG][gG] filter=lfs diff=lfs merge=lfs -text
62+
*.[aA][pP][kK] filter=lfs diff=lfs merge=lfs -text
63+
*.[mM][sS][iI] filter=lfs diff=lfs merge=lfs -text
64+
*.[aA][rR][cC] filter=lfs diff=lfs merge=lfs -text
65+
66+
# executables and libraries
67+
*.[aA] filter=lfs diff=lfs merge=lfs -text
68+
*.[oO] filter=lfs diff=lfs merge=lfs -text
69+
#*.[sS][oO] filter=lfs diff=lfs merge=lfs -text
70+
*.[bB][iI][nN] filter=lfs diff=lfs merge=lfs -text
71+
#*.[dD][lL][lL] filter=lfs diff=lfs merge=lfs -text
72+
*.[oO][bB][jJ] filter=lfs diff=lfs merge=lfs -text
73+
*.[dD][yY][lL][iI][bB] filter=lfs diff=lfs merge=lfs -text
74+
*.[lL][iI][bB] filter=lfs diff=lfs merge=lfs -text
75+
*.[eE][xX][eE] filter=lfs diff=lfs merge=lfs -text
76+
77+
# specific binaries in the unity codebase
78+
js filter=lfs diff=lfs merge=lfs -text
79+
p4 filter=lfs diff=lfs merge=lfs -text
80+
p4d filter=lfs diff=lfs merge=lfs -text
81+
flex filter=lfs diff=lfs merge=lfs -text
82+
bison filter=lfs diff=lfs merge=lfs -text
83+
distcc filter=lfs diff=lfs merge=lfs -text
84+
distccd filter=lfs diff=lfs merge=lfs -text
85+
gdbserver filter=lfs diff=lfs merge=lfs -text
86+
fastzip_darwin filter=lfs diff=lfs merge=lfs -text
87+
ProxyServer filter=lfs diff=lfs merge=lfs -text
88+
node filter=lfs diff=lfs merge=lfs -text
89+
usymtool filter=lfs diff=lfs merge=lfs -text
90+
libtool filter=lfs diff=lfs merge=lfs -text
91+
optool filter=lfs diff=lfs merge=lfs -text
92+
Cg filter=lfs diff=lfs merge=lfs -text
93+
PVRTexTool filter=lfs diff=lfs merge=lfs -text
94+
PVRTexToolCL filter=lfs diff=lfs merge=lfs -text
95+
PVRTexToolCLI filter=lfs diff=lfs merge=lfs -text
96+
iproxy filter=lfs diff=lfs merge=lfs -text
97+
7za filter=lfs diff=lfs merge=lfs -text
98+
yasm filter=lfs diff=lfs merge=lfs -text
99+
nasm filter=lfs diff=lfs merge=lfs -text
100+
lzma filter=lfs diff=lfs merge=lfs -text
101+
lzma-linux32 filter=lfs diff=lfs merge=lfs -text
102+
unity_web_d3d filter=lfs diff=lfs merge=lfs -text
103+
unity_web_gl filter=lfs diff=lfs merge=lfs -text
104+
Everyplay filter=lfs diff=lfs merge=lfs -text
105+
UnityAds filter=lfs diff=lfs merge=lfs -text
106+
usym_upload filter=lfs diff=lfs merge=lfs -text
107+
eng.cube.size filter=lfs diff=lfs merge=lfs -text
108+
eng.cube.nn filter=lfs diff=lfs merge=lfs -text
109+
ispc_osx filter=lfs diff=lfs merge=lfs -text
110+
dump_syms filter=lfs diff=lfs merge=lfs -text
111+
astcenc_linux filter=lfs diff=lfs merge=lfs -text
112+
astcenc_osx filter=lfs diff=lfs merge=lfs -text
113+
convert filter=lfs diff=lfs merge=lfs -text
114+
convert_linux filter=lfs diff=lfs merge=lfs -text
115+
etcpack2_linux filter=lfs diff=lfs merge=lfs -text
116+
arm-eabi-gdb.dist filter=lfs diff=lfs merge=lfs -text
117+
arm-eabi-gdb filter=lfs diff=lfs merge=lfs -text
118+
build-wrapper-linux-x86-64 filter=lfs diff=lfs merge=lfs -text
119+
build-wrapper-linux-x86-32 filter=lfs diff=lfs merge=lfs -text
120+
build-wrapper-macosx-x86 filter=lfs diff=lfs merge=lfs -text
121+
AudioPluginDemo filter=lfs diff=lfs merge=lfs -text
122+
re2c filter=lfs diff=lfs merge=lfs -text
123+
ios-deploy filter=lfs diff=lfs merge=lfs -text
124+
mobiledevice filter=lfs diff=lfs merge=lfs -text
125+
AssetBundles filter=lfs diff=lfs merge=lfs -text
126+
Unity4XC filter=lfs diff=lfs merge=lfs -text
127+
lemon filter=lfs diff=lfs merge=lfs -text
128+
etcpack filter=lfs diff=lfs merge=lfs -text
129+
etcpack2 filter=lfs diff=lfs merge=lfs -text
130+
enabundle filter=lfs diff=lfs merge=lfs -text
131+
assetDatabase3 filter=lfs diff=lfs merge=lfs -text
132+
MasterServer filter=lfs diff=lfs merge=lfs -text
133+
Facilitator filter=lfs diff=lfs merge=lfs -text
134+
RenderingPlugin filter=lfs diff=lfs merge=lfs -text
135+
Unitron filter=lfs diff=lfs merge=lfs -text
136+
DotMacKit filter=lfs diff=lfs merge=lfs -text
137+
ImageComparer filter=lfs diff=lfs merge=lfs -text
138+
GameKit filter=lfs diff=lfs merge=lfs -text
139+
OgreKit filter=lfs diff=lfs merge=lfs -text
140+
*.test-cache filter=lfs diff=lfs merge=lfs -text
141+
*.unitypackage filter=lfs diff=lfs merge=lfs -text
142+
Projects/VisualStudio/ipch/middleman-2afd44a3/unitywebpluginax-eba8f4d1.ipch filter=lfs diff=lfs merge=lfs -text
143+
Editor/Resources/Common/unity[[:space:]]editor[[:space:]]resources filter=lfs diff=lfs merge=lfs -text
144+
Editor/Resources/unity[[:space:]]editor[[:space:]]resources filter=lfs diff=lfs merge=lfs -text

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

.yamato/yamato-config.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: URDF Importer Unit Tests
2+
agent:
3+
type: Unity::VM
4+
image: robotics/ci-ubuntu20:latest
5+
flavor: i1.large
6+
variables:
7+
PATH: /root/.local/bin:/home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
8+
commands:
9+
- git submodule update --init --recursive
10+
- python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
11+
- unity-downloader-cli -u 2020.2.0b9 -c editor -c StandaloneSupport-IL2CPP -c Linux --wait --published
12+
- git clone git@github.cds.internal.unity3d.com:unity/utr.git utr
13+
- utr/utr --testproject=./TestUrdfImporter --editor-location=.Editor --reruncount=0 --artifacts_path=test-results --suite=playmode --suite=editor --platform=Editor
14+
triggers:
15+
cancel_old_ci: true
16+
expression: |
17+
(pull_request.target eq "main" AND
18+
NOT pull_request.push.changes.all match "**/*.md") OR
19+
(push.branch eq "dev" AND
20+
NOT push.changes.all match "**/*.md")
21+
artifacts:
22+
logs:
23+
paths:
24+
- "test-results/**/*"

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ URDF Importer allows you to import a robot defined in [URDF](http://wiki.ros.org
1212

1313
<img src = "images~/Package_manager_add.png">
1414

15-
3. Paste the link to the URDF github, https://github.com/Unity-Technologies/URDF-Importer.git repository in the text box and press `Enter`.
15+
3. Enter the git URL for the URDF Importer with the latest version tag (currently v0.1.2) `https://github.com/Unity-Technologies/URDF-Importer.git#v0.1.2` in the text box and press `Enter`.
1616

1717
4. Click `Import URDF`.
1818

@@ -34,3 +34,10 @@ URDF Importer allows you to import a robot defined in [URDF](http://wiki.ros.org
3434
# Tutorials
3535

3636
Instructions for using URDF importer can be found [here](https://github.com/Unity-Technologies/Unity-Robotics-Hub/blob/master/tutorials/urdf_importer/urdf_tutorial.md).
37+
38+
39+
## ROS#
40+
41+
Special thanks to the Siemens [ROS# Project Team]( https://github.com/siemens/ros-sharp/wiki/Info_Acknowledgements) for driving the ROS-Unity Integration Open Source since 2017.
42+
43+
This repo is a fork of [ROS#](https://github.com/siemens/ros-sharp) and was a great starting point for our development.

Runtime/Controller/JointControl.cs

Lines changed: 0 additions & 50 deletions
This file was deleted.

Runtime/VHACD

Lines changed: 0 additions & 1 deletion
This file was deleted.

TestUrdfImporter/.gitignore

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
4+
#
5+
/[Ll]ibrary/
6+
/[Tt]emp/
7+
/[Oo]bj/
8+
/[Bb]uild/
9+
/[Bb]uilds/
10+
/[Bb]uild_[Dd]ata/
11+
/[Bb]uild.app/
12+
/[Ll]ogs/
13+
/[Uu]ser[Ss]ettings/
14+
15+
# MemoryCaptures can get excessive in size.
16+
# They also could contain extremely sensitive data
17+
/[Mm]emoryCaptures/
18+
19+
# Asset meta data should only be ignored when the corresponding asset is also ignored
20+
!/[Aa]ssets/**/*.meta
21+
22+
# Uncomment this line if you wish to ignore the asset store tools plugin
23+
# /[Aa]ssets/AssetStoreTools*
24+
25+
# Autogenerated Jetbrains Rider plugin
26+
/[Aa]ssets/Plugins/Editor/JetBrains*
27+
28+
# Visual Studio cache directory
29+
.vs/
30+
.idea/
31+
32+
# Gradle cache directory
33+
.gradle/
34+
35+
# Autogenerated VS/MD/Consulo solution and project files
36+
ExportedObj/
37+
.consulo/
38+
*.so
39+
*.debug
40+
*.csproj
41+
*.unityproj
42+
*.sln
43+
*.suo
44+
*.tmp
45+
*.user
46+
*.userprefs
47+
*.pidb
48+
*.booproj
49+
*.svd
50+
*.pdb
51+
*.mdb
52+
*.opendb
53+
*.VC.db
54+
55+
# Unity3D generated meta files
56+
*.pidb.meta
57+
*.pdb.meta
58+
*.mdb.meta
59+
60+
# Unity3D generated file on crash reports
61+
sysinfo.txt
62+
63+
# Builds
64+
*.apk
65+
*.aab
66+
*.unitypackage
67+
68+
# Crashlytics generated file
69+
crashlytics-build.properties
70+
71+
# Packed Addressables
72+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
73+
74+
# Temporary auto-generated Android Assets
75+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
76+
/[Aa]ssets/[Ss]treamingAssets/aa/*

TestUrdfImporter/Assets/Materials.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)