Skip to content

Commit 23afcb9

Browse files
authored
Merge pull request #145 from wxmerkt/topic/fix-kinova-mesh-materials
Fix Kinova mesh materials and remove Anymal mounting block
2 parents f19b2db + ee39846 commit 23afcb9

File tree

4 files changed

+106
-49
lines changed

4 files changed

+106
-49
lines changed

robots/kinova_description/meshes/hand_2finger.dae

Lines changed: 35 additions & 2 deletions
Large diffs are not rendered by default.

robots/kinova_description/meshes/wrist_spherical_1.dae

Lines changed: 35 additions & 2 deletions
Large diffs are not rendered by default.

robots/kinova_description/meshes/wrist_spherical_2.dae

Lines changed: 35 additions & 2 deletions
Large diffs are not rendered by default.

robots/kinova_description/robots/kinova.urdf

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
<material name="white">
3434
<color rgba="1.0 1.0 1.0 1.0"/>
3535
</material>
36-
<!-- Material for the visual primitives -->
37-
<material name="anymal_material">
38-
<color rgba="0.7 0.7 0.7 1.0"/>
39-
</material>
4036
<!-- Xacro:Properties -->
4137
<!-- [m] -->
4238
<!-- Base link -->
@@ -48,44 +44,6 @@
4844
</inertial>
4945
</link>
5046

51-
<link name="jaco_front_hatch_support_v2">
52-
<inertial>
53-
<mass value="0.0"/>
54-
<origin rpy="0 0 0" xyz="0 0 0"/>
55-
<inertia ixx="0.0" ixy="0.0" ixz="0.0" iyy="0.0" iyz="0.0" izz="0.0"/>
56-
</inertial>
57-
58-
<visual>
59-
<geometry>
60-
<mesh filename="package://example-robot-data/robots/kinova_description/meshes/jaco_front_hatch_support_v2.dae"/>
61-
</geometry>
62-
</visual>
63-
</link>
64-
<joint name="base_to_jaco_support" type="fixed">
65-
<parent link="base"/>
66-
<child link="jaco_front_hatch_support_v2"/>
67-
<origin rpy="0 0 0" xyz="0 0 0"/>
68-
</joint>
69-
70-
<link name="jaco_mounting_block">
71-
<inertial>
72-
<mass value="0.0"/>
73-
<origin rpy="0 0 0" xyz="0 0 0"/>
74-
<inertia ixx="0.0" ixy="0.0" ixz="0.0" iyy="0.0" iyz="0.0" izz="0.0"/>
75-
</inertial>
76-
77-
<visual>
78-
<geometry>
79-
<mesh filename="package://example-robot-data/robots/kinova_description/meshes/jaco_mounting_block.dae"/>
80-
</geometry>
81-
</visual>
82-
</link>
83-
<joint name="jaco_support_to_jaco_mounting_block" type="fixed">
84-
<parent link="jaco_front_hatch_support_v2"/>
85-
<child link="jaco_mounting_block"/>
86-
<origin rpy="0 0 0" xyz="0.045 0.00 -0.007626"/>
87-
</joint>
88-
8947
<link name="j2s6s200_link_base">
9048
<visual>
9149
<geometry>
@@ -107,7 +65,7 @@
10765
</inertial>
10866
</link>
10967
<joint name="jaco_mounting_block_to_j2s6s200_link_base" type="fixed">
110-
<parent link="jaco_mounting_block"/>
68+
<parent link="base"/>
11169
<child link="j2s6s200_link_base"/>
11270
<axis xyz="0 0 0"/>
11371
<limit effort="0" lower="0" upper="0" velocity="0"/>

0 commit comments

Comments
 (0)