forked from autowarefoundation/autoware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request autowarefoundation#2109 from CPFL/fix/gazebo_with_…
…colcon Fix/gazebo with colcon
- Loading branch information
Showing
24 changed files
with
44 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 9 additions & 12 deletions
21
...on/gazebo_simulator/launcher/vehicle_gazebo_simulation_launcher/scripts/download_model.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,22 @@ | ||
| #!/bin/sh | ||
|
|
||
| mkdir -p ~/.gazebo/models | ||
| echo "Download generic gazebo models" | ||
| echo "---- Download generic gazebo models ----" | ||
| if [ -e /tmp/gazebo_models ]; then | ||
| echo "Already exist /tmp/gazebo_models" | ||
| echo "removing /tmp/gazebo_models" | ||
| echo "---- Already exist /tmp/gazebo_models ----" | ||
| echo "---- removing /tmp/gazebo_models ----" | ||
| rm -r /tmp/gazebo_models | ||
| fi | ||
| hg clone https://bitbucket.org/osrf/gazebo_models /tmp/gazebo_models | ||
|
|
||
| if [ -e /tmp/gazebo_models ]; then | ||
| echo "Install generic gazebo models" | ||
| echo "---- Install generic gazebo models ----" | ||
| mv -n /tmp/gazebo_models/* ~/.gazebo/models/ | ||
| echo "Completed" | ||
| echo "---- Completed ----" | ||
| else | ||
| echo "Error" | ||
| echo "---- Error ----" | ||
| fi | ||
|
|
||
| echo "Install osrf_citysim models" | ||
| SCRIPT_DIR=$(cd $(dirname $0); pwd) | ||
| cp -rn $SCRIPT_DIR/../../../worlds/external/osrf_citysim/models/* ~/.gazebo/models/ | ||
|
|
||
| echo "Install car_demo models" | ||
| cp -rn $SCRIPT_DIR/../../../worlds/external/car_demo/car_demo/models/* ~/.gazebo/models/ | ||
| echo "---- Install models ----" | ||
| cp -rn $(rospack find gazebo_world_description)/models/* ~/.gazebo/models/ | ||
| echo "---- Completed ----" |
8 changes: 0 additions & 8 deletions
8
...bo_simulator/launcher/vehicle_gazebo_simulation_launcher/scripts/integrate_world_files.sh
This file was deleted.
Oops, something went wrong.
6 changes: 2 additions & 4 deletions
6
.../simulation/gazebo_simulator/launcher/vehicle_gazebo_simulation_launcher/scripts/setup.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,4 @@ | ||
| #!/bin/sh | ||
|
|
||
| SCRIPT_DIR=$(cd $(dirname $0); pwd) | ||
| $SCRIPT_DIR/download_model.sh | ||
| $SCRIPT_DIR/upgrade_gazebo_stable_version.sh | ||
| $SCRIPT_DIR/integrate_world_files.sh | ||
| rosrun vehicle_gazebo_simulation_launcher download_model.sh | ||
| rosrun vehicle_gazebo_simulation_launcher upgrade_gazebo_stable_version.sh |
Submodule car_demo
updated
3 files
| +0 −0 | car_demo/CATKIN_IGNORE | |
| +0 −0 | prius_description/CATKIN_IGNORE | |
| +0 −0 | prius_msgs/CATKIN_IGNORE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/construction_cone
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/construction_cone |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/dumpster
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/dumpster |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/gas_station
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/gas_station |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/grey_wall
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/grey_wall |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/house_1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/house_1 |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/house_2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/house_2 |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/house_3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/house_3 |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/jersey_barrier
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/jersey_barrier |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/mcity
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/mcity |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/ocean
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/osrf_citysim/models/ocean |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/powerplant
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/powerplant |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/models/speed_limit_sign
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/models/speed_limit_sign |
1 change: 0 additions & 1 deletion
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/worlds/.gitignore
This file was deleted.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
.../simulation/gazebo_simulator/worlds/gazebo_world_description/worlds/citysim_gazebo7.world
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/osrf_citysim/worlds/citysim_gazebo7.world |
1 change: 1 addition & 0 deletions
1
.../simulation/gazebo_simulator/worlds/gazebo_world_description/worlds/citysim_gazebo9.world
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/osrf_citysim/worlds/citysim_gazebo9.world |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/worlds/mcity.world
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/worlds/mcity.world |
1 change: 1 addition & 0 deletions
1
ros/src/simulation/gazebo_simulator/worlds/gazebo_world_description/worlds/mcity_r1.world
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../external/car_demo/car_demo/worlds/mcity_r1.world |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters