Skip to content

Commit 00d041d

Browse files
zhenjia-xuzhenjia-xu
authored
Merge pull request #284 from Genesis-Embodied-AI/zhenjia/fix_franka_sim
fix asset path
2 parents 257ca2c + c177920 commit 00d041d

File tree

4 files changed

+71
-71
lines changed

4 files changed

+71
-71
lines changed

‎genesis/assets/xml/franka_sim/assets/assets.xml

+23-23
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@
1313
<size nuser_actuator="5"/>
1414

1515
<asset>
16-
<mesh name="link0_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link0.stl"/>
17-
<mesh name="link1_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link1.stl"/>
18-
<mesh name="link2_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link2.stl"/>
19-
<mesh name="link3_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link3.stl"/>
20-
<mesh name="link4_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link4.stl"/>
21-
<mesh name="link5_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link5.stl"/>
22-
<mesh name="link6_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link6.stl"/>
23-
<mesh name="link7_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link7.stl"/>
24-
<mesh name="hand_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/hand.stl"/>
25-
<mesh name="link0_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link0.stl"/>
26-
<mesh name="link1_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link1.stl"/>
27-
<mesh name="link2_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link2.stl"/>
28-
<mesh name="link3_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link3.stl"/>
29-
<mesh name="link3_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link3_dark.stl" scale="1.01 1.01 1.01"/>
30-
<mesh name="link4_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link4.stl"/>
31-
<mesh name="link4_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link4_dark.stl" scale="1.01 1.01 1.01"/>
32-
<mesh name="link5_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link5.stl"/>
33-
<mesh name="link5_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link5_dark.stl" scale="1.01 1.01 1.01"/>
34-
<mesh name="link6_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link6.stl"/>
35-
<mesh name="link6_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link6_dark.stl" scale="1.01 1.01 1.01"/>
36-
<mesh name="link7_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link7.stl"/>
37-
<mesh name="link7_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link7_dark.stl" scale="1.01 1.01 1.01"/>
38-
<mesh name="hand_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/hand.stl"/>
16+
<mesh name="link0_col" file="../meshes/collision/link0.stl"/>
17+
<mesh name="link1_col" file="../meshes/collision/link1.stl"/>
18+
<mesh name="link2_col" file="../meshes/collision/link2.stl"/>
19+
<mesh name="link3_col" file="../meshes/collision/link3.stl"/>
20+
<mesh name="link4_col" file="../meshes/collision/link4.stl"/>
21+
<mesh name="link5_col" file="../meshes/collision/link5.stl"/>
22+
<mesh name="link6_col" file="../meshes/collision/link6.stl"/>
23+
<mesh name="link7_col" file="../meshes/collision/link7.stl"/>
24+
<mesh name="hand_col" file="../meshes/collision/hand.stl"/>
25+
<mesh name="link0_viz" file="../meshes/visual/link0.stl"/>
26+
<mesh name="link1_viz" file="../meshes/visual/link1.stl"/>
27+
<mesh name="link2_viz" file="../meshes/visual/link2.stl"/>
28+
<mesh name="link3_viz" file="../meshes/visual/link3.stl"/>
29+
<mesh name="link3_dark_viz" file="../meshes/visual/link3_dark.stl" scale="1.01 1.01 1.01"/>
30+
<mesh name="link4_viz" file="../meshes/visual/link4.stl"/>
31+
<mesh name="link4_dark_viz" file="../meshes/visual/link4_dark.stl" scale="1.01 1.01 1.01"/>
32+
<mesh name="link5_viz" file="../meshes/visual/link5.stl"/>
33+
<mesh name="link5_dark_viz" file="../meshes/visual/link5_dark.stl" scale="1.01 1.01 1.01"/>
34+
<mesh name="link6_viz" file="../meshes/visual/link6.stl"/>
35+
<mesh name="link6_dark_viz" file="../meshes/visual/link6_dark.stl" scale="1.01 1.01 1.01"/>
36+
<mesh name="link7_viz" file="../meshes/visual/link7.stl"/>
37+
<mesh name="link7_dark_viz" file="../meshes/visual/link7_dark.stl" scale="1.01 1.01 1.01"/>
38+
<mesh name="hand_viz" file="../meshes/visual/hand.stl"/>
3939
</asset>
4040

4141
<default>

