diff --git a/road_description/urdf/box/gazebo.gazebo b/road_description/urdf/box/gazebo.gazebo index aecc20b476d541bc23f400b60eb54e11ebdc05a5..b37873aca013097cf407260ccee52890e1c77e70 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 ba729c707f57c229314e9daff78f928977902328..ec6cb5dc6dca30849dd5882bfae9257ca34e7190 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 20167a2f3cbb5d8599a2433168b05b9c3d0504e9..65aa89f149785523cd95a310068ee57386eb1be1 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 52d533488f35a5869e6d1be1a1ed1b7ec53083e3..0a090cc3c21e9311cbed3e80d40d03097139bd60 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