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

…nto develop
frankaemika · Feb 5, 2020 · a034463 · a034463
2 parents cd81fb7 + 406e118
commit a034463
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 0 deletions.
diff --git a/franka_description/meshes/visual/finger.dae b/franka_description/meshes/visual/finger.dae
@@ -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>

diff --git a/franka_description/meshes/visual/hand.dae b/franka_description/meshes/visual/hand.dae
@@ -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>

diff --git a/franka_description/meshes/visual/link0.dae b/franka_description/meshes/visual/link0.dae
@@ -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>

diff --git a/franka_description/meshes/visual/link1.dae b/franka_description/meshes/visual/link1.dae
@@ -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>

diff --git a/franka_description/meshes/visual/link2.dae b/franka_description/meshes/visual/link2.dae
@@ -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>

diff --git a/franka_description/meshes/visual/link3.dae b/franka_description/meshes/visual/link3.dae
@@ -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>

diff --git a/franka_description/meshes/visual/link4.dae b/franka_description/meshes/visual/link4.dae
@@ -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>

diff --git a/franka_description/meshes/visual/link5.dae b/franka_description/meshes/visual/link5.dae
@@ -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>

diff --git a/franka_description/meshes/visual/link6.dae b/franka_description/meshes/visual/link6.dae
@@ -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>