From e7a09828a35baffb7c9910076477763bd5c0c283 Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Mon, 30 Apr 2018 15:31:59 +0200
Subject: [PATCH] Ceiling panel changed to square with pan and tilt.
 Box/obstacle color changed to white

---
 road_description/urdf/box/gazebo.gazebo              |  2 +-
 road_description/urdf/box/urdf.xacro                 |  2 +-
 road_description/urdf/ceiling/panel_macro.xacro      | 10 +++++-----
 .../urdf/circuits/full/ceiling_panels.xacro          | 12 ++++++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/road_description/urdf/box/gazebo.gazebo b/road_description/urdf/box/gazebo.gazebo
index aecc20b..b37873a 100644
--- a/road_description/urdf/box/gazebo.gazebo
+++ b/road_description/urdf/box/gazebo.gazebo
@@ -17,7 +17,7 @@
     </gazebo>
     
     <gazebo reference="body">
-      <material>Gazebo/Grey</material>
+      <material>Gazebo/White</material>
       <mu1>0</mu1>
       <mu2>0</mu2>
     </gazebo>
diff --git a/road_description/urdf/box/urdf.xacro b/road_description/urdf/box/urdf.xacro
index ba729c7..ec6cb5d 100644
--- a/road_description/urdf/box/urdf.xacro
+++ b/road_description/urdf/box/urdf.xacro
@@ -45,7 +45,7 @@
         <geometry>
           <box size="${LENGTH} ${WIDTH} ${HEIGHT}"/>
         </geometry>
-        <material name="grey"/>
+        <material name="white"/>
       </visual>
     </link>
     
diff --git a/road_description/urdf/ceiling/panel_macro.xacro b/road_description/urdf/ceiling/panel_macro.xacro
index 20167a2..65aa89f 100644
--- a/road_description/urdf/ceiling/panel_macro.xacro
+++ b/road_description/urdf/ceiling/panel_macro.xacro
@@ -3,7 +3,7 @@
 <root xmlns:xacro="http://www.ros.org/wiki/xacro">
 
   <xacro:include filename="$(find road_description)/urdf/materials.xacro" />
-  <xacro:property name="default_width" value="1.0" />
+  <xacro:property name="default_width" value="0.6" />
   <xacro:property name="default_thick" value="0.02" />
 
   <xacro:macro name="panel" 
@@ -31,16 +31,16 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0"/>
         <geometry>
-          <!--<box size="${width} ${width} ${thick}"/>-->
-          <cylinder radius="${width/2.0}" length="${thick}"/>
+          <box size="${width} ${width} ${thick}"/>
+          <!--<cylinder radius="${width/2.0}" length="${thick}"/>-->
         </geometry>
         <material name="${urdf_color}"/>
       </visual>
       <collision>
         <origin xyz="0 0 0" rpy="0 0 0"/>
         <geometry>
-          <!--<box size="${width} ${width} ${thick}"/>-->
-          <cylinder radius="${width/2.0}" length="${thick}"/>
+          <box size="${width} ${width} ${thick}"/>
+          <!--<cylinder radius="${width/2.0}" length="${thick}"/>-->
         </geometry>
       </collision>
     </link>
diff --git a/road_description/urdf/circuits/full/ceiling_panels.xacro b/road_description/urdf/circuits/full/ceiling_panels.xacro
index 52d5334..0a090cc 100644
--- a/road_description/urdf/circuits/full/ceiling_panels.xacro
+++ b/road_description/urdf/circuits/full/ceiling_panels.xacro
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <robot name="ceiling" xmlns:xacro="http://www.ros.org/wiki/xacro">
 
+  <xacro:property name="PI" value="3.1415926535897931" />
+  <xacro:property name="pan" value="${PI/4}" />
+  <xacro:property name="tilt" value="${PI/4}" />
+  
   <xacro:include filename="$(find road_description)/urdf/ceiling/panel_macro.xacro" />  
 
   <link name="$(arg parent)"/>
@@ -9,28 +13,28 @@
                parent="$(arg parent)"
                gazebo_material="Gazebo/Red"
                urdf_color="red">
-    <origin xyz="5.0 0.0 $(arg height)" rpy="0 0 0"/>
+    <origin xyz="5.0 0.0 $(arg height)" rpy="${-tilt} 0 ${-pan}"/>
   </xacro:panel>
   
   <xacro:panel name="panel_green" 
                parent="$(arg parent)"
                gazebo_material="Gazebo/Green"
                urdf_color="green">
-    <origin xyz="5.0 -10.0 $(arg height)" rpy="0 0 0"/>
+    <origin xyz="5.0 -10.0 $(arg height)" rpy="${tilt} 0 ${pan}"/>
   </xacro:panel>
   
   <xacro:panel name="panel_blue" 
                parent="$(arg parent)"
                gazebo_material="Gazebo/Blue"
                urdf_color="blue">
-    <origin xyz="-5.0 0.0 $(arg height)" rpy="0 0 0"/>
+    <origin xyz="-5.0 0.0 $(arg height)" rpy="${-tilt} 0 ${pan}"/>
   </xacro:panel>
   
   <xacro:panel name="panel_purple" 
                parent="$(arg parent)"
                gazebo_material="Gazebo/Purple"
                urdf_color="purple">
-    <origin xyz="-5.0 -10.0 $(arg height)" rpy="0 0 0"/>
+    <origin xyz="-5.0 -10.0 $(arg height)" rpy="${tilt} 0 ${-pan}"/>
   </xacro:panel>
 
 </robot>
\ No newline at end of file
-- 
GitLab