Skip to content

Commit 2e0abf3

Browse files
authored
Minor visual changes for sim filming (#77)
1 parent acd7b10 commit 2e0abf3

4 files changed

Lines changed: 34 additions & 59 deletions

File tree

src/description/urdf/athena_drive.urdf.xacro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<xacro:ground_truth_odometry robot_base_frame="base_footprint"/>
5858

5959
<xacro:zed_camera_sensor parent="base_footprint" camera_name="zed" sim_gazebo="$(arg sim_gazebo)">
60-
<origin xyz=".5 0.1 0.1" rpy="0 0 0"/>
60+
<origin xyz=".3 -0.123 0.073" rpy="0 0 0"/>
6161
</xacro:zed_camera_sensor>
6262

6363
<xacro:if value="$(arg use_mock_hardware)">

src/description/urdf/athena_drive_description.urdf.xacro

Lines changed: 28 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,23 @@
33
Commit Version: 1.6.0-4-g7f85cfe Build Version: 1.6.7995.38578
44
For more information, please see http://wiki.ros.org/sw_urdf_exporter -->
55
<robot xmlns:xacro="http://www.ros.org/wiki/xacro">
6+
7+
<material name="rover_silver">
8+
<color rgba="0.40 0.42 0.45 1.0"/>
9+
</material>
10+
11+
<material name="rover_dark_red">
12+
<color rgba="0.45 0.05 0.05 1.0"/>
13+
</material>
14+
615
<xacro:macro name="description">
716
<link name="base_link">
817
<visual>
918
<origin xyz="-0.775305042176281 0.0692748019047986 0.475175318827691" rpy="0 0 -0.094743" />
1019
<geometry>
1120
<mesh filename="package://description/meshes/chassis_base_link.STL" />
1221
</geometry>
13-
<material name="">
14-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
15-
</material>
22+
<material name="rover_silver" />
1623
</visual>
1724
<collision>
1825
<origin xyz="-0.775305042176281 0.0692748019047986 0.475175318827691" rpy="0 0 -0.094743" />
@@ -33,9 +40,7 @@
3340
<geometry>
3441
<mesh filename="package://description/meshes/suspension_left_link.STL" />
3542
</geometry>
36-
<material name="">
37-
<color rgba="0.79216 0.81961 0.93333 1" />
38-
</material>
43+
<material name="rover_silver" />
3944
</visual>
4045
<collision>
4146
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -65,9 +70,7 @@
6570
<geometry>
6671
<mesh filename="package://description/meshes/swerve_front_link.STL" />
6772
</geometry>
68-
<material name="">
69-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
70-
</material>
73+
<material name="rover_silver" />
7174
</visual>
7275
<collision>
7376
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -95,9 +98,7 @@
9598
<geometry>
9699
<mesh filename="package://description/meshes/swerve_module_front_link.STL" />
97100
</geometry>
98-
<material name="">
99-
<color rgba="0.79216 0.81961 0.93333 1" />
100-
</material>
101+
<material name="rover_silver" />
101102
</visual>
102103
<collision>
103104
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -126,9 +127,7 @@
126127
<geometry>
127128
<mesh filename="package://description/meshes/bracket_front_link.STL" />
128129
</geometry>
129-
<material name="">
130-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
131-
</material>
130+
<material name="rover_silver" />
132131
</visual>
133132
<collision>
134133
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -156,9 +155,7 @@
156155
<geometry>
157156
<mesh filename="package://description/meshes/wheel_front_link.STL" />
158157
</geometry>
159-
<material name="">
160-
<color rgba="0.79216 0.81961 0.93333 1" />
161-
</material>
158+
<material name="rover_dark_red" />
162159
</visual>
163160
<collision>
164161
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -186,9 +183,7 @@
186183
<geometry>
187184
<mesh filename="package://description/meshes/swerve_back_link.STL" />
188185
</geometry>
189-
<material name="">
190-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
191-
</material>
186+
<material name="rover_silver" />
192187
</visual>
193188
<collision>
194189
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -216,9 +211,7 @@
216211
<geometry>
217212
<mesh filename="package://description/meshes/swerve_module_back_link.STL" />
218213
</geometry>
219-
<material name="">
220-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
221-
</material>
214+
<material name="rover_silver" />
222215
</visual>
223216
<collision>
224217
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -247,9 +240,7 @@
247240
<geometry>
248241
<mesh filename="package://description/meshes/bracket_back_link.STL" />
249242
</geometry>
250-
<material name="">
251-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
252-
</material>
243+
<material name="rover_silver" />
253244
</visual>
254245
<collision>
255246
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -277,9 +268,7 @@
277268
<geometry>
278269
<mesh filename="package://description/meshes/wheel_back_link.STL" />
279270
</geometry>
280-
<material name="">
281-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
282-
</material>
271+
<material name="rover_dark_red" />
283272
</visual>
284273
<collision>
285274
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -307,9 +296,7 @@
307296
<geometry>
308297
<mesh filename="package://description/meshes/suspension_right_link.STL" />
309298
</geometry>
310-
<material name="">
311-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
312-
</material>
299+
<material name="rover_silver" />
313300
</visual>
314301
<collision>
315302
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -338,9 +325,7 @@
338325
<geometry>
339326
<mesh filename="package://description/meshes/swerve_front2_link.STL" />
340327
</geometry>
341-
<material name="">
342-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
343-
</material>
328+
<material name="rover_silver" />
344329
</visual>
345330
<collision>
346331
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -368,9 +353,7 @@
368353
<geometry>
369354
<mesh filename="package://description/meshes/swerve_module_front2_link.STL" />
370355
</geometry>
371-
<material name="">
372-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
373-
</material>
356+
<material name="rover_silver" />
374357
</visual>
375358
<collision>
376359
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -399,9 +382,7 @@
399382
<geometry>
400383
<mesh filename="package://description/meshes/bracket_front2_link.STL" />
401384
</geometry>
402-
<material name="">
403-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
404-
</material>
385+
<material name="rover_silver" />
405386
</visual>
406387
<collision>
407388
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -429,9 +410,7 @@
429410
<geometry>
430411
<mesh filename="package://description/meshes/wheel_front2_link.STL" />
431412
</geometry>
432-
<material name="">
433-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
434-
</material>
413+
<material name="rover_dark_red" />
435414
</visual>
436415
<collision>
437416
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -459,9 +438,7 @@
459438
<geometry>
460439
<mesh filename="package://description/meshes/swerve_back2_link.STL" />
461440
</geometry>
462-
<material name="">
463-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
464-
</material>
441+
<material name="rover_silver" />
465442
</visual>
466443
<collision>
467444
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -489,9 +466,7 @@
489466
<geometry>
490467
<mesh filename="package://description/meshes/swerve_module_back2_link.STL" />
491468
</geometry>
492-
<material name="">
493-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
494-
</material>
469+
<material name="rover_silver" />
495470
</visual>
496471
<collision>
497472
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -520,9 +495,7 @@
520495
<geometry>
521496
<mesh filename="package://description/meshes/bracket_back2_link.STL" />
522497
</geometry>
523-
<material name="">
524-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
525-
</material>
498+
<material name="rover_silver" />
526499
</visual>
527500
<collision>
528501
<origin xyz="0 0 0" rpy="0 0 0" />
@@ -550,9 +523,7 @@
550523
<geometry>
551524
<mesh filename="package://description/meshes/wheel_back2_link.STL" />
552525
</geometry>
553-
<material name="">
554-
<color rgba="0.792156862745098 0.819607843137255 0.933333333333333 1" />
555-
</material>
526+
<material name="rover_dark_red" />
556527
</visual>
557528
<collision>
558529
<origin xyz="0 0 0" rpy="0 0 0" />

src/description/urdf/zed_macro_sim.urdf.xacro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<mesh filename="file://$(find description)/meshes/zed2i.stl"/>
1919
</geometry>
2020
<material name="zed_mat">
21-
<color rgba="0.25 0.25 0.25 1.0"/>
21+
<color rgba="0.08 0.08 0.08 1.0"/>
2222
</material>
2323
</visual>
2424
<collision>

src/description/worlds/terrain_world.sdf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,9 @@
3232
<uri>model://boulder</uri>
3333
<pose>5.7181 -1.4069 -24.2377 0 0 0</pose>
3434
</include>
35+
<include>
36+
<uri>model://marker0</uri>
37+
<pose>3 3 -24.2377 0 0 0</pose>
38+
</include>
3539
</world>
3640
</sdf>

0 commit comments

Comments
 (0)