update files structure

robomaster-oss · Dec 15, 2021 · 3ea2c9a · 3ea2c9a
1 parent f37510e
commit 3ea2c9a
Show file tree

Hide file tree

Showing 94 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(ament_cmake REQUIRED)
 
 #install
 install( DIRECTORY
-     models 
+     resource
   DESTINATION share/${PROJECT_NAME}
 )
 

diff --git a/env-hooks/ignition.dsv.in b/env-hooks/ignition.dsv.in
@@ -1,2 +1,2 @@
-prepend-non-duplicate;IGN_GAZEBO_RESOURCE_PATH;share/@PROJECT_NAME@/models
-prepend-non-duplicate;SDF_PATH;share/@PROJECT_NAME@/models
+prepend-non-duplicate;IGN_GAZEBO_RESOURCE_PATH;share/@PROJECT_NAME@/resource/models
+prepend-non-duplicate;SDF_PATH;share/@PROJECT_NAME@/resource/models
diff --git a/..._module/materials/textures/large_base.png → ..._module/materials/textures/large_base.png b/..._module/materials/textures/large_base.png → ..._module/materials/textures/large_base.png
diff --git a/..._module/materials/textures/large_num1.png → ..._module/materials/textures/large_num1.png b/..._module/materials/textures/large_num1.png → ..._module/materials/textures/large_num1.png
diff --git a/..._module/materials/textures/large_num3.png → ..._module/materials/textures/large_num3.png b/..._module/materials/textures/large_num3.png → ..._module/materials/textures/large_num3.png
diff --git a/..._module/materials/textures/large_num4.png → ..._module/materials/textures/large_num4.png b/..._module/materials/textures/large_num4.png → ..._module/materials/textures/large_num4.png
diff --git a/..._module/materials/textures/large_num5.png → ..._module/materials/textures/large_num5.png b/..._module/materials/textures/large_num5.png → ..._module/materials/textures/large_num5.png
diff --git a/...odule/materials/textures/large_sentry.png → ...odule/materials/textures/large_sentry.png b/...odule/materials/textures/large_sentry.png → ...odule/materials/textures/large_sentry.png
diff --git a/..._module/materials/textures/small_base.png → ..._module/materials/textures/small_base.png b/..._module/materials/textures/small_base.png → ..._module/materials/textures/small_base.png
diff --git a/..._module/materials/textures/small_num1.png → ..._module/materials/textures/small_num1.png b/..._module/materials/textures/small_num1.png → ..._module/materials/textures/small_num1.png
diff --git a/..._module/materials/textures/small_num2.png → ..._module/materials/textures/small_num2.png b/..._module/materials/textures/small_num2.png → ..._module/materials/textures/small_num2.png
diff --git a/..._module/materials/textures/small_num3.png → ..._module/materials/textures/small_num3.png b/..._module/materials/textures/small_num3.png → ..._module/materials/textures/small_num3.png
diff --git a/..._module/materials/textures/small_num4.png → ..._module/materials/textures/small_num4.png b/..._module/materials/textures/small_num4.png → ..._module/materials/textures/small_num4.png
diff --git a/..._module/materials/textures/small_num5.png → ..._module/materials/textures/small_num5.png b/..._module/materials/textures/small_num5.png → ..._module/materials/textures/small_num5.png
diff --git a/...dule/materials/textures/small_outpost.png → ...dule/materials/textures/small_outpost.png b/...dule/materials/textures/small_outpost.png → ...dule/materials/textures/small_outpost.png
diff --git a/...mor_module/meshes/armor_support_frame.stl → ...mor_module/meshes/armor_support_frame.stl b/...mor_module/meshes/armor_support_frame.stl → ...mor_module/meshes/armor_support_frame.stl
diff --git a/.../rm21_armor_module/meshes/large_armor.stl → .../rm21_armor_module/meshes/large_armor.stl b/.../rm21_armor_module/meshes/large_armor.stl → .../rm21_armor_module/meshes/large_armor.stl
diff --git a/...r_module/meshes/large_armor_light_bar.stl → ...r_module/meshes/large_armor_light_bar.stl b/...r_module/meshes/large_armor_light_bar.stl → ...r_module/meshes/large_armor_light_bar.stl
diff --git a/...armor_module/meshes/large_armor_screw.stl → ...armor_module/meshes/large_armor_screw.stl b/...armor_module/meshes/large_armor_screw.stl → ...armor_module/meshes/large_armor_screw.stl
diff --git a/...rmor_module/meshes/large_armor_target.stl → ...rmor_module/meshes/large_armor_target.stl b/...rmor_module/meshes/large_armor_target.stl → ...rmor_module/meshes/large_armor_target.stl
diff --git a/.../rm21_armor_module/meshes/small_armor.dae → .../rm21_armor_module/meshes/small_armor.dae b/.../rm21_armor_module/meshes/small_armor.dae → .../rm21_armor_module/meshes/small_armor.dae
diff --git a/...r_module/meshes/small_armor_light_bar.dae → ...r_module/meshes/small_armor_light_bar.dae b/...r_module/meshes/small_armor_light_bar.dae → ...r_module/meshes/small_armor_light_bar.dae
diff --git a/...rmor_module/meshes/small_armor_target.dae → ...rmor_module/meshes/small_armor_target.dae b/...rmor_module/meshes/small_armor_target.dae → ...rmor_module/meshes/small_armor_target.dae
diff --git a/models/rm21_armor_module/model.config → ...rce/models/rm21_armor_module/model.config b/models/rm21_armor_module/model.config → ...rce/models/rm21_armor_module/model.config
diff --git a/models/rm21_armor_module/model.sdf → resource/models/rm21_armor_module/model.sdf b/models/rm21_armor_module/model.sdf → resource/models/rm21_armor_module/model.sdf
diff --git a/models/rm21_armor_module/model.sdf.xmacro → ...models/rm21_armor_module/model.sdf.xmacro b/models/rm21_armor_module/model.sdf.xmacro → ...models/rm21_armor_module/model.sdf.xmacro
diff --git a/...armor_module/rm21_armor_module.def.xmacro → ...armor_module/rm21_armor_module.def.xmacro b/...armor_module/rm21_armor_module.def.xmacro → ...armor_module/rm21_armor_module.def.xmacro
diff --git a/...r_module/thumbnails/rm21_armor_module.png → ...r_module/thumbnails/rm21_armor_module.png b/...r_module/thumbnails/rm21_armor_module.png → ...r_module/thumbnails/rm21_armor_module.png
diff --git a/...tor_module/meshes/light_indicator_bar.dae → ...tor_module/meshes/light_indicator_bar.dae b/...tor_module/meshes/light_indicator_bar.dae → ...tor_module/meshes/light_indicator_bar.dae
diff --git a/..._module/meshes/light_indicator_holder.dae → ..._module/meshes/light_indicator_holder.dae b/..._module/meshes/light_indicator_holder.dae → ..._module/meshes/light_indicator_holder.dae
diff --git a/.../rm21_light_indicator_module/model.config → .../rm21_light_indicator_module/model.config b/.../rm21_light_indicator_module/model.config → .../rm21_light_indicator_module/model.config
diff --git a/models/rm21_light_indicator_module/model.sdf → ...els/rm21_light_indicator_module/model.sdf b/models/rm21_light_indicator_module/model.sdf → ...els/rm21_light_indicator_module/model.sdf
diff --git a/...1_light_indicator_module/model.sdf.xmacro → ...1_light_indicator_module/model.sdf.xmacro b/...1_light_indicator_module/model.sdf.xmacro → ...1_light_indicator_module/model.sdf.xmacro
diff --git a/...le/rm21_light_indicator_module.def.xmacro → ...le/rm21_light_indicator_module.def.xmacro b/...le/rm21_light_indicator_module.def.xmacro → ...le/rm21_light_indicator_module.def.xmacro
diff --git a/...humbnails/rm21_light_indicator_module.png → ...humbnails/rm21_light_indicator_module.png b/...humbnails/rm21_light_indicator_module.png → ...humbnails/rm21_light_indicator_module.png
diff --git a/...itor_module/meshes/speed_monitor_17mm.dae → ...itor_module/meshes/speed_monitor_17mm.dae b/...itor_module/meshes/speed_monitor_17mm.dae → ...itor_module/meshes/speed_monitor_17mm.dae
diff --git a/...e/meshes/speed_monitor_17mm_light_bar.dae → ...e/meshes/speed_monitor_17mm_light_bar.dae b/...e/meshes/speed_monitor_17mm_light_bar.dae → ...e/meshes/speed_monitor_17mm_light_bar.dae
diff --git a/...itor_module/meshes/speed_monitor_42mm.stl → ...itor_module/meshes/speed_monitor_42mm.stl b/...itor_module/meshes/speed_monitor_42mm.stl → ...itor_module/meshes/speed_monitor_42mm.stl
diff --git a/...e/meshes/speed_monitor_42mm_light_bar.stl → ...e/meshes/speed_monitor_42mm_light_bar.stl b/...e/meshes/speed_monitor_42mm_light_bar.stl → ...e/meshes/speed_monitor_42mm_light_bar.stl
diff --git a/...ls/rm21_speed_monitor_module/model.config → ...ls/rm21_speed_monitor_module/model.config b/...ls/rm21_speed_monitor_module/model.config → ...ls/rm21_speed_monitor_module/model.config
diff --git a/models/rm21_speed_monitor_module/model.sdf → ...odels/rm21_speed_monitor_module/model.sdf b/models/rm21_speed_monitor_module/model.sdf → ...odels/rm21_speed_monitor_module/model.sdf
diff --git a/...m21_speed_monitor_module/model.sdf.xmacro → ...m21_speed_monitor_module/model.sdf.xmacro b/...m21_speed_monitor_module/model.sdf.xmacro → ...m21_speed_monitor_module/model.sdf.xmacro
diff --git a/...dule/rm21_speed_monitor_module.def.xmacro → ...dule/rm21_speed_monitor_module.def.xmacro b/...dule/rm21_speed_monitor_module.def.xmacro → ...dule/rm21_speed_monitor_module.def.xmacro
diff --git a/.../thumbnails/rm21_speed_monitor_module.png → .../thumbnails/rm21_speed_monitor_module.png b/.../thumbnails/rm21_speed_monitor_module.png → .../thumbnails/rm21_speed_monitor_module.png
diff --git a/...itter_module/meshes/video_transmitter.stl → ...itter_module/meshes/video_transmitter.stl b/...itter_module/meshes/video_transmitter.stl → ...itter_module/meshes/video_transmitter.stl
diff --git a/...module/meshes/video_transmitter_glass.stl → ...module/meshes/video_transmitter_glass.stl b/...module/meshes/video_transmitter_glass.stl → ...module/meshes/video_transmitter_glass.stl
diff --git a/...m21_video_transmitter_module/model.config → ...m21_video_transmitter_module/model.config b/...m21_video_transmitter_module/model.config → ...m21_video_transmitter_module/model.config
diff --git a/...s/rm21_video_transmitter_module/model.sdf → ...s/rm21_video_transmitter_module/model.sdf b/...s/rm21_video_transmitter_module/model.sdf → ...s/rm21_video_transmitter_module/model.sdf
diff --git a/...video_transmitter_module/model.sdf.xmacro → ...video_transmitter_module/model.sdf.xmacro b/...video_transmitter_module/model.sdf.xmacro → ...video_transmitter_module/model.sdf.xmacro
diff --git a/.../rm21_video_transmitter_module.def.xmacro → .../rm21_video_transmitter_module.def.xmacro b/.../rm21_video_transmitter_module.def.xmacro → .../rm21_video_transmitter_module.def.xmacro
diff --git a/...mbnails/rm21_video_transmitter_module.png → ...mbnails/rm21_video_transmitter_module.png b/...mbnails/rm21_video_transmitter_module.png → ...mbnails/rm21_video_transmitter_module.png
diff --git a/...r_module/materials/textures/ua_num1_0.png → ...r_module/materials/textures/ua_num1_0.png b/...r_module/materials/textures/ua_num1_0.png → ...r_module/materials/textures/ua_num1_0.png
diff --git a/...r_module/materials/textures/ua_num1_1.png → ...r_module/materials/textures/ua_num1_1.png b/...r_module/materials/textures/ua_num1_1.png → ...r_module/materials/textures/ua_num1_1.png
diff --git a/...r_module/materials/textures/ua_num1_2.png → ...r_module/materials/textures/ua_num1_2.png b/...r_module/materials/textures/ua_num1_2.png → ...r_module/materials/textures/ua_num1_2.png
diff --git a/...r_module/materials/textures/ua_num1_3.png → ...r_module/materials/textures/ua_num1_3.png b/...r_module/materials/textures/ua_num1_3.png → ...r_module/materials/textures/ua_num1_3.png
diff --git a/...r_module/materials/textures/ua_num2_0.png → ...r_module/materials/textures/ua_num2_0.png b/...r_module/materials/textures/ua_num2_0.png → ...r_module/materials/textures/ua_num2_0.png
diff --git a/...r_module/materials/textures/ua_num2_1.png → ...r_module/materials/textures/ua_num2_1.png b/...r_module/materials/textures/ua_num2_1.png → ...r_module/materials/textures/ua_num2_1.png
diff --git a/...r_module/materials/textures/ua_num2_2.png → ...r_module/materials/textures/ua_num2_2.png b/...r_module/materials/textures/ua_num2_2.png → ...r_module/materials/textures/ua_num2_2.png
diff --git a/...r_module/materials/textures/ua_num2_3.png → ...r_module/materials/textures/ua_num2_3.png b/...r_module/materials/textures/ua_num2_3.png → ...r_module/materials/textures/ua_num2_3.png
diff --git a/models/rm22_armor_module/model.config → ...rce/models/rm22_armor_module/model.config b/models/rm22_armor_module/model.config → ...rce/models/rm22_armor_module/model.config
diff --git a/models/rm22_armor_module/model.sdf → resource/models/rm22_armor_module/model.sdf b/models/rm22_armor_module/model.sdf → resource/models/rm22_armor_module/model.sdf
diff --git a/models/rm22_armor_module/model.sdf.xmacro → ...models/rm22_armor_module/model.sdf.xmacro b/models/rm22_armor_module/model.sdf.xmacro → ...models/rm22_armor_module/model.sdf.xmacro
diff --git a/...armor_module/rm22_armor_module.def.xmacro → ...armor_module/rm22_armor_module.def.xmacro b/...armor_module/rm22_armor_module.def.xmacro → ...armor_module/rm22_armor_module.def.xmacro
diff --git a/...r_module/thumbnails/rm22_armor_module.png → ...r_module/thumbnails/rm22_armor_module.png b/...r_module/thumbnails/rm22_armor_module.png → ...r_module/thumbnails/rm22_armor_module.png
diff --git a/.../rm22_light_indicator_module/model.config → .../rm22_light_indicator_module/model.config b/.../rm22_light_indicator_module/model.config → .../rm22_light_indicator_module/model.config
diff --git a/models/rm22_light_indicator_module/model.sdf → ...els/rm22_light_indicator_module/model.sdf b/models/rm22_light_indicator_module/model.sdf → ...els/rm22_light_indicator_module/model.sdf
diff --git a/...2_light_indicator_module/model.sdf.xmacro → ...2_light_indicator_module/model.sdf.xmacro b/...2_light_indicator_module/model.sdf.xmacro → ...2_light_indicator_module/model.sdf.xmacro
diff --git a/...le/rm22_light_indicator_module.def.xmacro → ...le/rm22_light_indicator_module.def.xmacro b/...le/rm22_light_indicator_module.def.xmacro → ...le/rm22_light_indicator_module.def.xmacro
diff --git a/...ls/rm22_speed_monitor_module/model.config → ...ls/rm22_speed_monitor_module/model.config b/...ls/rm22_speed_monitor_module/model.config → ...ls/rm22_speed_monitor_module/model.config
diff --git a/models/rm22_speed_monitor_module/model.sdf → ...odels/rm22_speed_monitor_module/model.sdf b/models/rm22_speed_monitor_module/model.sdf → ...odels/rm22_speed_monitor_module/model.sdf
diff --git a/...m22_speed_monitor_module/model.sdf.xmacro → ...m22_speed_monitor_module/model.sdf.xmacro b/...m22_speed_monitor_module/model.sdf.xmacro → ...m22_speed_monitor_module/model.sdf.xmacro
diff --git a/...dule/rm22_speed_monitor_module.def.xmacro → ...dule/rm22_speed_monitor_module.def.xmacro b/...dule/rm22_speed_monitor_module.def.xmacro → ...dule/rm22_speed_monitor_module.def.xmacro
diff --git a/...m22_video_transmitter_module/model.config → ...m22_video_transmitter_module/model.config b/...m22_video_transmitter_module/model.config → ...m22_video_transmitter_module/model.config
diff --git a/...s/rm22_video_transmitter_module/model.sdf → ...s/rm22_video_transmitter_module/model.sdf b/...s/rm22_video_transmitter_module/model.sdf → ...s/rm22_video_transmitter_module/model.sdf
diff --git a/...video_transmitter_module/model.sdf.xmacro → ...video_transmitter_module/model.sdf.xmacro b/...video_transmitter_module/model.sdf.xmacro → ...video_transmitter_module/model.sdf.xmacro
diff --git a/.../rm22_video_transmitter_module.def.xmacro → .../rm22_video_transmitter_module.def.xmacro b/.../rm22_video_transmitter_module.def.xmacro → .../rm22_video_transmitter_module.def.xmacro
diff --git a/models/rm_projectile_17mm/model.config → ...ce/models/rm_projectile_17mm/model.config b/models/rm_projectile_17mm/model.config → ...ce/models/rm_projectile_17mm/model.config
diff --git a/models/rm_projectile_17mm/model.sdf → resource/models/rm_projectile_17mm/model.sdf b/models/rm_projectile_17mm/model.sdf → resource/models/rm_projectile_17mm/model.sdf
diff --git a/models/rm_projectile_17mm/model.sdf.xmacro → ...odels/rm_projectile_17mm/model.sdf.xmacro b/models/rm_projectile_17mm/model.sdf.xmacro → ...odels/rm_projectile_17mm/model.sdf.xmacro
diff --git a/..._projectile_17mm/rm_projectile.def.xmacro → ..._projectile_17mm/rm_projectile.def.xmacro b/..._projectile_17mm/rm_projectile.def.xmacro → ..._projectile_17mm/rm_projectile.def.xmacro
diff --git a/models/rm_projectile_42mm/model.config → ...ce/models/rm_projectile_42mm/model.config b/models/rm_projectile_42mm/model.config → ...ce/models/rm_projectile_42mm/model.config
diff --git a/models/rm_projectile_42mm/model.sdf → resource/models/rm_projectile_42mm/model.sdf b/models/rm_projectile_42mm/model.sdf → resource/models/rm_projectile_42mm/model.sdf
diff --git a/models/rm_projectile_42mm/model.sdf.xmacro → ...odels/rm_projectile_42mm/model.sdf.xmacro b/models/rm_projectile_42mm/model.sdf.xmacro → ...odels/rm_projectile_42mm/model.sdf.xmacro
diff --git a/...9_standard_robot/chassis_wheel.def.xmacro → ...9_standard_robot/chassis_wheel.def.xmacro b/...9_standard_robot/chassis_wheel.def.xmacro → ...9_standard_robot/chassis_wheel.def.xmacro
diff --git a/...19_standard_robot/meshes/chassis_base.dae → ...19_standard_robot/meshes/chassis_base.dae b/...19_standard_robot/meshes/chassis_base.dae → ...19_standard_robot/meshes/chassis_base.dae
diff --git a/...19_standard_robot/meshes/gimbal_pitch.dae → ...19_standard_robot/meshes/gimbal_pitch.dae b/...19_standard_robot/meshes/gimbal_pitch.dae → ...19_standard_robot/meshes/gimbal_pitch.dae
diff --git a/...ua19_standard_robot/meshes/gimbal_yaw.dae → ...ua19_standard_robot/meshes/gimbal_yaw.dae b/...ua19_standard_robot/meshes/gimbal_yaw.dae → ...ua19_standard_robot/meshes/gimbal_yaw.dae
diff --git a/...ua19_standard_robot/meshes/wheel_left.dae → ...ua19_standard_robot/meshes/wheel_left.dae b/...ua19_standard_robot/meshes/wheel_left.dae → ...ua19_standard_robot/meshes/wheel_left.dae
diff --git a/...a19_standard_robot/meshes/wheel_right.dae → ...a19_standard_robot/meshes/wheel_right.dae b/...a19_standard_robot/meshes/wheel_right.dae → ...a19_standard_robot/meshes/wheel_right.dae
diff --git a/models/rmua19_standard_robot/model.config → ...models/rmua19_standard_robot/model.config b/models/rmua19_standard_robot/model.config → ...models/rmua19_standard_robot/model.config
diff --git a/models/rmua19_standard_robot/model.sdf → ...ce/models/rmua19_standard_robot/model.sdf b/models/rmua19_standard_robot/model.sdf → ...ce/models/rmua19_standard_robot/model.sdf
diff --git a/...ls/rmua19_standard_robot/model.sdf.xmacro → ...ls/rmua19_standard_robot/model.sdf.xmacro b/...ls/rmua19_standard_robot/model.sdf.xmacro → ...ls/rmua19_standard_robot/model.sdf.xmacro
diff --git a/...rd_robot/rmua19_standard_robot.def.xmacro → ...rd_robot/rmua19_standard_robot.def.xmacro b/...rd_robot/rmua19_standard_robot.def.xmacro → ...rd_robot/rmua19_standard_robot.def.xmacro
diff --git a/...obot/thumbnails/rmua19_standard_robot.png → ...obot/thumbnails/rmua19_standard_robot.png b/...obot/thumbnails/rmua19_standard_robot.png → ...obot/thumbnails/rmua19_standard_robot.png