Revision: 8549
http://playerstage.svn.sourceforge.net/playerstage/?rev=8549&view=rev
Author: natepak
Date: 2010-02-09 01:58:31 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
Fixed a bug when loading trimeshes
Modified Paths:
--------------
code/gazebo/trunk/server/MeshManager.cc
Modified: code/gazebo/trunk/server/MeshManager.cc
===================================================================
--- code/gazebo/trunk/server/MeshManager.cc 2010-02-06 18:32:56 UTC (rev
8548)
+++ code/gazebo/trunk/server/MeshManager.cc 2010-02-09 01:58:31 UTC (rev
8549)
@@ -56,17 +56,21 @@
if (this->HasMesh(filename))
{
- //return this->meshes[filename];
+ return this->meshes[filename];
- // erase mesh from this->meshes. This allows a mesh to be modified and
- // inserted into gazebo again without closing gazebo.
- std::map<std::string, Mesh*>::iterator iter;
- iter = this->meshes.find(filename);
- delete iter->second;
- iter->second = NULL;
- this->meshes.erase(iter);
+ // This breaks trimesh geom. Each new trimesh should have a unique name.
+ /*
+ // erase mesh from this->meshes. This allows a mesh to be modified and
+ // inserted into gazebo again without closing gazebo.
+ std::map<std::string, Mesh*>::iterator iter;
+ iter = this->meshes.find(filename);
+ delete iter->second;
+ iter->second = NULL;
+ this->meshes.erase(iter);
+ */
}
+
fullname = std::string("./")+filename;
if (stat(fullname.c_str(), &st) == 0)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
