Revision: 7860
http://playerstage.svn.sourceforge.net/playerstage/?rev=7860&view=rev
Author: robotos
Date: 2009-06-19 07:12:55 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
disallow trimesh and cameras on non rendering engine setups
Modified Paths:
--------------
code/gazebo/trunk/server/physics/TrimeshGeom.cc
code/gazebo/trunk/server/rendering/OgreCamera.cc
Modified: code/gazebo/trunk/server/physics/TrimeshGeom.cc
===================================================================
--- code/gazebo/trunk/server/physics/TrimeshGeom.cc 2009-06-18 15:24:34 UTC
(rev 7859)
+++ code/gazebo/trunk/server/physics/TrimeshGeom.cc 2009-06-19 07:12:55 UTC
(rev 7860)
@@ -117,6 +117,9 @@
this->meshNameP->Load(node);
this->scaleP->Load(node);
+
+ if (!Simulator::Instance()->GetRenderEngineEnabled())
+ gzthrow("Trimesh objects are not supported when running Gazebo without
rendering engine");
mesh =
Ogre::MeshManager::getSingleton().load(this->meshNameP->GetValue(),Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
Modified: code/gazebo/trunk/server/rendering/OgreCamera.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreCamera.cc 2009-06-18 15:24:34 UTC
(rev 7859)
+++ code/gazebo/trunk/server/rendering/OgreCamera.cc 2009-06-19 07:12:55 UTC
(rev 7860)
@@ -107,6 +107,9 @@
void OgreCamera::LoadCam( XMLConfigNode *node )
{
+ if (!Simulator::Instance()->GetRenderEngineEnabled())
+ gzthrow("Cameras can not be used when running Gazebo without rendering
engine");
+
this->visibilityMask = GZ_ALL_CAMERA;
if (node)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
