Revision: 7956
http://playerstage.svn.sourceforge.net/playerstage/?rev=7956&view=rev
Author: natepak
Date: 2009-07-06 13:51:39 +0000 (Mon, 06 Jul 2009)
Log Message:
-----------
Fixed usercamera race condition
Modified Paths:
--------------
code/gazebo/trunk/examples/libgazebo/factory/factory.cc
code/gazebo/trunk/server/GraphicsIfaceHandler.cc
code/gazebo/trunk/server/rendering/UserCamera.cc
Modified: code/gazebo/trunk/examples/libgazebo/factory/factory.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/factory/factory.cc 2009-07-04
00:37:48 UTC (rev 7955)
+++ code/gazebo/trunk/examples/libgazebo/factory/factory.cc 2009-07-06
13:51:39 UTC (rev 7956)
@@ -35,7 +35,7 @@
/// Open the Factory interface
try
{
- factoryIface->Open(client, "factory_iface");
+ factoryIface->Open(client, "default");
}
catch (std::string e)
{
@@ -60,7 +60,7 @@
stream << "<size>0.1</size>";
stream << "<density>1.0</density>";
stream << "<visual>";
- stream << "<size>0.1 0.1 0.1</size>";
+ stream << "<size>0.2 0.2 0.2</size>";
stream << "<material>Gazebo/Rocky</material>";
stream << "<mesh>unit_sphere</mesh>";
stream << "</visual>";
@@ -75,7 +75,7 @@
usleep(1000000);
}
- for (int i=0; i<3; i++)
+ /*for (int i=0; i<3; i++)
{
factoryIface->Lock(1);
if (!strcmp((const char*)factoryIface->data->deleteModel,""))
@@ -90,7 +90,7 @@
factoryIface->Unlock();
usleep(1000000);
- }
+ }*/
return 0;
}
Modified: code/gazebo/trunk/server/GraphicsIfaceHandler.cc
===================================================================
--- code/gazebo/trunk/server/GraphicsIfaceHandler.cc 2009-07-04 00:37:48 UTC
(rev 7955)
+++ code/gazebo/trunk/server/GraphicsIfaceHandler.cc 2009-07-06 13:51:39 UTC
(rev 7956)
@@ -44,6 +44,7 @@
GraphicsIfaceHandler::GraphicsIfaceHandler()
{
this->threeDIface = NULL;
+
}
////////////////////////////////////////////////////////////////////////////////
@@ -69,6 +70,7 @@
this->threeDIface = (Graphics3dIface*)IfaceFactory::NewIface("graphics3d");
this->threeDIface->Create(World::Instance()->GetGzServer(), _name);
+ this->threeDIface->data->cmdCount = 0;
}
catch (std::string err)
{
Modified: code/gazebo/trunk/server/rendering/UserCamera.cc
===================================================================
--- code/gazebo/trunk/server/rendering/UserCamera.cc 2009-07-04 00:37:48 UTC
(rev 7955)
+++ code/gazebo/trunk/server/rendering/UserCamera.cc 2009-07-06 13:51:39 UTC
(rev 7956)
@@ -50,6 +50,8 @@
stream << "UserCamera_" << this->count++;
this->name = stream.str();
+
+ this->viewport = NULL;
}
////////////////////////////////////////////////////////////////////////////////
@@ -126,7 +128,9 @@
{
this->window->resize(w, h);
this->window->windowMovedOrResized();
- this->viewport->setDimensions(0,0,1,1);
+
+ if (this->viewport)
+ this->viewport->setDimensions(0,0,1,1);
}
////////////////////////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
