Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[16385] pkg/trunk
|
From: <hsu...@us...> - 2009-05-29 19:39:42
|
Revision: 16385
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=16385&view=rev
Author: hsujohnhsu
Date: 2009-05-29 19:39:10 +0000 (Fri, 29 May 2009)
Log Message:
-----------
Merging from branch:
svn merge -r 15821:15839 https://personalrobots.svn.sf.net/svnroot/personalrobots/pkg/branches/gazebo-branch-merge .
Modified Paths:
--------------
pkg/trunk/demos/door_demos_gazebo/door_defs/door_defs.xml
pkg/trunk/robot_descriptions/gazebo_robot_description/Media/materials/scripts/pr2.material
pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/empty.world
pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/simple.world
pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/wg.world
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/arm_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/arm_grav_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/base_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/body_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/gripper_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/head_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/mono_cam_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/prosilica_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/ptz_defs.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/l_arm.xacro.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/l_gripper.xacro.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_arm.xacro.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_forearm_gripper.xacro.xml
pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_gripper.xacro.xml
pkg/trunk/visualization_core/ogre_tools/CMakeLists.txt
Property Changed:
----------------
pkg/trunk/
pkg/trunk/robot_descriptions/gazebo_robot_description/Media/
pkg/trunk/visualization/
pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
pkg/trunk/visualization_core/ogre_tools/
pkg/trunk/visualization_core/ogre_tools/media/
pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh/
pkg/trunk/visualization_core/ogre_tools/test/
Property changes on: pkg/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820
+ /pkg/branches/gazebo-branch-merge:15739-15794,15797-15820,15822-15839
Modified: pkg/trunk/demos/door_demos_gazebo/door_defs/door_defs.xml
===================================================================
--- pkg/trunk/demos/door_demos_gazebo/door_defs/door_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/demos/door_demos_gazebo/door_defs/door_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -101,7 +101,7 @@
<visual>
<origin xyz="0 5 1" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/GrassFloor" />
+ <elem key="material" value="PR2/White" />
</map>
<geometry name="wall1_visual_geom">
<mesh scale="0.4 10 2" />
@@ -135,7 +135,7 @@
<visual>
<origin xyz="0 -5 1" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/GrassFloor" />
+ <elem key="material" value="PR2/White" />
</map>
<geometry name="wall2_visual_geom">
<mesh scale="0.4 10 2" />
Property changes on: pkg/trunk/robot_descriptions/gazebo_robot_description/Media
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820
+ /pkg/branches/gazebo-branch-merge/robot_descriptions/gazebo_robot_description/Media:15797-15820,15822-15839
Modified: pkg/trunk/robot_descriptions/gazebo_robot_description/Media/materials/scripts/pr2.material
===================================================================
--- pkg/trunk/robot_descriptions/gazebo_robot_description/Media/materials/scripts/pr2.material 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/gazebo_robot_description/Media/materials/scripts/pr2.material 2009-05-29 19:39:10 UTC (rev 16385)
@@ -172,47 +172,149 @@
material PR2/Shiny
{
- technique
- {
- pass
- {
- ambient 0.75 0.75 0.75
- texture_unit
- {
- texture Chrome.jpg
- env_map spherical
- }
- }
- }
+ 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
- }
- }
- }
+ technique
+ {
+ pass
+ {
+ texture_unit
+ {
+ texture plug_texture.jpg
+ }
+ }
+ }
}
material PR2/White
{
- technique
- {
- pass Ambient
- {
- ambient 1.000000 1.000000 1.000000 1.000000
- }
- pass PointLight
- {
- ambient 1.000000 1.000000 1.000000 1.000000
- }
+ technique
+ {
+ pass
+ {
+ ambient 0.8 0.8 0.8 1.0
+ diffuse 1.0 1.0 1.0 1.0
+ shading gouraud
+ lighting on
+ }
+ }
+}
- }
+
+
+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
+
+ technique
+ {
+ pass
+ {
+ ambient 0.1 0.1 0.1 1.0
+ diffuse 0.9 0.9 0.9 1.0
+ specular 0.9 0.9 0.9 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
+ }
+ }
+}
+
Modified: pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/empty.world
===================================================================
--- pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/empty.world 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/empty.world 2009-05-29 19:39:10 UTC (rev 16385)
@@ -115,7 +115,6 @@
<!-- White Directional light -->
- <!--
<model:renderable name="directional_white">
<light>
<type>directional</type>
@@ -125,6 +124,7 @@
<attenuation>1 0.0 1.0 0.4</attenuation>
</light>
</model:renderable>
+ <!--
-->
Modified: pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/simple.world
===================================================================
--- pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/simple.world 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/simple.world 2009-05-29 19:39:10 UTC (rev 16385)
@@ -248,7 +248,6 @@
</model:empty>
<!-- White Directional light -->
- <!--
<model:renderable name="directional_white">
<light>
<type>directional</type>
@@ -258,6 +257,7 @@
<attenuation>1 0.0 1.0 0.4</attenuation>
</light>
</model:renderable>
+ <!--
-->
Modified: pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/wg.world
===================================================================
--- pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/wg.world 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/gazebo_robot_description/gazebo_worlds/wg.world 2009-05-29 19:39:10 UTC (rev 16385)
@@ -139,7 +139,6 @@
</model:empty>
<!-- White Directional light -->
- <!--
<model:renderable name="directional_white">
<light>
<type>directional</type>
@@ -149,6 +148,7 @@
<attenuation>1 0.0 1.0 0.4</attenuation>
</light>
</model:renderable>
+ <!--
-->
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/arm_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/arm_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/arm_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -64,7 +64,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${side}_shoulder_pan_visual">
<mesh filename="shoulder_yaw" />
@@ -134,7 +134,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Grey" />
+ <elem key="material" value="PR2/Grey" />
</map>
<geometry name="${side}_shoulder_lift_visual">
<mesh filename="shoulder_lift" />
@@ -205,7 +205,7 @@
<visual> <!-- TODO: This component doesn't actually have a mesh -->
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Fish" />
+ <elem key="material" value="PR2/Yellow" />
</map>
<geometry name="${side}_upper_arm_roll_visual">
<mesh filename="upper_arm_roll" scale="1 1 1" />
@@ -259,7 +259,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${side}_upper_arm_visual">
<mesh filename="upper_arm" />
@@ -326,7 +326,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Grey" />
+ <elem key="material" value="PR2/Grey" />
</map>
<geometry name="${side}_elbow_flex_visual">
<mesh filename="elbow_flex" />
@@ -436,7 +436,7 @@
<visual><!-- TODO: need a mesh for this -->
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Fish" />
+ <elem key="material" value="PR2/Yellow" />
</map>
<geometry name="${side}_forearm_roll_visual">
<mesh filename="forearm_roll" scale="1 1 1" />
@@ -481,7 +481,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${side}_forearm_visual">
<mesh filename="forearm" />
@@ -544,7 +544,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Grey" />
+ <elem key="material" value="PR2/Grey" />
</map>
<geometry name="${side}_wrist_flex_visual">
<mesh filename="wrist_flex" />
@@ -604,7 +604,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Fish" />
+ <elem key="material" value="PR2/Yellow" />
</map>
<geometry name="${side}_wrist_roll_visual">
<mesh filename="wrist_roll" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/arm_grav_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/arm_grav_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/arm_grav_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -46,7 +46,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/Blue</elem>
+ <elem key="material">PR2/Blue</elem>
</map>
<geometry name="${side}_shoulder_pan_visual">
<mesh filename="shoulder_yaw" />
@@ -110,7 +110,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/Grey</elem>
+ <elem key="material">PR2/Grey</elem>
</map>
<geometry name="${side}_shoulder_lift_visual">
<mesh filename="shoulder_lift" />
@@ -177,7 +177,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/Green</elem>
+ <elem key="material">PR2/Green</elem>
</map>
<geometry name="${side}_upper_arm_roll_visual">
<mesh filename="upper_arm" />
@@ -245,7 +245,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/Grey</elem>
+ <elem key="material">PR2/Grey</elem>
</map>
<geometry name="${side}_elbow_flex_visual">
<mesh filename="elbow_flex" />
@@ -358,7 +358,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/Blue</elem>
+ <elem key="material">PR2/Blue</elem>
</map>
<geometry name="${side}_forearm_roll_visual">
<mesh filename="forearm" />
@@ -423,7 +423,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/Grey</elem>
+ <elem key="material">PR2/Grey</elem>
</map>
<geometry name="${side}_wrist_flex_visual">
<mesh filename="wrist_flex" />
@@ -479,7 +479,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/Red</elem>
+ <elem key="material">PR2/Red</elem>
</map>
<geometry name="${side}_wrist_roll_visual">
<mesh filename="wrist_roll" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/base_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/base_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/base_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -99,7 +99,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${suffix}_caster_rotation_visual">
<mesh filename="caster" scale="1 1 1"/>
@@ -216,7 +216,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${suffix}_caster_rotation_visual">
<mesh filename="caster" scale="1 1 1"/>
@@ -262,7 +262,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${name}_visual">
<mesh filename="base" />
@@ -311,7 +311,7 @@
<visual>
<origin xyz="0 0 0.0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/PioneerBody" />
+ <elem key="material" value="PR2/Red" />
</map>
<geometry name="base_laser_visual">
<mesh scale="0.001 0.001 0.001"/>
@@ -413,7 +413,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${name}_visual">
<mesh filename="base" />
@@ -462,7 +462,7 @@
<visual>
<origin xyz="0 0 0.0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/PioneerBody" />
+ <elem key="material" value="PR2/Red" />
</map>
<geometry name="base_laser_visual">
<mesh scale="0.001 0.001 0.001"/>
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/body_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/body_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/body_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -35,8 +35,8 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
- <map name="foo" flag="gazebo">
- <elem key="material" value="Gazebo/Red" />
+ <map name="gazebo_material" flag="gazebo">
+ <elem key="material" value="PR2/Grey2" />
</map>
<geometry name="${name}_visual">
<mesh filename="torso" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/gripper_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/gripper_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/gripper_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -75,7 +75,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Shell" />
+ <elem key="material" value="PR2/Grey" />
</map>
<geometry name="${prefix}_l_finger_visual">
<mesh filename="upper_finger_l" />
@@ -157,7 +157,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Shell" />
+ <elem key="material" value="PR2/Grey" />
</map>
<geometry name="${prefix}_r_finger_visual">
<mesh filename="upper_finger_r" />
@@ -236,7 +236,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${prefix}_l_finger_tip_visual">
<mesh filename="finger_tip_l" />
@@ -316,7 +316,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${prefix}_r_finger_tip_visual">
<mesh filename="finger_tip_r" />
@@ -464,7 +464,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Red" />
+ <elem key="material" value="PR2/Red" />
</map>
<geometry name="${side}_gripper_palm_visual">
<mesh filename="gripper_palm" />
@@ -532,7 +532,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Shell" />
+ <elem key="material" value="PR2/Grey" />
</map>
<geometry name="${side}_gripper_tool_visual">
<mesh scale="0.0 0.0 0.0" />
@@ -633,7 +633,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Red" />
+ <elem key="material" value="PR2/Red" />
</map>
<geometry name="${side}_gripper_palm_visual">
<mesh filename="gripper_palm" />
@@ -701,7 +701,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Shell" />
+ <elem key="material" value="PR2/Grey" />
</map>
<geometry name="${side}_gripper_tool_visual">
<mesh scale="0.0 0.0 0.0" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/head_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/head_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/head_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -33,7 +33,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/PioneerBody" />
+ <elem key="material" value="PR2/Red" />
</map>
<geometry name="${name}_mount_visual">
<mesh filename="hok_tilt" />
@@ -146,7 +146,7 @@
<visual>
<origin xyz="${stereo_center_box_center_offset_x} 0 ${stereo_center_box_center_offset_z}" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_visual">
<mesh scale="${stereo_size_x} ${stereo_size_y} ${stereo_size_z}" />
@@ -181,7 +181,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_optical_fixed_visual">
<mesh scale="0.01 0.01 0.01" />
@@ -214,7 +214,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_r_stereo_camera_visual">
<mesh scale="0.01 0.01 0.01" />
@@ -267,7 +267,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_r_stereo_camera_visual">
<mesh scale="0.01 0.01 0.01" />
@@ -365,7 +365,7 @@
<visual>
<origin xyz="0 0 0.0" rpy="0 0 0 " />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_visual">
<mesh filename="head_pan" />
@@ -415,7 +415,7 @@
<visual>
<origin xyz="0 0 0" rpy="0.0 0.0 0.0 " />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${name}_visual">
<mesh filename="head_tilt" />
@@ -460,7 +460,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_plate_frame_visual">
<mesh scale="0.01 0.01 0.01" />
@@ -507,7 +507,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/PioneerBody" />
+ <elem key="material" value="PR2/Red" />
</map>
<geometry name="${name}_mount_visual">
<mesh filename="hok_tilt" />
@@ -624,7 +624,7 @@
<visual>
<origin xyz="0 0 0.0" rpy="0 0 0 " />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_visual">
<mesh filename="head_pan" />
@@ -673,7 +673,7 @@
<visual>
<origin xyz="0 0 0" rpy="0.0 0.0 0.0 " />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${name}_visual">
<mesh filename="head_tilt" />
@@ -721,7 +721,7 @@
<visual>
<origin xyz="0 0 0" rpy="0.0 0.0 0.0 " />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${name}_visual">
<mesh filename="head_tilt" />
@@ -768,7 +768,7 @@
<visual>
<origin xyz="0 0 0" rpy="0.0 0.0 0.0 " />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Green" />
+ <elem key="material" value="PR2/Green" />
</map>
<geometry name="${name}_visual">
<mesh filename="head_tilt" />
@@ -812,7 +812,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_plate_frame_visual">
<mesh scale="0.01 0.01 0.01" />
@@ -859,7 +859,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_plate_frame_visual">
<mesh scale="0.01 0.01 0.01" />
@@ -904,7 +904,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_plate_frame_visual">
<mesh scale="0.01 0.01 0.01" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/mono_cam_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/mono_cam_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/mono_cam_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -20,7 +20,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_visual">
<mesh scale="0.01 0.01 0.01" />
@@ -53,7 +53,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0"/>
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_optical_visual">
<mesh scale="0.01 0.01 0.01" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/prosilica_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/prosilica_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/prosilica_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -21,7 +21,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_visual">
<mesh scale="0.01 0.01 0.01" />
@@ -78,7 +78,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0"/>
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${name}_optical_visual">
<mesh scale="0.01 0.01 0.01" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/ptz_defs.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/ptz_defs.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/defs/ptz_defs.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -30,7 +30,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="gazebo_material" flag="gazebo">
- <elem key="material" value="Gazebo/Blue" />
+ <elem key="material" value="PR2/Blue" />
</map>
<geometry name="${side}_ptz_pan_visual">
<mesh filename="ptz_base_${side}" />
@@ -68,7 +68,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0" />
<map name="foo" flag="gazebo">
- <elem key="material" value="Gazebo/Red" />
+ <elem key="material" value="PR2/Red" />
</map>
<geometry name="${side}_ptz_tilt_visual">
<mesh filename="ptz_top_${side}" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/l_arm.xacro.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/l_arm.xacro.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/l_arm.xacro.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -42,7 +42,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0 " />
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/White</elem>
+ <elem key="material">PR2/White</elem>
</map>
<geometry name="pr2_base_mesh_file">
<mesh scale="20 20 0.01" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/l_gripper.xacro.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/l_gripper.xacro.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/l_gripper.xacro.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -39,7 +39,7 @@
<origin xyz="0 0 -1" rpy="0 0 0 " /> <!-- location defined with respect to the link origin in a local coordinate frame -->
<!-- All angles always in radians, yaw about Z axis, pitch about the Y axis and roll about the X axis -->
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/White</elem>
+ <elem key="material">PR2/White</elem>
</map>
<geometry name="pr2_base_mesh_file">
<mesh scale="20 20 0.01" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_arm.xacro.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_arm.xacro.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_arm.xacro.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -42,7 +42,7 @@
<visual>
<origin xyz="0 0 0" rpy="0 0 0 " />
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/White</elem>
+ <elem key="material">PR2/White</elem>
</map>
<geometry name="pr2_base_mesh_file">
<mesh scale="20 20 0.01" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_forearm_gripper.xacro.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_forearm_gripper.xacro.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_forearm_gripper.xacro.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -41,7 +41,7 @@
<origin xyz="0 0 -1" rpy="0 0 0 " /> <!-- location defined with respect to the link origin in a local coordinate frame -->
<!-- All angles always in radians, yaw about Z axis, pitch about the Y axis and roll about the X axis -->
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/White</elem>
+ <elem key="material">PR2/White</elem>
</map>
<geometry name="pr2_base_mesh_file">
<mesh scale="20 20 0.01" />
Modified: pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_gripper.xacro.xml
===================================================================
--- pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_gripper.xacro.xml 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/robot_descriptions/pr2/pr2_defs/robots/r_gripper.xacro.xml 2009-05-29 19:39:10 UTC (rev 16385)
@@ -39,7 +39,7 @@
<origin xyz="0 0 -1" rpy="0 0 0 " /> <!-- location defined with respect to the link origin in a local coordinate frame -->
<!-- All angles always in radians, yaw about Z axis, pitch about the Y axis and roll about the X axis -->
<map name="gazebo_material" flag="gazebo">
- <elem key="material">Gazebo/White</elem>
+ <elem key="material">PR2/White</elem>
</map>
<geometry name="pr2_base_mesh_file">
<mesh scale="20 20 0.01" />
Property changes on: pkg/trunk/visualization
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428
+ /pkg/branches/gazebo-branch-merge/visualization:15739-15794,15797-15820,15822-15839
/pkg/branches/josh/rviz_selection:12152-13640
/pkg/branches/josh/visualization_scratch:14041-14428
Property changes on: pkg/trunk/visualization/rviz/src/rviz/generated/rviz_generated.i
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/generated/rviz_generated.i:15739-15794,15797-15820,15822-15839
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/generated/rviz_generated.i:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/generated/visualization_panel_generated.i:12189
Property changes on: pkg/trunk/visualization/rviz/src/rviz/properties/forwards.h
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/properties/forwards.h:15739-15794,15797-15820,15822-15839
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/properties/forwards.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/properties/property_forwards.h:12189,12408-12643,12667
Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.cpp:15739-15794,15797-15820,15822-15839
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.cpp:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.cpp:497-13654
Property changes on: pkg/trunk/visualization/rviz/src/rviz/robot/robot.h
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654
+ /pkg/branches/gazebo-branch-merge/visualization/rviz/src/rviz/robot/robot.h:15739-15794,15797-15820,15822-15839
/pkg/branches/josh/visualization_scratch/rviz/src/rviz/robot/robot.h:14041-14428
/pkg/trunk/visualization/rviz/src/rviz/robot/robot.h:497-13654
Property changes on: pkg/trunk/visualization_core/ogre_tools
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools:15739-15794,15797-15820,15822-15839
/pkg/branches/josh/visualization_scratch/ogre_tools:14041-14418
Modified: pkg/trunk/visualization_core/ogre_tools/CMakeLists.txt
===================================================================
--- pkg/trunk/visualization_core/ogre_tools/CMakeLists.txt 2009-05-29 19:34:22 UTC (rev 16384)
+++ pkg/trunk/visualization_core/ogre_tools/CMakeLists.txt 2009-05-29 19:39:10 UTC (rev 16385)
@@ -28,15 +28,15 @@
# The versioned check apparently doesn't work. So we'll check the version
# manually
-pkg_check_modules(OGRE OGRE=1.4.9)
-if(OGRE_VERSION STREQUAL "1.4.9")
+pkg_check_modules(OGRE OGRE=1.6)
+if(OGRE_VERSION STREQUAL "1.6")
include_directories( ${OGRE_INCLUDE_DIRS} )
link_directories( ${OGRE_LIBRARY_DIRS} )
message("Found OGRE: ${OGRE_VERSION}")
add_definitions("-DHAS_INSTALLED_OGRE")
-else(OGRE_VERSION STREQUAL "1.4.9")
- message("Didn't find OGRE 1.4.9")
-endif(OGRE_VERSION STREQUAL "1.4.9")
+else(OGRE_VERSION STREQUAL "1.6")
+ message("Didn't find OGRE 1.6")
+endif(OGRE_VERSION STREQUAL "1.6")
# We need GTK2 and OpenGL for the wx render window
pkg_check_modules(GTK2 gtk+-2.0)
Property changes on: pkg/trunk/visualization_core/ogre_tools/media
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/media:15739-15794,15797-15820,15822-15839
/pkg/branches/josh/visualization_scratch/ogre_tools/media:14041-14418
/pkg/trunk/visualization/ogre_tools/media:2217-8463
Property changes on: pkg/trunk/visualization_core/ogre_tools/src/stl_to_mesh
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/src/stl_to_mesh:15739-15794,15797-15820,15822-15839
/pkg/branches/josh/visualization_scratch/ogre_tools/src/stl_to_mesh:14041-14418
/pkg/trunk/visualization/ogre_tools/src/stl_to_mesh:2217-2818
Property changes on: pkg/trunk/visualization_core/ogre_tools/test
___________________________________________________________________
Modified: svn:mergeinfo
- /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599
+ /pkg/branches/gazebo-branch-merge/visualization_core/ogre_tools/test:15739-15794,15797-15820,15822-15839
/pkg/branches/josh/visualization_scratch/ogre_tools/test:14041-14418
/pkg/trunk/visualization/ogre_tools/test:2217-3599
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
