[Personalrobots-commit] SF.net SVN: personalrobots:[2953] pkg/trunk

[<hsu...@us...>]

Revision: 2953
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=2953&view=rev
Author:   hsujohnhsu
Date:     2008-08-12 20:24:40 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
moved run-gazebo.sh into 3rdparty gazebo.

Modified Paths:
--------------
    pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-test.xml
    pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-wg.xml
    pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo.xml
    pkg/trunk/manip/overhead_grasp_behavior/overhead_grasp.xml

Added Paths:
-----------
    pkg/trunk/3rdparty/gazebo/run-gazebo.sh

Removed Paths:
-------------
    pkg/trunk/robot_control_loops/pr2_gazebo/run-gazebo.sh

Copied: pkg/trunk/3rdparty/gazebo/run-gazebo.sh (from rev 2952, pkg/trunk/robot_control_loops/pr2_gazebo/run-gazebo.sh)
===================================================================
--- pkg/trunk/3rdparty/gazebo/run-gazebo.sh	                        (rev 0)
+++ pkg/trunk/3rdparty/gazebo/run-gazebo.sh	2008-08-12 20:24:40 UTC (rev 2953)
@@ -0,0 +1,3 @@
+#!/bin/bash
+. `rospack find gazebo`/setup.bash
+gazebo $*

Modified: pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-test.xml
===================================================================
--- pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-test.xml	2008-08-12 20:21:54 UTC (rev 2952)
+++ pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-test.xml	2008-08-12 20:24:40 UTC (rev 2953)
@@ -2,7 +2,7 @@
   <group name="wg">
     <node pkg="namelookup" type="namelookup_server" respawn="false"/>
     <include file="$(find wg_robot_description)/send.xml"/>
-    <node pkg="pr2_gazebo" type="run-gazebo.sh" args="$(find gazebo_robot_description)/world/robot_test.world" respawn="true" />
+    <node pkg="gazebo" type="run-gazebo.sh" args="$(find gazebo_robot_description)/world/robot_test.world" respawn="true" />
     <node pkg="map_server" type="map_server" args="$(find gazebo_robot_description)/world/Media/materials/textures/map3.png 0.1" respawn="false" />
     <node pkg="pr2_gazebo" type="run-pr2_gazebo.sh" args="" respawn="true" />
     <node pkg="amcl_player" type="amcl_player" args="scan:=base_scan" respawn="false" />

Modified: pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-wg.xml
===================================================================
--- pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-wg.xml	2008-08-12 20:21:54 UTC (rev 2952)
+++ pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo-wg.xml	2008-08-12 20:24:40 UTC (rev 2953)
@@ -2,7 +2,7 @@
   <group name="wg">
     <node pkg="namelookup" type="namelookup_server" respawn="false"/>
     <include file="$(find wg_robot_description)/send.xml"/>
-    <node pkg="pr2_gazebo" type="run-gazebo.sh" args="$(find gazebo_robot_description)/world/robot_rosgazebo_wg.world" respawn="true" />
+    <node pkg="gazebo" type="run-gazebo.sh" args="$(find gazebo_robot_description)/world/robot_rosgazebo_wg.world" respawn="true" />
     <node pkg="map_server" type="map_server" args="$(find gazebo_robot_description)/world/Media/materials/textures/willowMap.png 0.1" respawn="false" />
     <node pkg="pr2_gazebo" type="run-pr2_gazebo.sh" args="" respawn="true" />
     <node pkg="amcl_player" type="amcl_player" args="scan:=base_scan" respawn="false" />

Modified: pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo.xml
===================================================================
--- pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo.xml	2008-08-12 20:21:54 UTC (rev 2952)
+++ pkg/trunk/demos/2dnav-gazebo/2dnav-gazebo.xml	2008-08-12 20:24:40 UTC (rev 2953)
@@ -2,7 +2,7 @@
   <group name="wg">
     <node pkg="namelookup" type="namelookup_server" respawn="false"/>
     <include file="$(find wg_robot_description)/send.xml"/>
-    <node pkg="pr2_gazebo" type="run-gazebo.sh" args="$(find gazebo_robot_description)/world/robot_rosgazebo.world" respawn="true" />
+    <node pkg="gazebo" type="run-gazebo.sh" args="$(find gazebo_robot_description)/world/robot_rosgazebo.world" respawn="true" />
     <node pkg="map_server" type="map_server" args="$(find gazebo_robot_description)/world/Media/materials/textures/map3.png 0.1" respawn="false" />
     <node pkg="pr2_gazebo" type="run-pr2_gazebo.sh" args="" respawn="true" />
     <node pkg="amcl_player" type="amcl_player" args="scan:=base_scan" respawn="false" />

Modified: pkg/trunk/manip/overhead_grasp_behavior/overhead_grasp.xml
===================================================================
--- pkg/trunk/manip/overhead_grasp_behavior/overhead_grasp.xml	2008-08-12 20:21:54 UTC (rev 2952)
+++ pkg/trunk/manip/overhead_grasp_behavior/overhead_grasp.xml	2008-08-12 20:24:40 UTC (rev 2953)
@@ -1,9 +1,8 @@
 <launch>
-  <master auto="start"/>
   <group name="wg">
     <node pkg="namelookup" type="namelookup_server" respawn="false"/>
     <include file="$(find wg_robot_description)/send.xml"/>
-    <node pkg="pr2_gazebo" type="run-gazebo.sh" args="$(find gazebo_robot_description)/world/robot_tablegrasp.world" respawn="true" />
+    <node pkg="gazebo" type="run-gazebo.sh" args="$(find gazebo_robot_description)/world/robot_tablegrasp.world" respawn="true" />
     <node pkg="pr2_gazebo" type="run-pr2_gazebo.sh" args="" respawn="true" />
     <node pkg="pr2_kinematic_controllers" type="pr2_kinematic_controllers" respawn="true" />
     <node pkg="overhead_grasp_behavior" type="overhead_grasp" respawn="true" />

Deleted: pkg/trunk/robot_control_loops/pr2_gazebo/run-gazebo.sh
===================================================================
--- pkg/trunk/robot_control_loops/pr2_gazebo/run-gazebo.sh	2008-08-12 20:21:54 UTC (rev 2952)
+++ pkg/trunk/robot_control_loops/pr2_gazebo/run-gazebo.sh	2008-08-12 20:24:40 UTC (rev 2953)
@@ -1,3 +0,0 @@
-#!/bin/bash
-. `rospack find gazebo`/setup.bash
-gazebo $*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.