Revision: 7869
http://playerstage.svn.sourceforge.net/playerstage/?rev=7869&view=rev
Author: natepak
Date: 2009-06-22 15:54:22 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
Added model namespace to gazebo iface names
Modified Paths:
--------------
code/gazebo/trunk/server/Simulator.cc
code/gazebo/trunk/server/controllers/Controller.cc
Modified: code/gazebo/trunk/server/Simulator.cc
===================================================================
--- code/gazebo/trunk/server/Simulator.cc 2009-06-21 23:15:55 UTC (rev
7868)
+++ code/gazebo/trunk/server/Simulator.cc 2009-06-22 15:54:22 UTC (rev
7869)
@@ -114,11 +114,6 @@
this->physicsThread = NULL;
}
- if (this->mutex)
- {
- delete this->mutex;
- this->mutex = NULL;
- }
}
////////////////////////////////////////////////////////////////////////////////
Modified: code/gazebo/trunk/server/controllers/Controller.cc
===================================================================
--- code/gazebo/trunk/server/controllers/Controller.cc 2009-06-21 23:15:55 UTC
(rev 7868)
+++ code/gazebo/trunk/server/controllers/Controller.cc 2009-06-22 15:54:22 UTC
(rev 7869)
@@ -103,6 +103,16 @@
// Get the name of the iface
std::string ifaceName = childNode->GetString("name","",1);
+ // Constructor the heirarchical name for the iface
+ Entity *p = parent;
+ while (p != NULL)
+ {
+ Model *m = dynamic_cast<Model*>(p);
+ if (m)
+ ifaceName.insert(0, m->GetName()+"::");
+ p = p->GetParent();
+ }
+
try
{
// Use the factory to get a new iface based on the type
@@ -277,4 +287,4 @@
gzthrow(stream.str());
}
return iface;
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
