Merge pull request #1434 from mmurooka/use-urdf-with-hand-for-hrp2

[jsk_data] use urdf model with hand for robot_description when playing with hrp2

jsk_data/launch/hrp2_play.launch

@@ -4,14 +4,18 @@
   <arg name="launch_openni" default="false"/>
   <arg name="launch_multisense" default="true" />
   <arg name="launch_robot_model" default="true"/>
+  <arg name="use_collada_model" default="false"/>
   <arg name="use_gui" default="false"/>
   <arg name="rosbag_option" default="--clock -l" />
   <arg name="use_xterm" default="false" />
   <arg name="ROBOT" default="$(env ROBOT)" />
 
   <!-- set params for rviz -->
   <param name="use_sim_time" value="true" />
-  <param if="$(arg launch_robot_model)" name="robot_description" textfile="$(find hrpsys_ros_bridge_tutorials)/models/$(arg ROBOT).dae" />
+  <group if="$(arg launch_robot_model)" >
+    <param name="robot_description" textfile="$(find hrpsys_ros_bridge_tutorials)/models/$(arg ROBOT).dae" if="$(arg use_collada_model)"  />
+    <param name="robot_description" textfile="$(find hrpsys_ros_bridge_tutorials)/models/$(arg ROBOT)_WH_SENSORS.urdf" unless="$(arg use_collada_model)" />
+  </group>
 
   <!-- setup openni_launch -->
   <include if="$(arg launch_openni)" file="$(find jsk_pcl_ros)/launch/openni2_remote.launch">