Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BE week] - Remove VHACD integration #2128

Merged
merged 9 commits into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ jobs:
cd habitat-sim
pip install -r requirements.txt --progress-bar off
git submodule update --init --recursive --jobs 8
python -u setup.py install --build-type "Release" --no-lto --headless --vhacd --bullet
python -u setup.py install --build-type "Release" --no-lto --headless --bullet
- run:
name: run clang-tidy
command: |
Expand Down Expand Up @@ -429,7 +429,7 @@ jobs:
texlive-fonts-recommended

# Rebuild with all options enabled
./build.sh --with-cuda --with-bullet --vhacd
./build.sh --with-cuda --with-bullet
cd docs
git submodule update --init
./build-public.sh
Expand All @@ -441,7 +441,7 @@ jobs:
. activate habitat;
cd habitat-sim
#Rebuild headless
python setup.py install --headless --with-bullet --with-cuda --vhacd
python setup.py install --headless --with-bullet --with-cuda
cd ..
if [ ! -d ./habitat-lab ]
then
Expand Down Expand Up @@ -511,7 +511,7 @@ jobs:
pip install -r requirements.txt --progress-bar off
pip install imageio imageio-ffmpeg
git submodule update --init --recursive --jobs 8
python -u setup.py install --build-type "Release" --lto --headless --vhacd --bullet
python -u setup.py install --build-type "Release" --lto --headless --bullet
- run:
name: Ccache stats
when: always
Expand Down Expand Up @@ -587,7 +587,6 @@ jobs:
# run tests with code coverage
CORRADE_TEST_COLOR=ON GTEST_COLOR=yes ./build.sh --headless \
--bullet \
--vhacd \
--with-cuda \
--build-datatool \
--run-tests \
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@
[submodule "src/deps/bullet3"]
path = src/deps/bullet3
url = https://github.com/bulletphysics/bullet3
[submodule "src/deps/v-hacd"]
path = src/deps/v-hacd
url = https://github.com/ScottCSteinhauser/v-hacd.git
[submodule "src/deps/openexr"]
path = src/deps/openexr
url = https://github.com/AcademySoftwareFoundation/openexr
Expand Down
1 change: 0 additions & 1 deletion conda-build/habitat-sim/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# LICENSE file in the root directory of this source tree.

build_args=(--skip-install-magnum)
build_args+=("--vhacd")
if [ "${LTO}" == "1" ]; then
build_args+=("--lto")
fi
Expand Down
228 changes: 0 additions & 228 deletions examples/tutorials/VHACD_tutorial.py

This file was deleted.

Loading