Skip to content
Snippets Groups Projects
Commit a034463e authored by Christoph Jähne's avatar Christoph Jähne
Browse files

Merge branch 'develop' of https://github.com/frankaemika/franka_ros into develop

parents cd81fb7f 406e118c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 57 additions and 0 deletions
franka_description/meshes/visual/finger.dae
+ 2
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -63,6 +64,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......
franka_description/meshes/visual/hand.dae
+ 5
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -63,6 +64,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -92,6 +94,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -121,6 +124,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -150,6 +154,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......
franka_description/meshes/visual/link0.dae
+ 12
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -63,6 +64,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -92,6 +94,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -121,6 +124,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -150,6 +154,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -179,6 +184,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -208,6 +214,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -237,6 +244,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -266,6 +274,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -295,6 +304,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -324,6 +334,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -353,6 +364,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
franka_description/meshes/visual/link1.dae
+ 1
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......
franka_description/meshes/visual/link2.dae
+ 1
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......
franka_description/meshes/visual/link3.dae
+ 4
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -63,6 +64,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -92,6 +94,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -121,6 +124,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
franka_description/meshes/visual/link4.dae
+ 4
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -63,6 +64,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -92,6 +94,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -121,6 +124,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
franka_description/meshes/visual/link5.dae
+ 3
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -63,6 +64,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -92,6 +94,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
franka_description/meshes/visual/link6.dae
+ 17
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -63,6 +64,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -92,6 +94,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -121,6 +124,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -150,6 +154,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -179,6 +184,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -208,6 +214,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -237,6 +244,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -266,6 +274,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -295,6 +304,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -324,6 +334,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -353,6 +364,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -382,6 +394,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -411,6 +424,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -440,6 +454,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -469,6 +484,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -498,6 +514,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
franka_description/meshes/visual/link7.dae
+ 8
− 0
View file @ a034463e
......@@ -34,6 +34,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -63,6 +64,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -92,6 +94,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -121,6 +124,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -150,6 +154,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -179,6 +184,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -208,6 +214,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......@@ -237,6 +244,7 @@
<transparent opaque="A_ONE">
<color>1 1 1 1</color>
</transparent>
<transparency><float>1</float></transparency>
<index_of_refraction>
<float sid="index_of_refraction">1</float>
</index_of_refraction>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment