Skip to content

Commit 80cb594

Browse files
committed
Fixing pre-commits.
1 parent 7f52d03 commit 80cb594

File tree

17 files changed

+147
-49
lines changed

17 files changed

+147
-49
lines changed

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/backwall_asset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@
4646
</default>
4747
</default>
4848
</default>
49-
</mujocoinclude>
49+
</mujocoinclude>

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/backwall_chain.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@
5252
mass=".2"
5353
/>
5454
</body>
55-
</mujocoinclude>
55+
</mujocoinclude>

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/counters_asset.xml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,26 @@
22
<compiler inertiafromgeom="auto" inertiagrouprange="4 4" angle="radian" />
33

44
<asset>
5-
<mesh file="../meshes/cabinetdrawer.stl" name="cabinetdrawer" scale="0.6 0.6 0.6" />
6-
<mesh file="../meshes/cabinethandle.stl" name="cabinethandle" scale="0.6 0.6 0.6" />
7-
<mesh file="../meshes/cabinetbase.stl" name="cabinetbase" scale="0.6 0.6 0.6" />
8-
<mesh file="../meshes/countertop.stl" name="countertop" scale="0.6 0.6 0.6" />
5+
<mesh
6+
file="../meshes/cabinetdrawer.stl"
7+
name="cabinetdrawer"
8+
scale="0.6 0.6 0.6"
9+
/>
10+
<mesh
11+
file="../meshes/cabinethandle.stl"
12+
name="cabinethandle"
13+
scale="0.6 0.6 0.6"
14+
/>
15+
<mesh
16+
file="../meshes/cabinetbase.stl"
17+
name="cabinetbase"
18+
scale="0.6 0.6 0.6"
19+
/>
20+
<mesh
21+
file="../meshes/countertop.stl"
22+
name="countertop"
23+
scale="0.6 0.6 0.6"
24+
/>
925
<mesh file="../meshes/faucet.stl" name="faucet" scale="0.6 0.6 0.6" />
1026

1127
<texture
@@ -82,4 +98,4 @@
8298
</default>
8399
</default>
84100
</default>
85-
</mujocoinclude>
101+
</mujocoinclude>

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/counters_chain.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@
1111
<geom mesh="faucet" pos="0.5424 -0.1032 0.9066" />
1212
<geom pos="0.54 0.051 1.098" size="0.021 0.03" type="cylinder" />
1313
<geom pos="0.54 0.051 1.152" size="0.015 0.048" type="capsule" />
14-
<geom euler="1.57 0 0" pos="0.54 0.12 1.2" size="0.015 0.066" type="capsule" />
14+
<geom
15+
euler="1.57 0 0"
16+
pos="0.54 0.12 1.2"
17+
size="0.015 0.066"
18+
type="capsule"
19+
/>
1520
<geom pos="0.54 0.1902 1.08" size="0.015 0.12" type="capsule" />
1621
<geom pos="0.54 0.1902 1.002" size="0.0192 0.042" type="cylinder" />
1722
<geom
@@ -255,4 +260,4 @@
255260
mass=".02"
256261
/>
257262
</body>
258-
</mujocoinclude>
263+
</mujocoinclude>

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/hingecabinet_asset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@
7171
</default>
7272
</default>
7373
</default>
74-
</mujocoinclude>
74+
</mujocoinclude>

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/hingecabinet_chain.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,4 @@
244244
/>
245245
</body>
246246
</body>
247-
</mujocoinclude>
247+
</mujocoinclude>

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/kettle_asset.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33

44
<asset>
55
<mesh file="../meshes/kettle.stl" name="kettle" scale="0.6 0.6 0.6" />
6-
<mesh file="../meshes/kettlehandle.stl" name="kettlehandle" scale="0.6 0.6 0.6" />
6+
<mesh
7+
file="../meshes/kettlehandle.stl"
8+
name="kettlehandle"
9+
scale="0.6 0.6 0.6"
10+
/>
711

812
<texture
913
name="T_kettle_metal"
@@ -76,4 +80,4 @@
7680
</default>
7781
</default>
7882
</default>
79-
</mujocoinclude>
83+
</mujocoinclude>

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/kettle_chain.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@
7777
rgba="1 0 0 1"
7878
/>
7979
</body>
80-
</mujocoinclude>
80+
</mujocoinclude>

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/microwave_asset.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,22 @@
44
<asset>
55
<mesh file="../meshes/micro.stl" name="micro" scale="0.6 0.6 0.6" />
66
<mesh file="../meshes/microdoor.stl" name="microdoor" scale="0.6 0.6 0.6" />
7-
<mesh file="../meshes/microbutton.stl" name="microbutton" scale="0.6 0.6 0.6" />
7+
<mesh
8+
file="../meshes/microbutton.stl"
9+
name="microbutton"
10+
scale="0.6 0.6 0.6"
11+
/>
812
<mesh file="../meshes/microfeet.stl" name="microfeet" scale="0.6 0.6 0.6" />
9-
<mesh file="../meshes/microhandle.stl" name="microhandle" scale="0.6 0.6 0.6" />
10-
<mesh file="../meshes/microwindow.stl" name="microwindow" scale="0.6 0.6 0.6" />
13+
<mesh
14+
file="../meshes/microhandle.stl"
15+
name="microhandle"
16+
scale="0.6 0.6 0.6"
17+
/>
18+
<mesh
19+
file="../meshes/microwindow.stl"
20+
name="microwindow"
21+
scale="0.6 0.6 0.6"
22+
/>
1123

1224
<texture
1325
name="T_micro_metal"
@@ -70,4 +82,4 @@
7082
</default>
7183
</default>
7284
</default>
73-
</mujocoinclude>
85+
</mujocoinclude>

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/assets/kitchen_assets/item_assets/microwave_chain.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,4 @@
115115
/>
116116
</body>
117117
</body>
118-
</mujocoinclude>
118+
</mujocoinclude>

0 commit comments

Comments
 (0)