Revision: 8900
http://playerstage.svn.sourceforge.net/playerstage/?rev=8900&view=rev
Author: hsujohnhsu
Date: 2010-09-13 22:28:21 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
switch to using model render/delete mutex for synchrnoized camera. move time
step update to inside of scope of WORLd->Update() mutex call.
Modified Paths:
--------------
code/gazebo/branches/wg/server/Simulator.cc
code/gazebo/branches/wg/server/rendering/OgreAdaptor.cc
Property Changed:
----------------
code/gazebo/branches/wg/
code/gazebo/branches/wg/Media/models/pioneer2at/
code/gazebo/branches/wg/Media/models/pioneer2at/Cylinder.012.mesh.xml
code/gazebo/branches/wg/Media/models/pioneer2at/OgreXMLConverter.log
code/gazebo/branches/wg/Media/models/pioneer2at/Scene.material
code/gazebo/branches/wg/Media/models/pioneer2at/chassis.mesh
code/gazebo/branches/wg/Media/models/pioneer2at/chassis_top.mesh
code/gazebo/branches/wg/Media/models/pioneer2at/hub.mesh
code/gazebo/branches/wg/Media/models/pioneer2at/pioneer3at.blend
code/gazebo/branches/wg/Media/models/pioneer2at/sonar.mesh
code/gazebo/branches/wg/Media/models/pioneer2at/sonarbank.mesh
code/gazebo/branches/wg/Media/models/pioneer2at/tire.mesh
code/gazebo/branches/wg/Media/models/pioneer2at/wheel.mesh
code/gazebo/branches/wg/Media/models/pioneer2dx/
code/gazebo/branches/wg/Media/models/pioneer2dx/Scene.material
code/gazebo/branches/wg/Media/models/pioneer2dx/chassis.mesh
code/gazebo/branches/wg/Media/models/pioneer2dx/chassis_top.mesh
code/gazebo/branches/wg/Media/models/pioneer2dx/hub.mesh
code/gazebo/branches/wg/Media/models/pioneer2dx/pioneer3dx.blend
code/gazebo/branches/wg/Media/models/pioneer2dx/sonar.mesh
code/gazebo/branches/wg/Media/models/pioneer2dx/sonarbank.mesh
code/gazebo/branches/wg/Media/models/pioneer2dx/tire.mesh
code/gazebo/branches/wg/Media/models/pioneer2dx/wheel.mesh
code/gazebo/branches/wg/server/gui/Sidebar.cc
code/gazebo/branches/wg/server/gui/Sidebar.hh
code/gazebo/branches/wg/server/physics/HeightmapShape.cc
code/gazebo/branches/wg/server/physics/HeightmapShape.hh
code/gazebo/branches/wg/server/physics/SurfaceParams.cc
code/gazebo/branches/wg/server/physics/SurfaceParams.hh
code/gazebo/branches/wg/server/physics/TrimeshShape.cc
code/gazebo/branches/wg/server/physics/TrimeshShape.hh
Property changes on: code/gazebo/branches/wg
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/federation/gazebo:7371-7550
/code/gazebo/branches/bullet2:8281-8355
/code/gazebo/branches/ogre-1.4.9:7137-7636
/code/gazebo/trunk:8862-8895
+ /code/branches/federation/gazebo:7371-7550
/code/gazebo/branches/bullet2:8281-8355
/code/gazebo/branches/ogre-1.4.9:7137-7636
/code/gazebo/trunk:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at:8862-8895
+ /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
/code/gazebo/trunk/Media/models/pioneer2at:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/Cylinder.012.mesh.xml:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/Cylinder.012.mesh.xml:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/Cylinder.012.mesh.xml:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/OgreXMLConverter.log:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/OgreXMLConverter.log:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/OgreXMLConverter.log:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/Scene.material:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/Scene.material:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/Scene.material:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/chassis.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/chassis.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/chassis.mesh:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/chassis_top.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/chassis_top.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/chassis_top.mesh:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/hub.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/hub.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/hub.mesh:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/pioneer3at.blend:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/pioneer3at.blend:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/pioneer3at.blend:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/sonar.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/sonar.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/sonar.mesh:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/sonarbank.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/sonarbank.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/sonarbank.mesh:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/tire.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/tire.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/tire.mesh:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2at/wheel.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2at/wheel.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2at/wheel.mesh:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx:8862-8895
+ /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
/code/gazebo/trunk/Media/models/pioneer2dx:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx/Scene.material:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx/Scene.material:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2dx/Scene.material:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx/chassis.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx/chassis.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2dx/chassis.mesh:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx/chassis_top.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx/chassis_top.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2dx/chassis_top.mesh:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx/hub.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx/hub.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2dx/hub.mesh:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx/pioneer3dx.blend:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx/pioneer3dx.blend:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2dx/pioneer3dx.blend:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx/sonar.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx/sonar.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2dx/sonar.mesh:8862-8899
Property changes on:
code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx/sonarbank.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx/sonarbank.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2dx/sonarbank.mesh:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx/tire.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx/tire.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2dx/tire.mesh:8862-8899
Property changes on: code/gazebo/branches/wg/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/gazebo/branches/simpar/Media/models/pioneer2dx/wheel.mesh:8711-8771
/code/gazebo/trunk/Media/models/pioneer2dx/wheel.mesh:8862-8895
+
/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
/code/gazebo/trunk/Media/models/pioneer2dx/wheel.mesh:8862-8899
Modified: code/gazebo/branches/wg/server/Simulator.cc
===================================================================
--- code/gazebo/branches/wg/server/Simulator.cc 2010-09-13 22:21:20 UTC (rev
8899)
+++ code/gazebo/branches/wg/server/Simulator.cc 2010-09-13 22:28:21 UTC (rev
8900)
@@ -500,7 +500,7 @@
/// Set whether the simulation is paused
void Simulator::SetPaused(bool p)
{
- boost::recursive_mutex::scoped_lock lock(*this->GetMRMutex());
+ boost::recursive_mutex::scoped_lock model_render_lock(*this->GetMRMutex());
if (this->pause == p)
return;
@@ -570,7 +570,7 @@
////////////////////////////////////////////////////////////////////////////////
void Simulator::SetStepInc(bool step)
{
- boost::recursive_mutex::scoped_lock lock(*this->GetMRMutex());
+ boost::recursive_mutex::scoped_lock model_render_lock(*this->GetMRMutex());
this->stepInc = step;
this->stepSignal(step);
@@ -686,25 +686,26 @@
{
DIAGNOSTICTIMER(timer("PHYSICS LOOP ",6));
- currTime = this->GetRealTime();
+ {
+ DIAGNOSTICTIMER(timer1("PHYSICS MR MD Mutex and world->Update() ",6));
+ boost::recursive_mutex::scoped_lock
model_render_lock(*this->GetMRMutex());
+ boost::recursive_mutex::scoped_lock
model_delete_lock(*this->GetMDMutex());
- // performance wise, this is not ideal, move this outside of while loop
and use signals and slots.
- Time step = world->GetPhysicsEngine()->GetStepTime();
- userStepped = false;
- if (this->IsPaused())
- this->pauseTime += step;
- else
- this->simTime += step;
+ currTime = this->GetRealTime();
- if (this->GetStepInc())
- userStepped = true;
+ // performance wise, this is not ideal, move this outside of while loop
and use signals and slots.
+ Time step = world->GetPhysicsEngine()->GetStepTime();
+ userStepped = false;
+ if (this->IsPaused())
+ this->pauseTime += step;
+ else
+ this->simTime += step;
- lastTime = this->GetRealTime();
+ if (this->GetStepInc())
+ userStepped = true;
- {
- DIAGNOSTICTIMER(timer1("PHYSICS MR MD Mutex and world->Update() ",6));
- boost::recursive_mutex::scoped_lock lock(*this->GetMRMutex());
- boost::recursive_mutex::scoped_lock
model_delete_lock(*this->GetMDMutex());
+ lastTime = this->GetRealTime();
+
world->Update();
}
Property changes on: code/gazebo/branches/wg/server/gui/Sidebar.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /code/gazebo/branches/simpar/server/gui/Sidebar.cc:8711-8771
/code/gazebo/trunk/server/gui/Sidebar.cc:8862-8895
+ /code/gazebo/branches/simpar/server/gui/Sidebar.cc:8711-8771
/code/gazebo/trunk/server/gui/Sidebar.cc:8862-8899
Property changes on: code/gazebo/branches/wg/server/gui/Sidebar.hh
___________________________________________________________________
Modified: svn:mergeinfo
- /code/gazebo/branches/simpar/server/gui/Sidebar.hh:8711-8771
/code/gazebo/trunk/server/gui/Sidebar.hh:8862-8895
+ /code/gazebo/branches/simpar/server/gui/Sidebar.hh:8711-8771
/code/gazebo/trunk/server/gui/Sidebar.hh:8862-8899
Property changes on: code/gazebo/branches/wg/server/physics/HeightmapShape.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/federation/gazebo/server/physics/HeightmapGeom.cc:7371-7550
/code/gazebo/branches/bullet2/server/physics/HeightmapShape.cc:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/HeightmapGeom.cc:7137-7636
/code/gazebo/branches/simpar/server/physics/HeightmapShape.cc:8711-8771
/code/gazebo/trunk/server/physics/HeightmapShape.cc:8862-8895
+ /code/branches/federation/gazebo/server/physics/HeightmapGeom.cc:7371-7550
/code/gazebo/branches/bullet2/server/physics/HeightmapShape.cc:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/HeightmapGeom.cc:7137-7636
/code/gazebo/branches/simpar/server/physics/HeightmapShape.cc:8711-8771
/code/gazebo/trunk/server/physics/HeightmapShape.cc:8862-8899
Property changes on: code/gazebo/branches/wg/server/physics/HeightmapShape.hh
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/federation/gazebo/server/physics/HeightmapGeom.hh:7371-7550
/code/gazebo/branches/bullet2/server/physics/HeightmapShape.hh:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/HeightmapGeom.hh:7137-7636
/code/gazebo/branches/simpar/server/physics/HeightmapShape.hh:8711-8771
/code/gazebo/trunk/server/physics/HeightmapShape.hh:8862-8895
+ /code/branches/federation/gazebo/server/physics/HeightmapGeom.hh:7371-7550
/code/gazebo/branches/bullet2/server/physics/HeightmapShape.hh:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/HeightmapGeom.hh:7137-7636
/code/gazebo/branches/simpar/server/physics/HeightmapShape.hh:8711-8771
/code/gazebo/trunk/server/physics/HeightmapShape.hh:8862-8899
Property changes on: code/gazebo/branches/wg/server/physics/SurfaceParams.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/federation/gazebo/server/physics/ContactParams.cc:7371-7550
/code/gazebo/branches/bullet2/server/physics/ContactParams.cc:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/ContactParams.cc:7137-7636
/code/gazebo/branches/simpar/server/physics/SurfaceParams.cc:8711-8771
/code/gazebo/trunk/server/physics/SurfaceParams.cc:8862-8895
+ /code/branches/federation/gazebo/server/physics/ContactParams.cc:7371-7550
/code/gazebo/branches/bullet2/server/physics/ContactParams.cc:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/ContactParams.cc:7137-7636
/code/gazebo/branches/simpar/server/physics/SurfaceParams.cc:8711-8771
/code/gazebo/trunk/server/physics/SurfaceParams.cc:8862-8899
Property changes on: code/gazebo/branches/wg/server/physics/SurfaceParams.hh
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/federation/gazebo/server/physics/ContactParams.hh:7371-7550
/code/gazebo/branches/bullet2/server/physics/ContactParams.hh:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/ContactParams.hh:7137-7636
/code/gazebo/branches/simpar/server/physics/SurfaceParams.hh:8711-8771
/code/gazebo/trunk/server/physics/SurfaceParams.hh:8862-8895
+ /code/branches/federation/gazebo/server/physics/ContactParams.hh:7371-7550
/code/gazebo/branches/bullet2/server/physics/ContactParams.hh:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/ContactParams.hh:7137-7636
/code/gazebo/branches/simpar/server/physics/SurfaceParams.hh:8711-8771
/code/gazebo/trunk/server/physics/SurfaceParams.hh:8862-8899
Property changes on: code/gazebo/branches/wg/server/physics/TrimeshShape.cc
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/federation/gazebo/server/physics/TrimeshGeom.cc:7371-7550
/code/gazebo/branches/bullet2/server/physics/TrimeshShape.cc:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/TrimeshGeom.cc:7137-7636
/code/gazebo/branches/simpar/server/physics/TrimeshShape.cc:8711-8771
/code/gazebo/trunk/server/physics/TrimeshShape.cc:8862-8895
+ /code/branches/federation/gazebo/server/physics/TrimeshGeom.cc:7371-7550
/code/gazebo/branches/bullet2/server/physics/TrimeshShape.cc:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/TrimeshGeom.cc:7137-7636
/code/gazebo/branches/simpar/server/physics/TrimeshShape.cc:8711-8771
/code/gazebo/trunk/server/physics/TrimeshShape.cc:8862-8899
Property changes on: code/gazebo/branches/wg/server/physics/TrimeshShape.hh
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/federation/gazebo/server/physics/TrimeshGeom.hh:7371-7550
/code/gazebo/branches/bullet2/server/physics/TrimeshShape.hh:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/TrimeshGeom.hh:7137-7636
/code/gazebo/branches/simpar/server/physics/TrimeshShape.hh:8711-8771
/code/gazebo/trunk/server/physics/TrimeshShape.hh:8862-8895
+ /code/branches/federation/gazebo/server/physics/TrimeshGeom.hh:7371-7550
/code/gazebo/branches/bullet2/server/physics/TrimeshShape.hh:8281-8355
/code/gazebo/branches/ogre-1.4.9/server/physics/TrimeshGeom.hh:7137-7636
/code/gazebo/branches/simpar/server/physics/TrimeshShape.hh:8711-8771
/code/gazebo/trunk/server/physics/TrimeshShape.hh:8862-8899
Modified: code/gazebo/branches/wg/server/rendering/OgreAdaptor.cc
===================================================================
--- code/gazebo/branches/wg/server/rendering/OgreAdaptor.cc 2010-09-13
22:21:20 UTC (rev 8899)
+++ code/gazebo/branches/wg/server/rendering/OgreAdaptor.cc 2010-09-13
22:28:21 UTC (rev 8900)
@@ -52,8 +52,6 @@
#include "OgreCreator.hh"
#include "RTShaderSystem.hh"
#include "OgreAdaptor.hh"
-#include "World.hh"
-#include "PhysicsEngine.hh"
#include "Timer.hh"
@@ -473,20 +471,16 @@
OgreCreator::Instance()->Update();
this->root->_fireFrameStarted();
- // Draw all the non-user cameras
+ // Draw all the non-user cameras within the same sim time step
{
DIAGNOSTICTIMER(timer("UpdateCameras: Non-UserCamera update",6));
- //boost::recursive_mutex::scoped_lock
mr_lock(*Simulator::Instance()->GetMRMutex());
- //boost::recursive_mutex::scoped_lock
md_lock(*Simulator::Instance()->GetMDMutex());
- //printf("locking physics\n");
- World::Instance()->GetPhysicsEngine()->LockMutex();
+ boost::recursive_mutex::scoped_lock
model_render_lock(*Simulator::Instance()->GetMRMutex());
+ boost::recursive_mutex::scoped_lock
model_delete_lock(*Simulator::Instance()->GetMDMutex());
for (iter = this->cameras.begin(); iter != this->cameras.end(); iter++)
{
if (dynamic_cast<UserCamera*>((*iter)) == NULL)
(*iter)->Render();
}
- //printf("unlocking physics\n");
- World::Instance()->GetPhysicsEngine()->UnlockMutex();
}
// Must update the user camera's last.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
