Skip to content

Commit 91c3ec2

Browse files
javizqhjavizqh
authored
Merge pull request #692 from aquintan4/odometry-publisher-gzharmonic
RoombaROS - model adjustments
2 parents aabd3ec + 554f9f6 commit 91c3ec2

165 files changed

Lines changed: 273877 additions & 310 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CustomRobots/3d_reconstruction/models/turtlebotROS/model.sdf‎

Lines changed: 233 additions & 233 deletions
Large diffs are not rendered by default.

‎CustomRobots/3d_reconstruction/models/turtlebotROS/turtle.sdf‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -876,14 +876,14 @@
876876

877877
<inertial>
878878
<mass>0.500000</mass>
879-
<inertia>
880-
<ixx>1.000000</ixx>
881-
<ixy>0.000000</ixy>
882-
<ixz>0.000000</ixz>
883-
<iyy>1.000000</iyy>
884-
<iyz>0.000000</iyz>
885-
<izz>1.000000</izz>
886-
</inertia>
879+
<inertia>
880+
<ixx>1.000000</ixx>
881+
<ixy>0.000000</ixy>
882+
<ixz>0.000000</ixz>
883+
<iyy>1.000000</iyy>
884+
<iyz>0.000000</iyz>
885+
<izz>1.000000</izz>
886+
</inertia>
887887
</inertial>
888888

889889
<visual name='visual'>
@@ -1065,7 +1065,7 @@
10651065
<mean>0.0</mean>
10661066
<stddev>0.007</stddev>
10671067
</noise>
1068-
</camera>
1068+
</camera>
10691069
</sensor>
10701070

10711071
<visual name='visual'>
@@ -1309,7 +1309,7 @@
13091309
<mean>0.0</mean>
13101310
<stddev>0.007</stddev>
13111311
</noise>
1312-
</camera>
1312+
</camera>
13131313
</sensor>
13141314

13151315
<visual name='visual'>

‎CustomRobots/3d_reconstruction/params/turtlebotROS.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
gz_type_name: "gz.msgs.LaserScan"
66
direction: GZ_TO_ROS
77

8-
98
# gz topic published by Sensors plugin (Camera)
109
- ros_topic_name: "/cam_turtlebot_left/camera_info"
1110
gz_topic_name: "/cam_turtlebot_left/camera_info"
@@ -17,4 +16,4 @@
1716
gz_topic_name: "/cam_turtlebot_right/camera_info"
1817
ros_type_name: "sensor_msgs/msg/CameraInfo"
1918
gz_type_name: "gz.msgs.CameraInfo"
20-
direction: GZ_TO_ROS
19+
direction: GZ_TO_ROS

‎CustomRobots/CMakeLists.txt‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,18 @@ set(PROJECT_DEPENDENCIES
2828
urdf
2929
xacro
3030
ament_cmake_ros
31-
gazebo
31+
#gazebo
3232
pluginlib
3333
Threads)
3434

3535
foreach(dependency ${PROJECT_DEPENDENCIES})
3636
find_package(${dependency} REQUIRED)
3737
endforeach()
3838

39+
add_subdirectory(follow_person_harmonic)
40+
41+
find_package(gazebo)
42+
3943
# ============================================================================
4044
# Person plugin
4145
if(CMAKE_USE_PTHREADS_INIT)
@@ -70,27 +74,23 @@ ament_environment_hooks("hooks/resource_paths.sh")
7074

