All to be downloaded using http and stored in .gazebo/models (#185)

Signed-off-by: Aaron Chong <[email protected]>
open-rmf · Jul 5, 2023 · f562ea4 · f562ea4
1 parent 30b7707
commit f562ea4
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/rmf_demos_maps/CMakeLists.txt b/rmf_demos_maps/CMakeLists.txt
@@ -38,21 +38,12 @@ foreach(path ${traffic_editor_paths})
  )
  else()
  message("DOWNLOADING MODELS WITH COMMAND: ros2 run rmf_building_map_tools building_map_model_downloader ${map_path}")
- if(DEFINED ENV{RMF_DOWNLOAD_MODELS_HOME})
- add_custom_command(
- DEPENDS ${map_path}
- COMMAND ros2 run rmf_building_map_tools building_map_generator gazebo ${map_path} ${output_world_path} ${output_model_dir}
- COMMAND ros2 run rmf_building_map_tools building_map_model_downloader ${map_path} -f -e ~/.gazebo/models
- OUTPUT ${output_world_path}
- )
- else()
- add_custom_command(
- DEPENDS ${map_path}
- COMMAND ros2 run rmf_building_map_tools building_map_generator gazebo ${map_path} ${output_world_path} ${output_model_dir}
- COMMAND ros2 run rmf_building_map_tools building_map_model_downloader ${map_path} -f -e ${output_model_dir}
- OUTPUT ${output_world_path}
- )
- endif()
+ add_custom_command(
+ DEPENDS ${map_path}
+ COMMAND ros2 run rmf_building_map_tools building_map_generator gazebo ${map_path} ${output_world_path} ${output_model_dir}
+ COMMAND ros2 run rmf_building_map_tools building_map_model_downloader ${map_path} -e ~/.gazebo/models
+ OUTPUT ${output_world_path}
+ )
  endif()
 
  ##############################################################################
@@ -68,7 +59,7 @@ foreach(path ${traffic_editor_paths})
  # This will initiate both custom commands: ${output_world_path} and ${world_name}_crowdsim
  add_custom_target(generate_${world_name}_crowdsim ALL
  DEPENDS ${world_name}_crowdsim
- ) 
+ )
 
  ##############################################################################
  ## Ign worlds