Revision: 8773
http://playerstage.svn.sourceforge.net/playerstage/?rev=8773&view=rev
Author: natepak
Date: 2010-06-22 22:37:04 +0000 (Tue, 22 Jun 2010)
Log Message:
-----------
Added more models
Modified Paths:
--------------
code/gazebo/trunk/Media/materials/scripts/Gazebo.material
code/gazebo/trunk/Media/models/CMakeLists.txt
Added Paths:
-----------
code/gazebo/trunk/Media/models/pr2_gripper/
code/gazebo/trunk/Media/models/pr2_gripper/CMakeLists.txt
code/gazebo/trunk/Media/models/pr2_gripper/finger_H_Color_100430.tif
code/gazebo/trunk/Media/models/pr2_gripper/finger_H_UV_100430.dae
code/gazebo/trunk/Media/models/pr2_gripper/finger_tip_H_UV_100430.dae
code/gazebo/trunk/Media/models/pr2_gripper/fingertip_H_Color_100430.tif
code/gazebo/trunk/Media/models/pr2_gripper/float_H_Color_100430.tif
code/gazebo/trunk/Media/models/pr2_gripper/float_H_UV_100430.dae
code/gazebo/trunk/Media/models/pr2_gripper/gripper_palm.dae
code/gazebo/trunk/Media/models/pr2_gripper/gripper_palm_color.tif
code/gazebo/trunk/Media/models/pr2_gripper/gripper_palm_normals.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_finger.dae
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_color.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_normals.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_tip.dae
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_tip_color.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_tip_normals.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_float.dae
code/gazebo/trunk/Media/models/pr2_gripper/l_float_color.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_float_normals.tif
code/gazebo/trunk/Media/models/pr2_gripper/palm_H_Color_100430.tif
code/gazebo/trunk/Media/models/pr2_gripper/palm_H_UV_100430.dae
Removed Paths:
-------------
code/gazebo/trunk/Media/models/pr2_gripper/CMakeLists.txt
code/gazebo/trunk/Media/models/pr2_gripper/finger_H_Color_100430.tif
code/gazebo/trunk/Media/models/pr2_gripper/finger_H_UV_100430.dae
code/gazebo/trunk/Media/models/pr2_gripper/finger_tip_H_UV_100430.dae
code/gazebo/trunk/Media/models/pr2_gripper/fingertip_H_Color_100430.tif
code/gazebo/trunk/Media/models/pr2_gripper/float_H_Color_100430.tif
code/gazebo/trunk/Media/models/pr2_gripper/float_H_UV_100430.dae
code/gazebo/trunk/Media/models/pr2_gripper/gripper_palm.dae
code/gazebo/trunk/Media/models/pr2_gripper/gripper_palm_color.tif
code/gazebo/trunk/Media/models/pr2_gripper/gripper_palm_normals.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_finger.dae
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_color.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_normals.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_tip.dae
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_tip_color.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_finger_tip_normals.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_float.dae
code/gazebo/trunk/Media/models/pr2_gripper/l_float_color.tif
code/gazebo/trunk/Media/models/pr2_gripper/l_float_normals.tif
code/gazebo/trunk/Media/models/pr2_gripper/palm_H_Color_100430.tif
code/gazebo/trunk/Media/models/pr2_gripper/palm_H_UV_100430.dae
Property Changed:
----------------
code/gazebo/trunk/Media/models/pioneer2at/
code/gazebo/trunk/Media/models/pioneer2at/CMakeLists.txt
code/gazebo/trunk/Media/models/pioneer2at/Cylinder.012.mesh.xml
code/gazebo/trunk/Media/models/pioneer2at/OgreXMLConverter.log
code/gazebo/trunk/Media/models/pioneer2at/Scene.material
code/gazebo/trunk/Media/models/pioneer2at/chassis.mesh
code/gazebo/trunk/Media/models/pioneer2at/chassis_top.mesh
code/gazebo/trunk/Media/models/pioneer2at/hub.mesh
code/gazebo/trunk/Media/models/pioneer2at/pioneer3at.blend
code/gazebo/trunk/Media/models/pioneer2at/sonar.mesh
code/gazebo/trunk/Media/models/pioneer2at/sonarbank.mesh
code/gazebo/trunk/Media/models/pioneer2at/tire.mesh
code/gazebo/trunk/Media/models/pioneer2at/wheel.mesh
code/gazebo/trunk/Media/models/pioneer2dx/
code/gazebo/trunk/Media/models/pioneer2dx/CMakeLists.txt
code/gazebo/trunk/Media/models/pioneer2dx/Scene.material
code/gazebo/trunk/Media/models/pioneer2dx/chassis.mesh
code/gazebo/trunk/Media/models/pioneer2dx/chassis_top.mesh
code/gazebo/trunk/Media/models/pioneer2dx/hub.mesh
code/gazebo/trunk/Media/models/pioneer2dx/pioneer3dx.blend
code/gazebo/trunk/Media/models/pioneer2dx/sonar.mesh
code/gazebo/trunk/Media/models/pioneer2dx/sonarbank.mesh
code/gazebo/trunk/Media/models/pioneer2dx/tire.mesh
code/gazebo/trunk/Media/models/pioneer2dx/wheel.mesh
Modified: code/gazebo/trunk/Media/materials/scripts/Gazebo.material
===================================================================
--- code/gazebo/trunk/Media/materials/scripts/Gazebo.material 2010-06-22
22:35:04 UTC (rev 8772)
+++ code/gazebo/trunk/Media/materials/scripts/Gazebo.material 2010-06-22
22:37:04 UTC (rev 8773)
@@ -103,8 +103,6 @@
{
ambient 0.000000 0.000000 0.000000 1.000000
diffuse 0.000000 0.000000 0.000000 1.000000
- specular 0.000000 0.000000 0.000000 1.000000
- emissive 0.000000 0.000000 0.000000 0.000000
lighting on
shading phong
}
Modified: code/gazebo/trunk/Media/models/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/Media/models/CMakeLists.txt 2010-06-22 22:35:04 UTC
(rev 8772)
+++ code/gazebo/trunk/Media/models/CMakeLists.txt 2010-06-22 22:37:04 UTC
(rev 8773)
@@ -6,6 +6,7 @@
add_subdirectory(pioneer2at)
add_subdirectory(sonyvid30)
add_subdirectory(rovio)
+add_subdirectory(pr2_gripper)
set (files column.mesh
geosphere4500.mesh
Property changes on: code/gazebo/trunk/Media/models/pioneer2at
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/federation/gazebo/Media/models/pioneer2at:7371-7550
/code/branches/federation/gazebo/Media/sets/pioneer2at:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/models/pioneer2at:7137-7636
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at:7137-7636
+ /code/branches/federation/gazebo/Media/models/pioneer2at:7371-7550
/code/branches/federation/gazebo/Media/sets/pioneer2at:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/models/pioneer2at:7137-7636
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/CMakeLists.txt
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/CMakeLists.txt:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/CMakeLists.txt:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/CMakeLists.txt:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/CMakeLists.txt:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/CMakeLists.txt:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/CMakeLists.txt:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/CMakeLists.txt:8711-8771
Property changes on:
code/gazebo/trunk/Media/models/pioneer2at/Cylinder.012.mesh.xml
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/Cylinder.012.mesh.xml:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/Cylinder.012.mesh.xml:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/Cylinder.012.mesh.xml:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/Cylinder.012.mesh.xml:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/Cylinder.012.mesh.xml:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/Cylinder.012.mesh.xml:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/Cylinder.012.mesh.xml:8711-8771
Property changes on:
code/gazebo/trunk/Media/models/pioneer2at/OgreXMLConverter.log
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/OgreXMLConverter.log:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/OgreXMLConverter.log:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/OgreXMLConverter.log:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/OgreXMLConverter.log:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/OgreXMLConverter.log:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/OgreXMLConverter.log:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/OgreXMLConverter.log:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/Scene.material
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/Scene.material:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/Scene.material:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/Scene.material:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/Scene.material:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/Scene.material:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/Scene.material:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/Scene.material:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/chassis.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/chassis.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/chassis.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/chassis.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/chassis.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/chassis.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/chassis.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/chassis.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/chassis_top.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/chassis_top.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/chassis_top.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/chassis_top.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/chassis_top.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/chassis_top.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/chassis_top.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/chassis_top.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/hub.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/hub.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/hub.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/hub.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/hub.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/hub.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/hub.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/hub.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/pioneer3at.blend
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/sources/pioneer3at.blend:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/pioneer3at.blend:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/sources/pioneer3at.blend:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/sources/pioneer3at.blend:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/pioneer3at.blend:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/sources/pioneer3at.blend:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/pioneer3at.blend:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/sonar.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/sonar.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/sonar.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/sonar.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/sonar.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/sonar.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/sonar.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/sonar.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/sonarbank.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/sonarbank.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/sonarbank.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/sonarbank.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/sonarbank.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/sonarbank.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/sonarbank.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/sonarbank.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/tire.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/tire.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/tire.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/tire.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/tire.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/tire.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/tire.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/tire.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2at/wheel.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/wheel.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/wheel.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/wheel.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2at/Pioneer2at/wheel.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2at/wheel.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2at/Pioneer2at/wheel.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2at/wheel.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/federation/gazebo/Media/models/pioneer2dx:7371-7550
/code/branches/federation/gazebo/Media/sets/pioneer2dx:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/models/pioneer2dx:7137-7636
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx:7137-7636
+ /code/branches/federation/gazebo/Media/models/pioneer2dx:7371-7550
/code/branches/federation/gazebo/Media/sets/pioneer2dx:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/models/pioneer2dx:7137-7636
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/CMakeLists.txt
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/CMakeLists.txt:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/CMakeLists.txt:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/CMakeLists.txt:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/CMakeLists.txt:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/CMakeLists.txt:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/CMakeLists.txt:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/CMakeLists.txt:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/Scene.material
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/Scene.material:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/Scene.material:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/Scene.material:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/Scene.material:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/Scene.material:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/Scene.material:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/Scene.material:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/chassis.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/chassis.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/chassis.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/chassis.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/chassis.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/chassis.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/chassis.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/chassis.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/chassis_top.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/chassis_top.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/chassis_top.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/chassis_top.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/chassis_top.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/chassis_top.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/chassis_top.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/chassis_top.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/hub.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/hub.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/hub.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/hub.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/hub.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/hub.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/hub.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/hub.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/pioneer3dx.blend
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/sources/pioneer3dx.blend:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/pioneer3dx.blend:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/sources/pioneer3dx.blend:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/sources/pioneer3dx.blend:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/pioneer3dx.blend:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/sources/pioneer3dx.blend:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/pioneer3dx.blend:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/sonar.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/sonar.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/sonar.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/sonar.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/sonar.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/sonar.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/sonar.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/sonar.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/sonarbank.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/sonarbank.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/sonarbank.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/sonarbank.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/sonarbank.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/sonarbank.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/sonarbank.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/sonarbank.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/tire.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/tire.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/tire.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/tire.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/tire.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/tire.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/tire.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/tire.mesh:8711-8771
Property changes on: code/gazebo/trunk/Media/models/pioneer2dx/wheel.mesh
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/wheel.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/wheel.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/wheel.mesh:7137-7636
+
/code/branches/federation/gazebo/Media/sets/pioneer2dx/Pioneer2dx/wheel.mesh:7371-7550
/code/gazebo/branches/bullet2/Media/models/pioneer2dx/wheel.mesh:8281-8355
/code/gazebo/branches/ogre-1.4.9/Media/sets/pioneer2dx/Pioneer2dx/wheel.mesh:7137-7636
/code/gazebo/branches/simpar/Media/models/pioneer2dx/wheel.mesh:8711-8771
Deleted: code/gazebo/trunk/Media/models/pr2_gripper/CMakeLists.txt
===================================================================
--- code/gazebo/branches/simpar/Media/models/pr2_gripper/CMakeLists.txt
2010-06-22 21:45:59 UTC (rev 8771)
+++ code/gazebo/trunk/Media/models/pr2_gripper/CMakeLists.txt 2010-06-22
22:37:04 UTC (rev 8773)
@@ -1,26 +0,0 @@
-SET (files
- finger_H_UV_100430.dae
- finger_tip_H_UV_100430.dae
- float_H_UV_100430.dae
- gripper_palm.dae
- l_finger.dae
- l_finger_tip.dae
- l_float.dae
- palm_H_UV_100430.dae
- finger_H_Color_100430.tif
- fingertip_H_Color_100430.tif
- float_H_Color_100430.tif
- gripper_palm_color.tif
- gripper_palm_normals.tif
- l_finger_color.tif
- l_finger_normals.tif
- l_finger_tip_color.tif
- l_finger_tip_normals.tif
- l_float_color.tif
- l_float_normals.tif
- palm_H_Color_100430.tif
-)
-
-INSTALL(FILES ${files} DESTINATION
${CMAKE_INSTALL_PREFIX}/share/gazebo/Media/models/pr2_gripper)
-
-
Copied: code/gazebo/trunk/Media/models/pr2_gripper/CMakeLists.txt (from rev
8771, code/gazebo/branches/simpar/Media/models/pr2_gripper/CMakeLists.txt)
===================================================================
--- code/gazebo/trunk/Media/models/pr2_gripper/CMakeLists.txt
(rev 0)
+++ code/gazebo/trunk/Media/models/pr2_gripper/CMakeLists.txt 2010-06-22
22:37:04 UTC (rev 8773)
@@ -0,0 +1,26 @@
+SET (files
+ finger_H_UV_100430.dae
+ finger_tip_H_UV_100430.dae
+ float_H_UV_100430.dae
+ gripper_palm.dae
+ l_finger.dae
+ l_finger_tip.dae
+ l_float.dae
+ palm_H_UV_100430.dae
+ finger_H_Color_100430.tif
+ fingertip_H_Color_100430.tif
+ float_H_Color_100430.tif
+ gripper_palm_color.tif
+ gripper_palm_normals.tif
+ l_finger_color.tif
+ l_finger_normals.tif
+ l_finger_tip_color.tif
+ l_finger_tip_normals.tif
+ l_float_color.tif
+ l_float_normals.tif
+ palm_H_Color_100430.tif
+)
+
+INSTALL(FILES ${files} DESTINATION
${CMAKE_INSTALL_PREFIX}/share/gazebo/Media/models/pr2_gripper)
+
+
Deleted: code/gazebo/trunk/Media/models/pr2_gripper/finger_H_Color_100430.tif
===================================================================
(Binary files differ)
Copied: code/gazebo/trunk/Media/models/pr2_gripper/finger_H_Color_100430.tif
(from rev 8771,
code/gazebo/branches/simpar/Media/models/pr2_gripper/finger_H_Color_100430.tif)
===================================================================
(Binary files differ)
Deleted: code/gazebo/trunk/Media/models/pr2_gripper/finger_H_UV_100430.dae
===================================================================
--- code/gazebo/branches/simpar/Media/models/pr2_gripper/finger_H_UV_100430.dae
2010-06-22 21:45:59 UTC (rev 8771)
+++ code/gazebo/trunk/Media/models/pr2_gripper/finger_H_UV_100430.dae
2010-06-22 22:37:04 UTC (rev 8773)
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema"; version="1.4.1">
- <asset>
- <contributor>
- <author>WakiMudi</author>
- <authoring_tool>OpenCOLLADA2009 x64</authoring_tool>
- <comments>
- ColladaMaya export options:
-
bakeTransforms=0;relativePaths=0;copyTextures=0;exportTriangles=0;exportCgfxFileReferences=1;
-
isSampling=0;curveConstrainSampling=0;removeStaticCurves=1;exportPolygonMeshes=1;exportLights=1;
-
exportCameras=1;exportJointsAndSkin=1;exportAnimations=1;exportInvisibleNodes=0;exportDefaultCameras=0;
-
exportTexCoords=1;exportNormals=1;exportNormalsPerVertex=1;exportVertexColors=1;exportVertexColorsPerVertex=1;
-
exportTexTangents=0;exportTangents=0;exportReferencedMaterials=0;exportMaterialsOnly=0;
-
exportXRefs=1;dereferenceXRefs=1;exportCameraAsLookat=0;cameraXFov=0;cameraYFov=1;doublePrecision=0
- </comments>
-
<source_data>file:///C:/Users/WakiMudi/Documents/maya/projects/willow_textures/scenes/finger1c_med2.mb</source_data>
- </contributor>
- <created>2010-04-30T15:45:01</created>
- <modified>2010-04-30T15:45:01</modified>
- <unit name="meter" meter="1"/>
- <up_axis>Y_UP</up_axis>
- </asset>
- <library_materials>
- <material id="finger_proj_tex1" name="finger_proj_tex1">
- <instance_effect url="#finger_proj_tex1-fx"/>
- </material>
- </library_materials>
- <library_effects>
- <effect id="finger_proj_tex1-fx">
- <profile_COMMON>
- <newparam sid="file4-surface">
- <surface type="2D">
- <init_from>file4</init_from>
- </surface>
- </newparam>
- <newparam sid="file4-sampler">
- <sampler2D>
- <source>file4-surface</source>
- </sampler2D>
- </newparam>
- <technique sid="common">
- <lambert>
- <emission>
- <color>0 0 0 1</color>
- </emission>
- <ambient>
- <color>0 0 0 1</color>
- </ambient>
- <diffuse>
- <texture texture="file4-sampler" texcoord="TEX0">
- <extra>
- <technique profile="OpenCOLLADAMaya">
- <blend_mode>NONE</blend_mode>
- </technique>
- </extra>
- </texture>
- </diffuse>
- <transparent opaque="RGB_ZERO">
- <color>0 0 0 1</color>
- </transparent>
- <transparency>
- <float>1</float>
- </transparency>
- </lambert>
- </technique>
- </profile_COMMON>
- </effect>
- </library_effects>
- <library_images>
- <image id="file4" name="file4">
-
<init_from>file:///C:/Users/WakiMudi/Documents/maya/projects/willow_textures/projection1-finger_H_20K.tif</init_from>
- <extra>
- <technique profile="OpenCOLLADAMaya">
- <dgnode_type>kFile</dgnode_type>
- <image_sequence>0</image_sequence>
- <originalMayaNodeId>file4</originalMayaNodeId>
- </technique>
- </extra>
- </image>
- </library_images>
- <library_geometries>
- <geometry id="finger_H_20KShape" name="finger_H_20KShape">
- <mesh>
- <source id="finger_H_20KShape-positions"
name="finger_H_20KShape-positions">
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
