diff --git a/ai_race/sim_environment/launch/sim_environment.launch b/ai_race/sim_environment/launch/sim_environment.launch index d661044..814d707 100755 --- a/ai_race/sim_environment/launch/sim_environment.launch +++ b/ai_race/sim_environment/launch/sim_environment.launch @@ -74,10 +74,13 @@ + + + - + @@ -88,8 +91,9 @@ - - + + + diff --git a/ai_race/sim_environment/launch/wheel_robot_with_surveillance.launch b/ai_race/sim_environment/launch/wheel_robot_with_surveillance.launch index 79b6ede..8f002ac 100755 --- a/ai_race/sim_environment/launch/wheel_robot_with_surveillance.launch +++ b/ai_race/sim_environment/launch/wheel_robot_with_surveillance.launch @@ -12,8 +12,9 @@ - - + + + @@ -43,11 +44,11 @@ + args="-urdf $(arg robot_pos) -param robot_description -model wheel_robot" /> + args="-urdf $(arg camera_pos) -param camera_description -model surveillance_camera" /> + args="-urdf $(arg godeye_pos) -param godeye_description -model godeye_camera" /> @@ -58,7 +59,7 @@ + args="-urdf -x 7.5 -y -10.5 -z 0.0 -param godeye_perspective_description -model godeye_camera_perspective" /> diff --git a/ai_race/sim_environment/urdf/godeye.urdf.xacro b/ai_race/sim_environment/urdf/godeye.urdf.xacro index 8b510ec..a24bd71 100755 --- a/ai_race/sim_environment/urdf/godeye.urdf.xacro +++ b/ai_race/sim_environment/urdf/godeye.urdf.xacro @@ -76,6 +76,7 @@ + true diff --git a/ai_race/sim_environment/urdf/godeye_perspective3.urdf.xacro b/ai_race/sim_environment/urdf/godeye_perspective3.urdf.xacro index 9eca024..498b872 100755 --- a/ai_race/sim_environment/urdf/godeye_perspective3.urdf.xacro +++ b/ai_race/sim_environment/urdf/godeye_perspective3.urdf.xacro @@ -72,7 +72,7 @@ - + diff --git a/ai_race/sim_environment/urdf/surveillance_camera.urdf.xacro b/ai_race/sim_environment/urdf/surveillance_camera.urdf.xacro index 786dd65..ceb62eb 100755 --- a/ai_race/sim_environment/urdf/surveillance_camera.urdf.xacro +++ b/ai_race/sim_environment/urdf/surveillance_camera.urdf.xacro @@ -85,6 +85,7 @@ + true diff --git a/ai_race/sim_world/worlds/medium_track_plane_w_wall_large.world b/ai_race/sim_world/worlds/medium_track_plane_w_wall_large.world index 31ab9a6..bd9a237 100755 --- a/ai_race/sim_world/worlds/medium_track_plane_w_wall_large.world +++ b/ai_race/sim_world/worlds/medium_track_plane_w_wall_large.world @@ -38,6 +38,49 @@ 0 0 0 0 0 0 racetrack + + + cone_A + model://sim_world/models/sankaku_cone_G + true + 5.53 6.32 0 0 0 0 + + + cone_B + model://sim_world/models/sankaku_cone_G + true + 0.8 7.57 0 0 0 0 + + + cone_C + model://sim_world/models/sankaku_cone_G + true + -5.2 6.2 0 0 0 0 + + + cone_D + model://sim_world/models/sankaku_cone_G + true + -5.95 1 0 0 0 0 + + + cone_E + model://sim_world/models/sankaku_cone_G + true + -4.3 -7.1 0 0 0 0 + + + cone_F + model://sim_world/models/sankaku_cone_G + true + -0.51 -8.33 0 0 0 0 + + + cone_G + model://sim_world/models/sankaku_cone_G + true + 4.26 -7.1 0 0 0 0 +