Skip to content
This repository has been archived by the owner on Oct 9, 2019. It is now read-only.

Commit

Permalink
using .dae instead of .stl
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahcorde
ahcorde committed Feb 4, 2019
1 parent c33ce23 commit 43bccc8
Show file tree
Hide file tree
Showing 8 changed files with 82 additions and 490 deletions.
10 changes: 5 additions & 5 deletions mara_description/urdf/camera_side.urdf.xacro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<visual>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="model://mara_description/meshes/demo/AIR_WorkArea.stl" scale="0.001 0.001 0.001"/>
<mesh filename="model://mara_description/meshes/demo/AIR_WorkArea.dae" scale="0.001 0.001 0.001"/>
</geometry>
<material name="Gazebo/Wood">
<color rgba="0. 0. 0. 1"/>
Expand All @@ -21,7 +21,7 @@
<collision>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="model://mara_description/meshes/demo/AIR_WorkArea.stl" scale="0.001 0.001 0.001"/>
<mesh filename="model://mara_description/meshes/demo/AIR_WorkArea.dae" scale="0.001 0.001 0.001"/>
</geometry>
</collision>
</link>
Expand All @@ -39,7 +39,7 @@
<visual>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="model://mara_description/meshes/demo/side/side_camera_support.stl" scale="0.001 0.001 0.001"/>
<mesh filename="model://mara_description/meshes/demo/side/side_camera_support.dae" scale="0.001 0.001 0.001"/>
</geometry>
<material name="Gazebo/Wood">
<color rgba="0. 0. 0. 1"/>
Expand All @@ -48,7 +48,7 @@
<collision>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="model://mara_description/meshes/demo/side/side_camera_support.stl" scale="0.001 0.001 0.001"/>
<mesh filename="model://mara_description/meshes/demo/side/side_camera_support.dae" scale="0.001 0.001 0.001"/>
</geometry>
</collision>
</link>
Expand All @@ -66,7 +66,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh scale="0.001 0.001 0.001" filename="model://mara_description/meshes/camera/SCARA_DepthSensor_SIDE.stl" />
<mesh scale="0.001 0.001 0.001" filename="model://mara_description/meshes/camera/SCARA_DepthSensor_SIDE.dae" />
</geometry>
<material name="Gazebo/Grey">
<color rgba="1. 1. 1. 1" />
Expand Down
12 changes: 6 additions & 6 deletions mara_description/urdf/camera_top.urdf.xacro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<visual>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="model://mara_description/meshes/demo/AIR_WorkArea.stl" scale="0.001 0.001 0.001"/>
<mesh filename="model://mara_description/meshes/demo/AIR_WorkArea.dae" scale="0.001 0.001 0.001"/>
</geometry>
<material name="Gazebo/Wood">
<color rgba="0. 0. 0. 1"/>
Expand All @@ -20,7 +20,7 @@
<collision>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="model://mara_description/meshes/demo/AIR_WorkArea.stl" scale="0.001 0.001 0.001"/>
<mesh filename="model://mara_description/meshes/demo/AIR_WorkArea.dae" scale="0.001 0.001 0.001"/>
</geometry>
</collision>
</link>
Expand All @@ -38,7 +38,7 @@
<visual>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="model://mara_description/meshes/demo/top/top_camera_support.stl" scale="0.001 0.001 0.001"/>
<mesh filename="model://mara_description/meshes/demo/top/top_camera_support.dae" scale="0.001 0.001 0.001"/>
</geometry>
<material name="Gazebo/Wood">
<color rgba="0. 0. 0. 1"/>
Expand All @@ -47,7 +47,7 @@
<collision>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="model://mara_description/meshes/demo/top/top_camera_support.stl" scale="0.002 0.001 0.001"/>
<mesh filename="model://mara_description/meshes/demo/top/top_camera_support.dae" scale="0.002 0.001 0.001"/>
</geometry>
</collision>
</link>
Expand All @@ -65,7 +65,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<geometry>
<mesh scale="0.001 0.001 0.001" filename="model://mara_description/meshes/depthSensor.stl" />
<mesh scale="0.001 0.001 0.001" filename="model://mara_description/meshes/depthSensor.dae" />
</geometry>
<material name="Gazebo/Grey">
<color rgba="1. 1. 1. 1" />
Expand All @@ -74,7 +74,7 @@
<collision>
<origin rpy="0 0 0" xyz="0 0 0"/>
<geometry>
<mesh filename="model://mara_description/meshes/depthSensor.stl" scale="0.002 0.002 0.002" />
<mesh filename="model://mara_description/meshes/depthSensor.dae" scale="0.002 0.002 0.002" />
</geometry>
</collision>
</link>
Expand Down
Loading

0 comments on commit 43bccc8

Please # to comment.