fix launch errors after merge

This commit is contained in:
Ilya Uraev 2023-07-31 12:05:05 +03:00
parent 0bcfa40750
commit b02e3db31f
3 changed files with 64 additions and 26 deletions

View file

@ -124,7 +124,7 @@
<geometry>
<mesh>
<scale>0.35 0.35 0.35</scale>
<uri>package://rbs_simulation/rack/model/rack.dae</uri>
<uri>model://rack/model/rack.dae</uri>
</mesh>
</geometry>
</visual>
@ -132,7 +132,7 @@
<geometry>
<mesh>
<scale>0.35 0.35 0.35</scale>
<uri>package://rbs_simulation/rack/model/rack.stl</uri>
<uri>model://rack/model/rack.stl</uri>
</mesh>
</geometry>
<max_contacts>10</max_contacts>
@ -162,7 +162,7 @@
<geometry>
<!-- <mesh>
<scale>1 1 1</scale>
<uri>package://rbs_simulation/table/model/table.dae</uri>
<uri>model://table/model/table.dae</uri>
</mesh> -->
<box>
<size>0.8 0.8 0.4</size>
@ -178,7 +178,7 @@
<geometry>
<!-- <mesh>
<scale>1 1 1</scale>
<uri>package://rbs_simulation/table/model/table.stl</uri>
<uri>model://table/model/table.stl</uri>
</mesh> -->
<box>
<size>0.8 0.8 0.4</size>
@ -204,62 +204,62 @@
</link>
</model>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>box1</name>
<pose>0.25 0.65 0.6515 0 0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>box2</name>
<pose>0 0.65 0.6515 0 0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>box3</name>
<pose>-0.25 0.65 0.6515 0 0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>box4</name>
<pose>0.25 0.65 0.3015 0 0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>box5</name>
<pose>0 0.65 0.3015 0 0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>box6</name>
<pose>-0.25 0.65 0.3015 0 0 0</pose>
</include>
<!-- <include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>pyramid1</name>
<pose>-0.9000 -0.05 0.5250 0 0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>pyramid2</name>
<pose>-0.9000 0.0 0.5250 0 0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>pyramid3</name>
<pose>-0.9000 0.05 0.5250 0 0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>pyramid4</name>
<pose>-0.9 -0.0243 0.5750 0 -0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>pyramid5</name>
<pose>-0.9 0.0260 0.5750 0 -0 0</pose>
</include>
<include>
<uri>package://rbs_simulation/box1</uri>
<uri>model://box1</uri>
<name>pyramid6</name>
<pose>-0.9 0 0.6250 0 0 0</pose>
</include> -->