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.

Sign up for GitHub

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

Jump to bottom

Consolidated worlds into a single file #298

Merged
merged 4 commits into from
Sep 14, 2024
Merged

Consolidated worlds into a single file #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b624ff
Consolidated worlds into a single file
evan-palmer Sep 14, 2024
9b27bdc
Merge remote-tracking branch 'origin/main' into dev-single-world-file
evan-palmer Sep 14, 2024
baad00b
Merge upstream
evan-palmer Sep 14, 2024
12bb95c
Fixed stale compose file change
evan-palmer Sep 14, 2024
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
1 change: 0 additions & 1 deletion .docker/compose/nouveau-desktop.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
blue:
image: ghcr.io/robotic-decision-making-lab/blue:rolling-desktop
Expand Down
1 change: 0 additions & 1 deletion .docker/compose/nvidia-desktop.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
blue:
image: ghcr.io/robotic-decision-making-lab/blue:rolling-desktop-nvidia
Expand Down
2 changes: 1 addition & 1 deletion blue_bringup/launch/bluerov2/bluerov2.launch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ launch:

- arg:
name: gazebo_world_file
default: $(find-pkg-share blue_description)/gazebo/worlds/$(var model_name)_underwater.world
default: $(find-pkg-share blue_description)/gazebo/worlds/underwater.world

- arg:
name: mavros_file
Expand Down
2 changes: 1 addition & 1 deletion blue_bringup/launch/bluerov2_heavy/bluerov2_heavy.launch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ launch:

- arg:
name: gazebo_world_file
default: $(find-pkg-share blue_description)/gazebo/worlds/$(var model_name)_underwater.world
default: $(find-pkg-share blue_description)/gazebo/worlds/underwater.world

- arg:
name: mavros_file
Expand Down
2 changes: 1 addition & 1 deletion blue_bringup/launch/bluerov2_heavy_reach/bluerov2_heavy_reach.launch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ launch:

- arg:
name: gazebo_world_file
default: $(find-pkg-share blue_description)/gazebo/worlds/$(var model_name)_underwater.world
default: $(find-pkg-share blue_description)/gazebo/worlds/underwater.world

- arg:
name: mavros_file
Expand Down
47 changes: 0 additions & 47 deletions blue_description/gazebo/worlds/bluerov2_heavy_reach_underwater.world
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions blue_description/gazebo/worlds/bluerov2_heavy_underwater.world
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions ...n/gazebo/worlds/bluerov2_underwater.world → ...escription/gazebo/worlds/underwater.world
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<sdf version="1.6">
<world name="bluerov2_underwater">
<world name="underwater_world">

<plugin
filename="gz-sim-physics-system"
Expand Down Expand Up @@ -31,7 +31,6 @@
<density>1</density>
</density_change>
</graded_buoyancy>
<enable>bluerov2</enable>
</plugin>

<include>
Expand Down