[Playerstage-commit] SF.net SVN: playerstage:[7196] code/gazebo/trunk/server

[natepak]

Revision: 7196
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7196&view=rev
Author:   natepak
Date:     2008-12-08 23:33:35 +0000 (Mon, 08 Dec 2008)

Log Message:
-----------
Fixed seg fault on quit, and removed some printfs

Modified Paths:
--------------
    code/gazebo/trunk/server/controllers/Controller.cc
    code/gazebo/trunk/server/rendering/OgreCreator.cc
    code/gazebo/trunk/server/rendering/OgreVisual.cc
    code/gazebo/trunk/server/sensors/camera/StereoCameraSensor.cc

Modified: code/gazebo/trunk/server/controllers/Controller.cc
===================================================================
--- code/gazebo/trunk/server/controllers/Controller.cc  2008-12-08 06:42:11 UTC 
(rev 7195)
+++ code/gazebo/trunk/server/controllers/Controller.cc  2008-12-08 23:33:35 UTC 
(rev 7196)
@@ -82,14 +82,6 @@
 
   childNode = node->GetChildByNSPrefix("interface");
   
-  Entity * test = this->parent;
-  while(test->GetParent()!=NULL)
-  {
-       test = test->GetParent();
-  }
-  
-  
-
   // Create the interfaces
   while (childNode)
   {
@@ -116,9 +108,6 @@
       continue;
     }
     
-    
-    ifaceName = test->GetName()+"-" + ifaceName;
-
     // Create the iface
     try
     {

Modified: code/gazebo/trunk/server/rendering/OgreCreator.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreCreator.cc   2008-12-08 06:42:11 UTC 
(rev 7195)
+++ code/gazebo/trunk/server/rendering/OgreCreator.cc   2008-12-08 23:33:35 UTC 
(rev 7196)
@@ -587,7 +587,14 @@
   std::ostringstream stream;
   stream << "OgreWindow(" << windowCounter++ << ")";
 
-  window = OgreAdaptor::Instance()->root->createRenderWindow( stream.str(), 
width, height, false, &params);
+  try
+  {
+    window = OgreAdaptor::Instance()->root->createRenderWindow( stream.str(), 
width, height, false, &params);
+  }
+  catch (...)
+  {
+    gzerr(0) << " Unable to create the rendering window\n";
+  }
 
   window->setActive(true);
   window->setAutoUpdated(true);

Modified: code/gazebo/trunk/server/rendering/OgreVisual.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreVisual.cc    2008-12-08 06:42:11 UTC 
(rev 7195)
+++ code/gazebo/trunk/server/rendering/OgreVisual.cc    2008-12-08 23:33:35 UTC 
(rev 7196)
@@ -96,10 +96,15 @@
   delete this->materialNameP;
   delete this->castShadowsP;
 
-  if (this->parentNode)
-    this->parentNode->removeChild( this->sceneNode );
+  // Having this chunk of code causes a segfault when closing the
+  // application.
+  /*if (this->parentNode && this->sceneNode)
+  {
+   this->parentNode->removeChild( this->sceneNode );
+  }
 
   this->sceneNode->removeAndDestroyAllChildren();
+  */
 
   if (this->sceneNode)
     OgreAdaptor::Instance()->sceneMgr->destroySceneNode(this->sceneNode);

Modified: code/gazebo/trunk/server/sensors/camera/StereoCameraSensor.cc
===================================================================
--- code/gazebo/trunk/server/sensors/camera/StereoCameraSensor.cc       
2008-12-08 06:42:11 UTC (rev 7195)
+++ code/gazebo/trunk/server/sensors/camera/StereoCameraSensor.cc       
2008-12-08 23:33:35 UTC (rev 7196)
@@ -181,7 +181,7 @@
   this->rgbBuffer[1] = new unsigned char[this->rgbBufferSize];
 
   // Uncomment this section to create a debug overaly
-  /*{
+  {
     Ogre::Overlay *overlay = 
Ogre::OverlayManager::getSingletonPtr()->create("__GAZEBO_STEREO_DEBUG_OVERLAY__");
 
     Ogre::OverlayContainer *overlayPanel = 
(Ogre::OverlayContainer*)(Ogre::OverlayManager::getSingletonPtr()->createOverlayElement("Panel",
 "__GAZEBO_PANEL"));
@@ -192,7 +192,7 @@
     overlay->add2D(overlayPanel);
 
     overlay->show();
-  }*/
+  }
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -365,12 +365,6 @@
             this->imageSizeP->GetValue().y,
             1, PF_FLOAT, this->depthBuffer[i-2])
           );
-
-      for (int i=0; i < this->depthBufferSize; i++)
-      {
-        printf("%f ",this->depthBuffer[i]);
-      }
-      printf("\n");
     }
 
     hardwareBuffer->unlock();


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit