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

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

Revision: 20863
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=20863&view=rev
Author:   hsujohnhsu
Date:     2009-08-06 00:59:27 +0000 (Thu, 06 Aug 2009)

Log Message:
-----------
remove ikea objects from pr2_ogre.

Modified Paths:
--------------
    pkg/trunk/demos/pr2_gazebo/manifest.xml
    pkg/trunk/demos/pr2_gazebo/pr2_default_controllers.launch
    pkg/trunk/stacks/pr2/pr2_ogre/CMakeLists.txt
    pkg/trunk/stacks/pr2/pr2_ogre/manifest.xml
    pkg/trunk/stacks/simulators/gazebo/launch/balcony_world.launch
    pkg/trunk/stacks/simulators/gazebo/launch/camera_world.launch
    pkg/trunk/stacks/simulators/gazebo/launch/debug.launch
    pkg/trunk/stacks/simulators/gazebo/launch/empty_world.launch
    pkg/trunk/stacks/simulators/gazebo/launch/empty_world_no_x.launch
    pkg/trunk/stacks/simulators/gazebo/launch/office_world.launch
    pkg/trunk/stacks/simulators/gazebo/launch/scan_world.launch
    pkg/trunk/stacks/simulators/gazebo/launch/simple_world.launch
    pkg/trunk/stacks/simulators/gazebo/launch/slide_world.launch
    pkg/trunk/stacks/simulators/gazebo/launch/wg_world.launch

Added Paths:
-----------
    pkg/trunk/sandbox/ikea_ogre/
    pkg/trunk/sandbox/ikea_ogre/CMakeLists.txt
    pkg/trunk/sandbox/ikea_ogre/Makefile
    pkg/trunk/sandbox/ikea_ogre/Media/
    pkg/trunk/sandbox/ikea_ogre/Media/materials/
    pkg/trunk/sandbox/ikea_ogre/Media/materials/scripts/
    pkg/trunk/sandbox/ikea_ogre/Media/materials/scripts/pr2.material
    pkg/trunk/sandbox/ikea_ogre/Media/materials/textures/
    pkg/trunk/sandbox/ikea_ogre/Media/materials/textures/pr2_wheel_left.png
    pkg/trunk/sandbox/ikea_ogre/Media/materials/textures/pr2_wheel_right.png
    pkg/trunk/sandbox/ikea_ogre/Media/models/
    pkg/trunk/sandbox/ikea_ogre/manifest.xml

Modified: pkg/trunk/demos/pr2_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/pr2_gazebo/manifest.xml	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/demos/pr2_gazebo/manifest.xml	2009-08-06 00:59:27 UTC (rev 20863)
@@ -8,6 +8,7 @@
   <depend package="gazebo_tools"/>
   <depend package="teleop_arm_keyboard"/>
   <depend package="pr2_ogre" />
+  <depend package="ikea_ogre" />
   <depend package="gazebo_worlds"/>
   <depend package="pr2_defs"/>
   <depend package="pr2_default_controllers"/>

Modified: pkg/trunk/demos/pr2_gazebo/pr2_default_controllers.launch
===================================================================
--- pkg/trunk/demos/pr2_gazebo/pr2_default_controllers.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/demos/pr2_gazebo/pr2_default_controllers.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -7,5 +7,8 @@
   <include file="$(find arm_gazebo)/controllers/l_arm_position_controller.launch" output="screen"/>
   <include file="$(find arm_gazebo)/controllers/r_arm_position_controller.launch" output="screen"/>
 
+  <node pkg="mechanism_control" type="spawner.py" args="$(find pr2_default_controllers)/torso_lift_vel_controller.xml" output="screen" />
+
+
 </launch>
 