‎genesis/assets/xml/franka_sim/assets/assets_0.xml

+23-23
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@
1313
<size nuser_actuator="5"/>
1414

1515
<asset>
16-
<mesh name="link0_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link0.stl"/>
17-
<mesh name="link1_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link1.stl"/>
18-
<mesh name="link2_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link2.stl"/>
19-
<mesh name="link3_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link3.stl"/>
20-
<mesh name="link4_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link4.stl"/>
21-
<mesh name="link5_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link5.stl"/>
22-
<mesh name="link6_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link6.stl"/>
23-
<mesh name="link7_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link7.stl"/>
24-
<mesh name="hand_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/hand.stl"/>
25-
<mesh name="link0_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link0.stl"/>
26-
<mesh name="link1_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link1.stl"/>
27-
<mesh name="link2_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link2.stl"/>
28-
<mesh name="link3_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link3.stl"/>
29-
<mesh name="link3_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link3_dark.stl" scale="1.01 1.01 1.01"/>
30-
<mesh name="link4_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link4.stl"/>
31-
<mesh name="link4_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link4_dark.stl" scale="1.01 1.01 1.01"/>
32-
<mesh name="link5_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link5.stl"/>
33-
<mesh name="link5_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link5_dark.stl" scale="1.01 1.01 1.01"/>
34-
<mesh name="link6_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link6.stl"/>
35-
<mesh name="link6_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link6_dark.stl" scale="1.01 1.01 1.01"/>
36-
<mesh name="link7_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link7.stl"/>
37-
<mesh name="link7_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link7_dark.stl" scale="1.01 1.01 1.01"/>
38-
<mesh name="hand_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/hand.stl"/>
16+
<mesh name="link0_col" file="../meshes/collision/link0.stl"/>
17+
<mesh name="link1_col" file="../meshes/collision/link1.stl"/>
18+
<mesh name="link2_col" file="../meshes/collision/link2.stl"/>
19+
<mesh name="link3_col" file="../meshes/collision/link3.stl"/>
20+
<mesh name="link4_col" file="../meshes/collision/link4.stl"/>
21+
<mesh name="link5_col" file="../meshes/collision/link5.stl"/>
22+
<mesh name="link6_col" file="../meshes/collision/link6.stl"/>
23+
<mesh name="link7_col" file="../meshes/collision/link7.stl"/>
24+
<mesh name="hand_col" file="../meshes/collision/hand.stl"/>
25+
<mesh name="link0_viz" file="../meshes/visual/link0.stl"/>
26+
<mesh name="link1_viz" file="../meshes/visual/link1.stl"/>
27+
<mesh name="link2_viz" file="../meshes/visual/link2.stl"/>
28+
<mesh name="link3_viz" file="../meshes/visual/link3.stl"/>
29+
<mesh name="link3_dark_viz" file="../meshes/visual/link3_dark.stl" scale="1.01 1.01 1.01"/>
30+
<mesh name="link4_viz" file="../meshes/visual/link4.stl"/>
31+
<mesh name="link4_dark_viz" file="../meshes/visual/link4_dark.stl" scale="1.01 1.01 1.01"/>
32+
<mesh name="link5_viz" file="../meshes/visual/link5.stl"/>
33+
<mesh name="link5_dark_viz" file="../meshes/visual/link5_dark.stl" scale="1.01 1.01 1.01"/>
34+
<mesh name="link6_viz" file="../meshes/visual/link6.stl"/>
35+
<mesh name="link6_dark_viz" file="../meshes/visual/link6_dark.stl" scale="1.01 1.01 1.01"/>
36+
<mesh name="link7_viz" file="../meshes/visual/link7.stl"/>
37+
<mesh name="link7_dark_viz" file="../meshes/visual/link7_dark.stl" scale="1.01 1.01 1.01"/>
38+
<mesh name="hand_viz" file="../meshes/visual/hand.stl"/>
3939
</asset>
4040

4141
<default>

‎genesis/assets/xml/franka_sim/assets/assets_2.xml

+23-23
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@
1313
<size nuser_actuator="5"/>
1414

