Skip to content

Commit b5430b0

Browse files
srmainwaringsrmainwaring
committed
Iris: improve collisions
- Replace large box with collision STL that approximates the base. - Add cylinders for the leg collisions. - Remove deprecated physics elements. Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
1 parent 28eea6d commit b5430b0

2 files changed

Lines changed: 105 additions & 77 deletions

File tree

‎models/iris_with_standoffs/meshes/iris_collision.stl‎

49.1 KB
Binary file not shown.

‎models/iris_with_standoffs/model.sdf‎

Lines changed: 105 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,34 @@
2020
</inertia>
2121
</inertial>
2222
<collision name='base_collision'>
23-
<pose>0 0 -0.08 0 0 0</pose>
23+
<pose>0 0 0 0 0 0</pose>
24+
<geometry>
25+
<mesh>
26+
<uri>package://ardupilot_gazebo/models/iris_with_standoffs/meshes/iris_collision.stl</uri>
27+
</mesh>
28+
</geometry>
29+
<surface>
30+
<contact>
31+
<ode>
32+
<max_vel>100.0</max_vel>
33+
<min_depth>0.001</min_depth>
34+
</ode>
35+
</contact>
36+
<friction>
37+
<ode>
38+
<mu>100000.0</mu>
39+
<mu2>100000.0</mu2>
40+
</ode>
41+
</friction>
42+
</surface>
43+
</collision>
44+
<collision name='front_left_leg_collision'>
45+
<pose>0.123 0.22 -0.11 0 0 0</pose>
2446
<geometry>
25-
<box>
26-
<size>0.47 0.47 0.23</size>
27-
</box>
47+
<cylinder>
48+
<radius>0.005</radius>
49+
<length>0.17</length>
50+
</cylinder>
2851
</geometry>
2952
<surface>
3053
<contact>
@@ -41,6 +64,76 @@
4164
</friction>
4265
</surface>
4366
</collision>
67+
<collision name='front_right_leg_collision'>
68+
<pose>0.123 -0.22 -0.11 0 0 0</pose>
69+
<geometry>
70+
<cylinder>
71+
<radius>0.005</radius>
72+
<length>0.17</length>
73+
</cylinder>
74+
</geometry>
75+
<surface>
76+
<contact>
77+
<ode>
78+
<max_vel>100.0</max_vel>
79+
<min_depth>0.001</min_depth>
80+
</ode>
81+
</contact>
82+
<friction>
83+
<ode>
84+
<mu>100000.0</mu>
85+
<mu2>100000.0</mu2>
86+
</ode>
87+
</friction>
88+
</surface>
89+
</collision>
90+
<collision name='rear_left_leg_collision'>
91+
<pose>-0.140 0.21 -0.11 0 0 0</pose>
92+
<geometry>
93+
<cylinder>
94+
<radius>0.005</radius>
95+
<length>0.17</length>
96+
</cylinder>
97+
</geometry>
98+
<surface>
99+
<contact>
100+
<ode>
101+
<max_vel>100.0</max_vel>
102+
<min_depth>0.001</min_depth>
103+
</ode>
104+
</contact>
105+
<friction>
106+
<ode>
107+
<mu>100000.0</mu>
108+
<mu2>100000.0</mu2>
109+
</ode>
110+
</friction>
111+
</surface>
112+
</collision>
113+
<collision name='rear_right_leg_collision'>
114+
<pose>-0.140 -0.21 -0.11 0 0 0</pose>
115+
<geometry>
116+
<cylinder>
117+
<radius>0.005</radius>
118+
<length>0.17</length>
119+
</cylinder>
120+
</geometry>
121+
<surface>
122+
<contact>
123+
<ode>
124+
<max_vel>100.0</max_vel>
125+
<min_depth>0.001</min_depth>
126+
</ode>
127+
</contact>
128+
<friction>
129+
<ode>
130+
<mu>100000.0</mu>
131+
<mu2>100000.0</mu2>
132+
</ode>
133+
</friction>
134+
</surface>
135+
</collision>
136+
44137
<visual name='base_visual'>
45138
<geometry>
46139
<mesh>
@@ -59,7 +152,6 @@
59152
</pbr>
60153
</material>
61154
</visual>
62-
63155
<visual name='front_left_leg_visual'>
64156
<pose>0.123 0.22 -0.11 0 0 0</pose>
65157
<geometry>
@@ -214,24 +306,16 @@
214306
<izz>0.000167604</izz>
215307
</inertia>
216308
</inertial>
217-
<collision name='rotor_0_collision'>
309+
<collision name='collision'>
218310
<pose>0 0 0 0 0 0</pose>
219311
<geometry>
220312
<cylinder>
221313
<length>0.005</length>
222314
<radius>0.1</radius>
223315
</cylinder>
224316
</geometry>
225-
<surface>
226-
<contact>
227-
<ode/>
228-
</contact>
229-
<friction>
230-
<ode/>
231-
</friction>
232-
</surface>
233317
</collision>
234-
<visual name='rotor_0_visual'>
318+
<visual name='visual'>
235319
<pose>0 0 0 0 0 0</pose>
236320
<geometry>
237321
<mesh>
@@ -251,9 +335,6 @@
251335
</pbr>
252336
</material>
253337
</visual>
254-
<gravity>1</gravity>
255-
<velocity_decay/>
256-
<self_collide>0</self_collide>
257338
</link>
258339
<joint name='rotor_0_joint' type='revolute'>
259340
<child>rotor_0</child>
@@ -268,11 +349,6 @@
268349
<damping>0.004</damping>
269350
</dynamics>
270351
</axis>
271-
<physics>
272-
<ode>
273-
<implicit_spring_damper>1</implicit_spring_damper>
274-
</ode>
275-
</physics>
276352
</joint>
277353
<link name='rotor_1'>
278354
<pose>-0.13 0.2 0.023 0 0 0</pose>
@@ -288,24 +364,16 @@
288364
<izz>0.000167604</izz>
289365
</inertia>
290366
</inertial>
291-
<collision name='rotor_1_collision'>
367+
<collision name='collision'>
292368
<pose>0 0 0 0 0 0</pose>
293369
<geometry>
294370
<cylinder>
295371
<length>0.005</length>
296372
<radius>0.1</radius>
297373
</cylinder>
298374
</geometry>
299-
<surface>
300-
<contact>
301-
<ode/>
302-
</contact>
303-
<friction>
304-
<ode/>
305-
</friction>
306-
</surface>
307375
</collision>
308-
<visual name='rotor_1_visual'>
376+
<visual name='visual'>
309377
<pose>0 0 0 0 0 0</pose>
310378
<geometry>
311379
<mesh>
@@ -325,9 +393,6 @@
325393
</pbr>
326394
</material>
327395
</visual>
328-
<gravity>1</gravity>
329-
<velocity_decay/>
330-
<self_collide>0</self_collide>
331396
</link>
332397
<joint name='rotor_1_joint' type='revolute'>
333398
<child>rotor_1</child>
@@ -342,11 +407,6 @@
342407
<damping>0.004</damping>
343408
</dynamics>
344409
</axis>
345-
<physics>
346-
<ode>
347-
<implicit_spring_damper>1</implicit_spring_damper>
348-
</ode>
349-
</physics>
350410
</joint>
351411
<link name='rotor_2'>
352412
<pose>0.13 0.22 0.023 0 0 0</pose>
@@ -362,24 +422,16 @@
362422
<izz>0.000167604</izz>
363423
</inertia>
364424
</inertial>
365-
<collision name='rotor_2_collision'>
425+
<collision name='collision'>
366426
<pose>0 0 0 0 0 0</pose>
367427
<geometry>
368428
<cylinder>
369429
<length>0.005</length>
370430
<radius>0.1</radius>
371431
</cylinder>
372432
</geometry>
373-
<surface>
374-
<contact>
375-
<ode/>
376-
</contact>
377-
<friction>
378-
<ode/>
379-
</friction>
380-
</surface>
381433
</collision>
382-
<visual name='rotor_2_visual'>
434+
<visual name='visual'>
383435
<pose>0 0 0 0 0 0</pose>
384436
<geometry>
385437
<mesh>
@@ -399,9 +451,6 @@
399451
</pbr>
400452
</material>
401453
</visual>
402-
<gravity>1</gravity>
403-
<velocity_decay/>
404-
<self_collide>0</self_collide>
405454
</link>
406455
<joint name='rotor_2_joint' type='revolute'>
407456
<child>rotor_2</child>
@@ -416,11 +465,6 @@
416465
<damping>0.004</damping>
417466
</dynamics>
418467
</axis>
419-
<physics>
420-
<ode>
421-
<implicit_spring_damper>1</implicit_spring_damper>
422-
</ode>
423-
</physics>
424468
</joint>
425469
<link name='rotor_3'>
426470
<pose>-0.13 -0.2 0.023 0 0 0</pose>
@@ -436,24 +480,16 @@
436480
<izz>0.000167604</izz>
437481
</inertia>
438482
</inertial>
439-
<collision name='rotor_3_collision'>
483+
<collision name='collision'>
440484
<pose>0 0 0 0 0 0</pose>
441485
<geometry>
442486
<cylinder>
443487
<length>0.005</length>
444488
<radius>0.1</radius>
445489
</cylinder>
446490
</geometry>
447-
<surface>
448-
<contact>
449-
<ode/>
450-
</contact>
451-
<friction>
452-
<ode/>
453-
</friction>
454-
</surface>
455491
</collision>
456-
<visual name='rotor_3_visual'>
492+
<visual name='visual'>
457493
<pose>0 0 0 0 0 0</pose>
458494
<geometry>
459495
<mesh>
@@ -473,9 +509,6 @@
473509
</pbr>
474510
</material>
475511
</visual>
476-
<gravity>1</gravity>
477-
<velocity_decay/>
478-
<self_collide>0</self_collide>
479512
</link>
480513
<joint name='rotor_3_joint' type='revolute'>
481514
<child>rotor_3</child>
@@ -490,11 +523,6 @@
490523
<damping>0.004</damping>
491524
</dynamics>
492525
</axis>
493-
<physics>
494-
<ode>
495-
<implicit_spring_damper>1</implicit_spring_damper>
496-
</ode>
497-
</physics>
498526
</joint>
499527
</model>
500528
</sdf>

0 commit comments

Comments
 (0)