7175
# ============================================================================
7276
# Resources
73-
7477
install(
7578
DIRECTORY
76-
# TURTLEBOT
79+
follow_person_harmonic/models
80+
follow_person_harmonic/params
7781
Turtlebot2/turtlebot2_simulated/kobuki_description/launch
7882
Turtlebot2/turtlebot2_simulated/kobuki_description/meshes
7983
Turtlebot2/turtlebot2_simulated/kobuki_description/rviz
8084
Turtlebot2/turtlebot2_simulated/kobuki_description/urdf
8185
Turtlebot2/turtlebot2_simulated/turtlebot2/launch
8286
Turtlebot2/turtlebot2_simulated/turtlebot2/rviz
8387
Turtlebot2/turtlebot2_simulated/turtlebot2/urdf
84-
# F1
8588
f1/models
8689
f1/params
87-
# ROOMBA
8890
roomba_robot/models
8991
roomba_robot/params
90-
# ACKERMAN CAR
9192
ackermann_cars/models
9293
ackermann_cars/params
93-
# CARS
9494
car_junction/models
9595
car_junction/scripts
9696
# AMAZON WAREHOUSE ROBOT
@@ -104,33 +104,24 @@ install(
104104
amazon_hospital/hospital_world/launch
105105
amazon_hospital/hospital_world/worlds
106106
amazon_hospital/worlds
107-
# ACKERMANN LOGISTIC ROBOT
108107
ackermann_logistic_robot/models
109-
# AUTOPARKING CARS
110108
autoparking/models
111-
# AUTOPARK_HARMONIC
112109
autopark_harmonic/models
113110
autopark_harmonic/params
114-
# DRONE_ASSETS
115111
drone_assets/models
116112
drone_assets/bridges
117-
# GLOBAL_NAVIGATION
118113
taxi_navigator/models
119114
taxi_navigator/params
120-
# 3D RECONSTRUCTION
121115
3d_reconstruction/models
122116
3d_reconstruction/params
123-
# MARKER VISUAL LOC
124117
marker_visual_loc/models
125118
turtlebot3/models
126119
turtlebot3/urdf
127120
turtlebot3/params
128-
# LASER MAPPING LOC
129121
laser_mapping/models
130122
restaurant/models
131123
pick_place/models
132124
pick_place/urdf
133-
# ROVER 4WD
134125
rover_4wd_description/meshes
135126
rover_4wd_description/urdf
136127
rover_4wd_description/config
@@ -158,4 +149,4 @@ ament_export_libraries(personplugin)
158149

159150
ament_export_targets(export_${PROJECT_NAME})
160151

161-
ament_package()
152+
ament_package()

‎CustomRobots/amazon_hospital/models/PersonToControl/model.sdf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</link>
4545

4646
<gazebo>
47-
<static>true</static>
47+
<static>false</static>
4848
</gazebo>
4949
</model>
5050
</sdf>

‎CustomRobots/amazon_hospital/models/PersonToFollow/model.sdf‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@
4545

4646
<plugin name="personplugin" filename="libpersonplugin.so"/>
4747

48-
<gazebo>
49-
<static>true</static>
50-
</gazebo>
48+
<static>false</static>
49+
5150
</model>
5251
</sdf>
5352

‎CustomRobots/amazon_hospital/models/aws_robomaker_hospital_floor_03_floor/meshes/aws_robomaker_hospital_floor_01_floor.png‎

5.43 MB
Loading

‎CustomRobots/amazon_hospital/models/aws_robomaker_hospital_floor_03_floor/meshes/aws_robomaker_hospital_floor_01_floor_collision.dae‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0"?>
2+
<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
3+
<asset>
4+
<contributor>
5+
<authoring_tool>Cinema 4D 21.207 COLLADA Exporter</authoring_tool>
6+
</contributor>
7+
<created>2020-06-04T14:10:05Z</created>
8+
<modified>2020-06-04T14:10:05Z</modified>
9+
<unit meter="0.01" name="centimeter"/>
10+
<up_axis>Y_UP</up_axis>
11+
</asset>
12+
<library_geometries>
13+
<geometry id="ID3">
14+
<mesh>
15+
<source id="ID4">
16+
<float_array id="ID5" count="96">-3500 -2.27524e-05 1250 2099.77 -2.27524e-05 1250 -3500 -2.27524e-05 -1250 2099.77 -2.27524e-05 -1250 1700.17 -2.27524e-05 -1250 1700.17 -2.27524e-05 1250 1900.5 -2.27524e-05 -1250 1900.5 -2.27524e-05 1250 1700.17 -2.27524e-05 -600.047 1700.17 -2.27524e-05 599.944 1900.5 -2.27524e-05 -600.047 1900.5 -2.27524e-05 599.944 2099.77 -2.27524e-05 -261.12 2099.77 -2.27524e-05 261.797 1900.5 -2.27524e-05 -261.12 1900.5 -2.27524e-05 261.797 1900.5 -2.27524e-05 -300 1900.5 -2.27524e-05 300 1700.17 -2.27524e-05 -300 1700.17 -2.27524e-05 300 1951.53 17.5474 -293.864 1740.39 17.5474 294.331 1951.53 17.5474 294.219 1740.39 17.5474 -293.977 1740.39 9 294.331 1740.39 9 -293.977 1720.38 9 294.331 1720.38 9 -293.977 1720.38 4.10338e-13 294.331 1720.38 4.10338e-13 -293.977 1700.17 4.12115e-13 294.331 1700.17 4.12115e-13 -293.977</float_array>
17+
<technique_common>
18+
<accessor count="32" source="#ID5" stride="3">
19+
<param name="X" type="float"/>
20+
<param name="Y" type="float"/>
21+
<param name="Z" type="float"/>
22+
</accessor>
23+
</technique_common>
24+
</source>
25+
<source id="ID6">
26+
<float_array id="ID7" count="12">0 1 0 -1 -0 -0 1.77547e-16 1 -0 8.78877e-17 1 -0</float_array>
27+
<technique_common>
28+
<accessor count="4" source="#ID7" stride="3">
29+
<param name="X" type="float"/>
30+
<param name="Y" type="float"/>
31+
<param name="Z" type="float"/>
32+
</accessor>
33+
</technique_common>
34+
</source>
35+
<source id="ID8">
36+
<float_array id="ID9" count="64">0.554594 0.5 0.445406 0.5 0.1009 0.5 0.8991 0.5 0.0486736 0.5 0.0249175 0.5 0.0277972 0.5 0.0539989 0.5 0.0925937 0.5 0.0854596 0.5 0.0196909 0.5 0.0217311 0.5 0.980259 0.5 0.91454 0.5 0.907406 0.5 0.978213 0.5 0.975083 0.5 0.951334 0.5 0.94601 0.5 0.972203 0.5 0.976185 0.50283 0.973336 0.503164 1.02663 0.503164 1.02379 0.50283 0.973336 0.501623 1.02663 0.501623 0.973032 0.501641 1.02694 0.501641 0.973032 0.5 1.02694 0.5 0.972718 0.5 1.02725 0.5</float_array>
37+
<technique_common>
38+
<accessor count="32" source="#ID9" stride="2">
39+
<param name="S" type="float"/>
40+
<param name="T" type="float"/>
41+
</accessor>
42+
</technique_common>
43+
</source>
44+
<vertices id="ID10">
45+
<input semantic="POSITION" source="#ID4"/>
46+
</vertices>
47+
<polylist count="10" material="">
48+
<input offset="0" semantic="VERTEX" source="#ID10"/>
49+
<input offset="1" semantic="NORMAL" source="#ID6"/>
50+
<input offset="2" semantic="TEXCOORD" source="#ID8" set="0"/>
51+
<vcount>4 4 4 4 4 4 4 4 4 4</vcount>
52+
<p>5 0 3 4 0 2 2 0 1 0 0 0 8 0 7 18 0 6 16 0 5 10 0 4 14 0 11 12 0 10 3 0 9 6 0 8 15 0 15 7 0 14 1 0 13 13 0 12 19 0 19 9 0 18 11 0 17 17 0 16 20 0 23 23 0 22 21 0 21 22 0 20 23 1 22 25 1 25 24 1 24 21 1 21 25 2 25 27 2 27 26 2 26 24 2 24 27 1 27 29 1 29 28 1 28 26 1 26 29 3 29 31 3 31 30 3 30 28 3 28</p>
53+
</polylist>
54+
</mesh>
55+
</geometry>
56+
</library_geometries>
57+
<library_visual_scenes>
58+
<visual_scene id="ID1">
59+
<node id="ID2" name="aws_robomaker_hospital_floor_01_floor_collision">
60+
<translate sid="translate">0 0 -0</translate>
61+
<rotate sid="rotateY">0 1 0 90</rotate>
62+
<rotate sid="rotateX">1 0 0 0</rotate>
63+
<rotate sid="rotateZ">0 0 1 -270</rotate>
64+
<scale sid="scale">1 1 1</scale>
65+
<instance_geometry url="#ID3"/>
66+
</node>
67+
</visual_scene>
68+
</library_visual_scenes>
69+
<scene>
70+
<instance_visual_scene url="#ID1"/>
71+
</scene>
72+
</COLLADA>

‎CustomRobots/amazon_hospital/models/aws_robomaker_hospital_floor_03_floor/meshes/aws_robomaker_hospital_floor_01_floor_normal.png‎

868 KB
Loading

‎CustomRobots/amazon_hospital/models/aws_robomaker_hospital_floor_03_floor/meshes/aws_robomaker_hospital_floor_01_floor_visual.dae‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<?xml version="1.0"?>
2+
<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
3+
<asset>
4+
<contributor>
5+
<authoring_tool>Cinema 4D 21.207 COLLADA Exporter</authoring_tool>
6+
</contributor>
7+
<created>2020-06-04T14:10:15Z</created>
8+
<modified>2020-06-04T14:10:15Z</modified>
9+
<unit meter="0.01" name="centimeter"/>
10+
<up_axis>Y_UP</up_axis>
11+
</asset>
12+
<library_images>
13+
<image id="ID3">
14+
<init_from>aws_robomaker_hospital_floor_01_floor.png</init_from>
15+
</image>
16+
</library_images>
17+
<library_effects>
18+
<effect id="ID2">
19+
<profile_COMMON>
20+
<newparam sid="ID4">
21+
<surface type="2D">
22+
<init_from>ID3</init_from>
23+
</surface>
24+
</newparam>
25+
<newparam sid="ID5">
26+
<sampler2D>
27+
<source>ID4</source>
28+
</sampler2D>
29+
</newparam>
30+
<technique sid="COMMON">
31+
<blinn>
32+
<emission>
33+
<color> 0.30000 0.30000 0.30000 1</color>
34+
</emission>
35+
<ambient>
36+
<color>1.0000 1.0000 1.0000 1</color>
37+
</ambient>
38+
<diffuse>
39+
<texture texture="ID5" texcoord="UVSET0"/>
40+
</diffuse>
41+
</blinn>
42+
</technique>
43+
</profile_COMMON>
44+
</effect>
45+
</library_effects>
46+
<library_materials>
47+
<material id="ID1" name="aws_robomaker_hospital_floor_01_floor">
48+
<instance_effect url="#ID2"/>
49+
</material>
50+
</library_materials>
51+
<library_geometries>
52+
<geometry id="ID8">
53+
<mesh>
54+
<source id="ID9">
55+
<float_array id="ID10" count="96">-3500 -2.27524e-05 1250 2099.77 -2.27524e-05 1250 -3500 -2.27524e-05 -1250 2099.77 -2.27524e-05 -1250 1700.17 -2.27524e-05 -1250 1700.17 -2.27524e-05 1250 1900.5 -2.27524e-05 -1250 1900.5 -2.27524e-05 1250 1700.17 -2.27524e-05 -600.047 1700.17 -2.27524e-05 599.944 1900.5 -2.27524e-05 -600.047 1900.5 -2.27524e-05 599.944 2099.77 -2.27524e-05 -261.12 2099.77 -2.27524e-05 261.797 1900.5 -2.27524e-05 -261.12 1900.5 -2.27524e-05 261.797 1900.5 -2.27524e-05 -300 1900.5 -2.27524e-05 300 1700.17 -2.27524e-05 -300 1700.17 -2.27524e-05 300 1951.53 17.5474 -293.864 1740.39 17.5474 294.331 1951.53 17.5474 294.219 1740.39 17.5474 -293.977 1740.39 9 294.331 1740.39 9 -293.977 1720.38 9 294.331 1720.38 9 -293.977 1720.38 4.10338e-13 294.331 1720.38 4.10338e-13 -293.977 1700.17 4.12115e-13 294.331 1700.17 4.12115e-13 -293.977</float_array>
56+
<technique_common>
57+
<accessor count="32" source="#ID10" stride="3">
58+
<param name="X" type="float"/>
59+
<param name="Y" type="float"/>
60+
<param name="Z" type="float"/>
61+
</accessor>
62+
</technique_common>
63+
</source>
64+
<source id="ID11">
65+
<float_array id="ID12" count="9">0 1 -0 -1 0 -0 8.78877e-17 1 -0</float_array>
66+
<technique_common>
67+
<accessor count="3" source="#ID12" stride="3">
68+
<param name="X" type="float"/>
69+
<param name="Y" type="float"/>
70+
<param name="Z" type="float"/>
71+
</accessor>
72+
</technique_common>
73+
</source>
74+
<source id="ID13">
75+
<float_array id="ID14" count="80">0.00697086 0.302307 0.00697086 0.989889 0.993029 0.989889 0.993029 0.302307 0.148412 0.282085 0.148412 0.199563 0.110425 0.199563 0.110425 0.282085 0.00697086 0.282085 0.0447562 0.282085 0.0447562 0.0101109 0.00697086 0.0101109 0.0964832 0.282085 0.0964832 0.0102971 0.0586979 0.0102971 0.0586979 0.282085 0.200341 0.282085 0.200341 0.199591 0.162354 0.199591 0.162354 0.282085 0.945611 0.615179 0.896105 0.615311 0.896547 0.753257 0.946053 0.753072 0.877102 0.615372 0.875098 0.615378 0.87554 0.753324 0.877544 0.753318 0.887635 0.615338 0.882943 0.615353 0.883385 0.753299 0.888077 0.753284 0.881078 0.615359 0.878968 0.615366 0.879409 0.753312 0.88152 0.753305 0.894239 0.615317 0.8895 0.615332 0.889942 0.753278 0.894681 0.753263</float_array>
76+
<technique_common>
77+
<accessor count="40" source="#ID14" stride="2">
78+
<param name="S" type="float"/>
79+
<param name="T" type="float"/>
80+
</accessor>
81+
</technique_common>
82+
</source>
83+
<vertices id="ID15">
84+
<input semantic="POSITION" source="#ID9"/>
85+
</vertices>
86+
<polylist count="10" material="Material1">
87+
<input offset="0" semantic="VERTEX" source="#ID15"/>
88+
<input offset="1" semantic="NORMAL" source="#ID11"/>
89+
<input offset="2" semantic="TEXCOORD" source="#ID13" set="0"/>
90+
<vcount>4 4 4 4 4 4 4 4 4 4</vcount>
91+
<p>5 0 3 4 0 2 2 0 1 0 0 0 8 0 7 18 0 6 16 0 5 10 0 4 14 0 11 12 0 10 3 0 9 6 0 8 15 0 15 7 0 14 1 0 13 13 0 12 19 0 19 9 0 18 11 0 17 17 0 16 20 0 23 23 0 22 21 0 21 22 0 20 23 1 27 25 1 26 24 1 25 21 1 24 25 0 31 27 0 30 26 0 29 24 0 28 27 1 35 29 1 34 28 1 33 26 1 32 29 2 39 31 2 38 30 2 37 28 2 36</p>
92+
</polylist>
93+
</mesh>
94+
</geometry>
95+
</library_geometries>
96+
<library_visual_scenes>
97+
<visual_scene id="ID6">
98+
<node id="ID7" name="aws_robomaker_hospital_floor_01_floor_visual">
99+
<translate sid="translate">0 0 -0</translate>
100+
<rotate sid="rotateY">0 1 0 90</rotate>
101+
<rotate sid="rotateX">1 0 0 0</rotate>
102+
<rotate sid="rotateZ">0 0 1 -270</rotate>
103+
<scale sid="scale">1 1 1</scale>
104+
<instance_geometry url="#ID8">
105+
<bind_material>
106+
<technique_common>
107+
<instance_material symbol="Material1" target="#ID1">
108+
<bind_vertex_input semantic="UVSET0" input_semantic="TEXCOORD" input_set="0"/>
109+
</instance_material>
110+
</technique_common>
111+
</bind_material>
112+
</instance_geometry>
113+
</node>
114+
</visual_scene>
115+
</library_visual_scenes>
116+
<scene>
117+
<instance_visual_scene url="#ID6"/>
118+
</scene>
119+
</COLLADA>

0 commit comments

Comments
 (0)