1515
<asset>
16-
<mesh name="link0_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link0.stl"/>
17-
<mesh name="link1_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link1.stl"/>
18-
<mesh name="link2_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link2.stl"/>
19-
<mesh name="link3_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link3.stl"/>
20-
<mesh name="link4_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link4.stl"/>
21-
<mesh name="link5_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link5.stl"/>
22-
<mesh name="link6_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link6.stl"/>
23-
<mesh name="link7_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/link7.stl"/>
24-
<mesh name="hand_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/hand.stl"/>
25-
<mesh name="link0_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link0.stl"/>
26-
<mesh name="link1_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link1.stl"/>
27-
<mesh name="link2_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link2.stl"/>
28-
<mesh name="link3_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link3.stl"/>
29-
<mesh name="link3_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link3_dark.stl" scale="1.01 1.01 1.01"/>
30-
<mesh name="link4_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link4.stl"/>
31-
<mesh name="link4_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link4_dark.stl" scale="1.01 1.01 1.01"/>
32-
<mesh name="link5_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link5.stl"/>
33-
<mesh name="link5_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link5_dark.stl" scale="1.01 1.01 1.01"/>
34-
<mesh name="link6_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link6.stl"/>
35-
<mesh name="link6_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link6_dark.stl" scale="1.01 1.01 1.01"/>
36-
<mesh name="link7_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link7.stl"/>
37-
<mesh name="link7_dark_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/link7_dark.stl" scale="1.01 1.01 1.01"/>
38-
<mesh name="hand_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/visual/hand.stl"/>
16+
<mesh name="link0_col" file="../meshes/collision/link0.stl"/>
17+
<mesh name="link1_col" file="../meshes/collision/link1.stl"/>
18+
<mesh name="link2_col" file="../meshes/collision/link2.stl"/>
19+
<mesh name="link3_col" file="../meshes/collision/link3.stl"/>
20+
<mesh name="link4_col" file="../meshes/collision/link4.stl"/>
21+
<mesh name="link5_col" file="../meshes/collision/link5.stl"/>
22+
<mesh name="link6_col" file="../meshes/collision/link6.stl"/>
23+
<mesh name="link7_col" file="../meshes/collision/link7.stl"/>
24+
<mesh name="hand_col" file="../meshes/collision/hand.stl"/>
25+
<mesh name="link0_viz" file="../meshes/visual/link0.stl"/>
26+
<mesh name="link1_viz" file="../meshes/visual/link1.stl"/>
27+
<mesh name="link2_viz" file="../meshes/visual/link2.stl"/>
28+
<mesh name="link3_viz" file="../meshes/visual/link3.stl"/>
29+
<mesh name="link3_dark_viz" file="../meshes/visual/link3_dark.stl" scale="1.01 1.01 1.01"/>
30+
<mesh name="link4_viz" file="../meshes/visual/link4.stl"/>
31+
<mesh name="link4_dark_viz" file="../meshes/visual/link4_dark.stl" scale="1.01 1.01 1.01"/>
32+
<mesh name="link5_viz" file="../meshes/visual/link5.stl"/>
33+
<mesh name="link5_dark_viz" file="../meshes/visual/link5_dark.stl" scale="1.01 1.01 1.01"/>
34+
<mesh name="link6_viz" file="../meshes/visual/link6.stl"/>
35+
<mesh name="link6_dark_viz" file="../meshes/visual/link6_dark.stl" scale="1.01 1.01 1.01"/>
36+
<mesh name="link7_viz" file="../meshes/visual/link7.stl"/>
37+
<mesh name="link7_dark_viz" file="../meshes/visual/link7_dark.stl" scale="1.01 1.01 1.01"/>
38+
<mesh name="hand_viz" file="../meshes/visual/hand.stl"/>
3939
</asset>
4040

4141
<default>

‎genesis/assets/xml/franka_sim/assets/gripper_assets.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
====================================================== -->
99

1010
<asset>
11-
<mesh name="finger_col" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/finger.stl" scale='1.75 1.0 1.75'/>
12-
<mesh name="finger_viz" file="/home/zhouxian/git/Genesis-dev/genesis/assets/xml/franka_sim/meshes/collision/finger.stl" scale='1.75 1.0 1.75'/>
11+
<mesh name="finger_col" file="../meshes/collision/finger.stl" scale='1.75 1.0 1.75'/>
12+
<mesh name="finger_viz" file="../meshes/collision/finger.stl" scale='1.75 1.0 1.75'/>
1313
</asset>
1414

1515
<default>

0 commit comments

Comments
 (0)