Skip to content

Commit b59f6e1

Browse files
ahcordechapulina
andauthored
Removed USD component from SDFormat and move to gz-usd (#1094)
Signed-off-by: ahcorde <ahcorde@gmail.com> Signed-off-by: Louise Poubel <louise@openrobotics.org> Co-authored-by: Louise Poubel <louise@openrobotics.org>
1 parent f776995 commit b59f6e1

Some content is hidden

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

95 files changed

+18
-14772
lines changed

.github/ci/before_cmake.sh

-61
This file was deleted.

.github/ci/packages.apt

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
libignition-cmake2-dev
2-
libignition-common4-dev
32
libignition-math6-dev
43
libignition-tools-dev
54
libignition-utils1-dev

.github/workflows/ci.yml

-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ jobs:
1616
runs-on: ubuntu-latest
1717
name: Ubuntu Focal CI
1818
steps:
19-
- name: Set env
20-
run: |
21-
echo "PATH=$PATH:/tmp/USD/bin" >> $GITHUB_ENV
22-
echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp/USD/lib" >> $GITHUB_ENV
23-
echo "CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:/tmp/USD" >> $GITHUB_ENV
2419
- name: Checkout
2520
uses: actions/checkout@v2
2621
- name: Compile and test

CMakeLists.txt

+1-12
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,9 @@ if (BUILD_SDF)
110110
########################################
111111
# Find ignition utils
112112
ign_find_package(ignition-utils1 VERSION REQUIRED)
113-
ign_find_package(ignition-utils1 COMPONENTS cli REQUIRED_BY usd)
114113
set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR})
115114

116-
########################################
117-
# Find ignition common
118-
ign_find_package(ignition-common4 COMPONENTS graphics REQUIRED_BY usd)
119-
set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
120-
121-
########################################
122-
# Find PXR
123-
ign_find_package(pxr QUIET REQUIRED_BY usd PKGCONFIG pxr)
124-
125-
ign_configure_build(HIDE_SYMBOLS_BY_DEFAULT QUIT_IF_BUILD_ERRORS
126-
COMPONENTS usd)
115+
ign_configure_build(HIDE_SYMBOLS_BY_DEFAULT QUIT_IF_BUILD_ERRORS)
127116

128117
ign_create_packages()
129118

Migration.md

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ forward programmatically.
1212
This document aims to contain similar information to those files
1313
but with improved human-readability..
1414

15+
## libsdformat 12.5.0 to 12.6.0
16+
17+
### Modifications
18+
19+
1. USD component now is living in https://github.com/gazebosim/gz-usd as an
20+
independent package.
21+
1522
## libsdformat 11.x to 12.0
1623

1724
An error is now emitted instead of a warning for a file containing more than

examples/usdConverter/README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@ This example shows how a world in a SDF file can be converted to [USD](https://g
66

77
You will need all of the dependencies for sdformat, along with the following additional dependencies:
88
* USD: [installation instructions](https://github.com/PixarAnimationStudios/USD/blob/release/README.md#getting-and-building-the-code)
9-
* [ignition-common4](https://github.com/ignitionrobotics/ign-common)
10-
* [ignition-utils1 (including the CLI component)](https://github.com/ignitionrobotics/ign-utils)
9+
* [gz-usd](https://github.com/gazebosim/gz-usd)
10+
* [sdformat](https://github.com/gazebosim/sdformat)
1111

1212
## Setup
1313

14-
Build sdformat. The steps below follow a traditional cmake build, but sdformat
14+
Build `gz-usd`. The steps below follow a traditional cmake build, but `gz-usd`
1515
can also be built with [colcon](https://colcon.readthedocs.io/en/released/index.html):
1616
```bash
17-
git clone https://github.com/ignitionrobotics/sdformat.git
18-
cd sdformat
17+
git clone https://github.com/gazebosim/gz-usd
18+
cd gz-usd
1919
mkdir build
2020
cd build
2121
cmake ..
2222
make
2323
```
2424

25-
You should now have an executable named `sdf2usd` in the `sdformat/build/bin` directory.
25+
You should now have an executable named `sdf2usd` in the `./build/bin` directory.
2626
This executable can be used to convert a SDF world file to a USD file.
27-
To see how the executable works, run the following command from the `sdformat/build/bin` directory:
27+
To see how the executable works, run the following command from the `./build/bin` directory:
2828
```bash
2929
./sdf2usd -h
3030
```
3131

32-
To convert [shapes_world.sdf](https://github.com/ignitionrobotics/sdformat/blob/sdf12/test/sdf/shapes_world.sdf) to its USD representation as a file called `shapes.usd`, run the following commands:
32+
To convert [shapes_world.sdf](https://github.com/gazebosim/sdformat/blob/sdf12/test/sdf/shapes_world.sdf) to its USD representation as a file called `shapes.usd`, run the following commands:
3333

3434
```bash
35-
wget https://raw.githubusercontent.com/ignitionrobotics/sdformat/sdf12/test/sdf/shapes_world.sdf
35+
wget https://raw.githubusercontent.com/gazebosim/sdformat/sdf12/test/sdf/shapes_world.sdf
3636
./sdf2usd shapes_world.sdf shapes.usd
3737
```
3838

@@ -59,5 +59,5 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/USD/lib
5959
```
6060
6161
Another thing to note if building with colcon is that after sourcing the workspace with sdformat,
62-
the `sdf2usd` executable can be run without having to go to the `sdformat/build/bin` directory.
62+
the `sdf2usd` executable can be run without having to go to the `./build/bin` directory.
6363
So, instead of going to that directory and running `./sdf2usd ...`, you should be able to run `sdf2usd ...` from anywhere.

test/sdf/usd_sensors.sdf

-144
This file was deleted.

0 commit comments

Comments
 (0)