Added: pkg/trunk/sandbox/ikea_ogre/CMakeLists.txt
===================================================================
--- pkg/trunk/sandbox/ikea_ogre/CMakeLists.txt	                        (rev 0)
+++ pkg/trunk/sandbox/ikea_ogre/CMakeLists.txt	2009-08-06 00:59:27 UTC (rev 20863)
@@ -0,0 +1,34 @@
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+rospack(ikea_ogre)
+
+# find needed paths
+find_ros_package(ikea_objects)
+find_ros_package(ogre)
+
+MESSAGE(STATUS "\nikea_objects path  ${ikea_objects_PACKAGE_PATH}\n")
+if(EXISTS ${ikea_objects_PACKAGE_PATH})
+  # build the ogre mesh files from *.stl (and *.stlb from convex decomposition)
+  file(GLOB ikea_objects_stl_files ${ikea_objects_PACKAGE_PATH}/meshes/convex/*.stlb)
+  set(ikea_objects_gen_files "")
+
+  set(ikea_objects_out_path ${CMAKE_CURRENT_SOURCE_DIR}/Media/models/ikea_objects)
+
+  MAKE_DIRECTORY(${ikea_objects_out_path})
+
+  foreach(it ${ikea_objects_stl_files})
+    get_filename_component(basename ${it} NAME)
+
+    # convert to ogre files
+    add_custom_command(
+      OUTPUT ${ikea_objects_out_path}/${basename}.mesh
+      COMMAND rosrun 
+      ARGS ogre_tools stl_to_mesh ${it} ${ikea_objects_out_path}/${basename}.mesh
+      DEPENDS ${it})
+    
+    set(ikea_objects_gen_files ${ikea_objects_gen_files} ${ikea_objects_out_path}/${basename}.mesh)
+  endforeach(it)
+
+  add_custom_target(ikea_objects_media_files ALL DEPENDS ${ikea_objects_gen_files})
+endif(EXISTS ${ikea_objects_PACKAGE_PATH})
+

Added: pkg/trunk/sandbox/ikea_ogre/Makefile
===================================================================
--- pkg/trunk/sandbox/ikea_ogre/Makefile	                        (rev 0)
+++ pkg/trunk/sandbox/ikea_ogre/Makefile	2009-08-06 00:59:27 UTC (rev 20863)
@@ -0,0 +1 @@
+include $(shell rospack find mk)/cmake.mk

Added: pkg/trunk/sandbox/ikea_ogre/Media/materials/scripts/pr2.material
===================================================================
--- pkg/trunk/sandbox/ikea_ogre/Media/materials/scripts/pr2.material	                        (rev 0)
+++ pkg/trunk/sandbox/ikea_ogre/Media/materials/scripts/pr2.material	2009-08-06 00:59:27 UTC (rev 20863)
@@ -0,0 +1,366 @@
+material PR2/floor_texture
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture map3.png
+        tex_address_mode clamp
+      }
+    }
+  }
+}
+
+material PR2/wall_texture
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture willowMap.png
+        tex_address_mode clamp
+      }
+    }
+  }
+}
+
+material PR2/wheel_right
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_right.png
+      }
+    }
+  }
+}
+
+material PR2/wheel_left
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_left.png
+      }
+    }
+  }
+}
+
+
+
+material PR2/fr_caster_l_wheel_link
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_right.png
+      }
+    }
+  }
+}
+
+material PR2/fl_caster_l_wheel_link
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_left.png
+      }
+    }
+  }
+}
+material PR2/br_caster_l_wheel_link
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_right.png
+      }
+    }
+  }
+}
+
+material PR2/bl_caster_l_wheel_link
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_left.png
+      }
+    }
+  }
+}
+
+
+material PR2/fr_caster_r_wheel_link
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_right.png
+      }
+    }
+  }
+}
+
+material PR2/fl_caster_r_wheel_link
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_left.png
+      }
+    }
+  }
+}
+material PR2/br_caster_r_wheel_link
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_right.png
+      }
+    }
+  }
+}
+
+material PR2/bl_caster_r_wheel_link
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_left.png
+      }
+    }
+  }
+}
+
+
+material PR2/RollLinks
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture pr2_wheel_left.png
+      }
+    }
+  }
+}
+
+material PR2/Shiny
+{
+  technique
+  {
+    pass
+    {
+      ambient 0.75 0.75 0.75
+      texture_unit
+      {
+        texture plug_texture.jpg
+        env_map spherical
+      }
+    }
+  }
+}
+
+material PR2/Plug
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture plug_texture.jpg
+      }
+    }
+  }
+}
+
+material PR2/Jack
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture jack_texture.jpg
+      }
+    }
+  }
+}
+
+material PR2/Outlet
+{
+  technique
+  {
+    pass
+    {
+      texture_unit
+      {
+        texture outlet_texture.jpg
+      }
+    }
+  }
+}
+
+
+material PR2/White
+{
+  receive_shadows on
+  lighting on
+
+  technique
+  {
+    pass
+    {
+      ambient 0.5 0.5 0.5 1.0
+      diffuse 1.0 1.0 1.0 1.0
+      specular 1.0 1.0 1.0 1.0
+      shading gouraud
+    }
+  }
+}
+
+
+
+material PR2/Blue
+{
+  receive_shadows on
+
+  technique
+  {
+    pass
+    {
+      ambient 0.000000 0.000000 0.200000 1.000000
+      diffuse 0.000000 0.000000 0.800000 1.000000
+      specular 0.000000 0.000000 0.200000 1.000000
+      emissive 0.000000 0.000000 0.000000 1.000000
+      shading gouraud
+    }
+  }
+}
+
+material PR2/Grey2
+{
+  receive_shadows on
+  lighting on
+
+  technique
+  {
+    pass
+    {
+      ambient 0.5 0.5 0.5 1.0
+      diffuse 0.9 0.9 0.9 1.0
+      specular 0.8 0.8 0.8 1
+      lighting on
+    }
+  }
+}
+
+material PR2/Grey
+{
+  receive_shadows on
+  lighting on
+
+  technique
+  {
+    pass
+    {
+      ambient 0.1 0.1 0.1 1.0
+      diffuse 0.7 0.7 0.7 1.0
+      specular 0.8 0.8 0.8 1
+    }
+  }
+}
+
+material PR2/Yellow
+{
+  receive_shadows on
+
+  technique
+  {
+    pass
+    {
+      ambient 0.200000 0.200000 0.000000 1.000000
+      diffuse 0.800000 0.800000 0.000000 1.000000
+      specular 0.200000 0.200000 0.000000 1.000000 
+      emissive 0.000000 0.000000 0.000000 1.000000
+      lighting on
+    }
+  }
+}
+
+material PR2/Red
+{
+  receive_shadows on
+  technique
+  {
+    pass
+    {
+      ambient 0.200000 0.000000 0.000000 1.000000
+      diffuse 0.800000 0.000000 0.000000 1.000000
+      specular 0.200000 0.000000 0.000000 1.000000 
+      emissive 0.000000 0.000000 0.000000 1.000000
+      lighting on
+      shading phong
+    }
+  }
+}
+
+material PR2/Green
+{
+  receive_shadows on
+
+  technique
+  {
+    pass
+    {
+      ambient 0.000000 0.200000 0.000000 1.000000
+      diffuse 0.000000 0.800000 0.000000 1.000000
+      specular 0.000000 0.200000 0.000000 1.000000 
+      emissive 0.000000 0.000000 0.000000 0.000000
+      lighting on
+      shading phong
+    }
+  }
+}
+

Added: pkg/trunk/sandbox/ikea_ogre/Media/materials/textures/pr2_wheel_left.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/ikea_ogre/Media/materials/textures/pr2_wheel_left.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/ikea_ogre/Media/materials/textures/pr2_wheel_right.png
===================================================================
(Binary files differ)


Property changes on: pkg/trunk/sandbox/ikea_ogre/Media/materials/textures/pr2_wheel_right.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: pkg/trunk/sandbox/ikea_ogre/manifest.xml
===================================================================
--- pkg/trunk/sandbox/ikea_ogre/manifest.xml	                        (rev 0)
+++ pkg/trunk/sandbox/ikea_ogre/manifest.xml	2009-08-06 00:59:27 UTC (rev 20863)
@@ -0,0 +1,19 @@
+<package>
+
+  <description brief="Ikea Objects Ogre Mesh Files">
+    
+    This package contains Ikea objects Ogre mesh files used for visualization and collision as
+    defined at Willow Garage.
+    
+  </description>
+  <author>John Hsu</author>
+  <license>BSD</license>
+  <review status="unreviewed" notes=""/>
+  
+  <depend package="convex_decomposition"/>
+  <depend package="ivcon"/>
+  <depend package="ogre_tools"/>
+  <depend package="ikea_objects"/>
+  <url>http://pr.willowgarage.com/wiki/RobotDescriptionFormat</url>
+
+</package>

Modified: pkg/trunk/stacks/pr2/pr2_ogre/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/pr2/pr2_ogre/CMakeLists.txt	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/pr2/pr2_ogre/CMakeLists.txt	2009-08-06 00:59:27 UTC (rev 20863)
@@ -51,30 +51,3 @@
 add_custom_target(media_files ALL DEPENDS ${pr2_gen_files})
 
 
-find_ros_package(ikea_objects)
-MESSAGE(STATUS "\nikea_objects path  ${ikea_objects_PACKAGE_PATH}\n")
-if(EXISTS ${ikea_objects_PACKAGE_PATH})
-  # build the ogre mesh files from *.stl (and *.stlb from convex decomposition)
-  file(GLOB ikea_objects_stl_files ${ikea_objects_PACKAGE_PATH}/meshes/convex/*.stlb)
-  set(ikea_objects_gen_files "")
-
-  set(ikea_objects_out_path ${CMAKE_CURRENT_SOURCE_DIR}/Media/models/ikea_objects)
-
-  MAKE_DIRECTORY(${ikea_objects_out_path})
-
-  foreach(it ${ikea_objects_stl_files})
-    get_filename_component(basename ${it} NAME)
-
-    # convert to ogre files
-    add_custom_command(
-      OUTPUT ${ikea_objects_out_path}/${basename}.mesh
-      COMMAND rosrun 
-      ARGS ogre_tools stl_to_mesh ${it} ${ikea_objects_out_path}/${basename}.mesh
-      DEPENDS ${it})
-    
-    set(ikea_objects_gen_files ${ikea_objects_gen_files} ${ikea_objects_out_path}/${basename}.mesh)
-  endforeach(it)
-
-  add_custom_target(ikea_objects_media_files ALL DEPENDS ${ikea_objects_gen_files})
-endif(EXISTS ${ikea_objects_PACKAGE_PATH})
-

Modified: pkg/trunk/stacks/pr2/pr2_ogre/manifest.xml
===================================================================
--- pkg/trunk/stacks/pr2/pr2_ogre/manifest.xml	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/pr2/pr2_ogre/manifest.xml	2009-08-06 00:59:27 UTC (rev 20863)
@@ -14,7 +14,6 @@
   <depend package="convex_decomposition"/>
   <depend package="ivcon"/>
   <depend package="ogre_tools"/>
-  <depend package="ikea_objects"/>
   <url>http://pr.willowgarage.com/wiki/RobotDescriptionFormat</url>
 
 </package>

Modified: pkg/trunk/stacks/simulators/gazebo/launch/balcony_world.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/balcony_world.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/balcony_world.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -5,7 +5,7 @@
 
   <node pkg="gazebo" type="gazebo" args="$(find gazebo_worlds)/worlds/balcony.world" respawn="false" output="screen">
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 

Modified: pkg/trunk/stacks/simulators/gazebo/launch/camera_world.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/camera_world.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/camera_world.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -5,7 +5,7 @@
 
   <node pkg="gazebo" type="gazebo" args="$(find gazebo_worlds)/worlds/camera.world" respawn="false" output="screen">
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 

Modified: pkg/trunk/stacks/simulators/gazebo/launch/debug.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/debug.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/debug.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -8,7 +8,7 @@
   -->
   <node pkg="gazebo" launch-prefix="gdb --args" type="gazebo" args="$(find gazebo_worlds)/worlds/empty.world" respawn="false" output="screen">
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 

Modified: pkg/trunk/stacks/simulators/gazebo/launch/empty_world.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/empty_world.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/empty_world.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -9,7 +9,7 @@
   -->
   <node pkg="gazebo" type="gazebo" args="$(find gazebo_worlds)/worlds/empty.world" respawn="false" >
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 

Modified: pkg/trunk/stacks/simulators/gazebo/launch/empty_world_no_x.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/empty_world_no_x.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/empty_world_no_x.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -5,7 +5,7 @@
 
   <node pkg="gazebo" launch-prefix="xvfb-run" type="gazebo" args="-g $(find gazebo_worlds)/worlds/empty.world" respawn="false" output="screen">
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 

Modified: pkg/trunk/stacks/simulators/gazebo/launch/office_world.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/office_world.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/office_world.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -5,7 +5,7 @@
 
   <node pkg="gazebo" type="gazebo" args="$(find gazebo_worlds)/worlds/simple_office.world" respawn="false" output="screen">
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 

Modified: pkg/trunk/stacks/simulators/gazebo/launch/scan_world.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/scan_world.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/scan_world.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -5,7 +5,7 @@
 
   <node pkg="gazebo" type="gazebo" args="$(find gazebo_worlds)/worlds/scan.world" respawn="false" output="screen">
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 

Modified: pkg/trunk/stacks/simulators/gazebo/launch/simple_world.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/simple_world.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/simple_world.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -5,7 +5,7 @@
 
   <node pkg="gazebo" type="gazebo" args="$(find gazebo_worlds)/worlds/simple.world" respawn="false" output="screen">
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 

Modified: pkg/trunk/stacks/simulators/gazebo/launch/slide_world.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/slide_world.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/slide_world.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -5,7 +5,7 @@
 
   <node pkg="gazebo" type="gazebo" args="$(find gazebo_worlds)/worlds/slide.world" respawn="false" output="screen">
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 

Modified: pkg/trunk/stacks/simulators/gazebo/launch/wg_world.launch
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/launch/wg_world.launch	2009-08-06 00:30:47 UTC (rev 20862)
+++ pkg/trunk/stacks/simulators/gazebo/launch/wg_world.launch	2009-08-06 00:59:27 UTC (rev 20863)
@@ -5,7 +5,7 @@
 
   <node pkg="gazebo" type="gazebo" args="$(find gazebo_worlds)/worlds/empty.world" respawn="false" output="screen">
     <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(optenv LD_LIBRARY_PATH)" />
-    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
+    <env name="GAZEBO_RESOURCE_PATH" value="$(find pr2_ogre):$(find ikea_ogre):$(find gazebo_worlds):$(find gazebo)/gazebo/share/gazebo" />
     <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
   </node>
 


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