Revision: 8688
http://playerstage.svn.sourceforge.net/playerstage/?rev=8688&view=rev
Author: natepak
Date: 2010-05-18 16:33:08 +0000 (Tue, 18 May 2010)
Log Message:
-----------
Fixed a few bugs, and add in ability to see joint frames
Modified Paths:
--------------
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/server/Simulator.cc
code/gazebo/trunk/server/main.cc
code/gazebo/trunk/server/physics/Body.cc
code/gazebo/trunk/server/physics/Geom.cc
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-05-17 20:11:41 UTC
(rev 8687)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-05-18 16:33:08 UTC
(rev 8688)
@@ -280,7 +280,7 @@
SET(Boost_ADDITIONAL_VERSIONS "1.35" "1.35.0" "1.36" "1.36.1" "1.37.0"
"1.39.0" CACHE INTERNAL "Boost Additional versions" FORCE)
INCLUDE (FindBoost)
- FIND_PACKAGE( Boost ${MIN_BOOST_VERSION} REQUIRED thread signals )
+ FIND_PACKAGE( Boost ${MIN_BOOST_VERSION} REQUIRED thread signals regex)
IF (NOT Boost_FOUND)
SET (BUILD_GAZEBO OFF CACHE INTERNAL "Build Gazebo" FORCE)
Modified: code/gazebo/trunk/server/Simulator.cc
===================================================================
--- code/gazebo/trunk/server/Simulator.cc 2010-05-17 20:11:41 UTC (rev
8687)
+++ code/gazebo/trunk/server/Simulator.cc 2010-05-18 16:33:08 UTC (rev
8688)
@@ -232,7 +232,10 @@
if (rootNode)
childNode = rootNode->GetChild("gui");
- int width, height, x, y;
+ int width=0;
+ int height=0;
+ int x = 0;
+ int y = 0;
if (childNode)
{
Modified: code/gazebo/trunk/server/main.cc
===================================================================
--- code/gazebo/trunk/server/main.cc 2010-05-17 20:11:41 UTC (rev 8687)
+++ code/gazebo/trunk/server/main.cc 2010-05-18 16:33:08 UTC (rev 8688)
@@ -232,8 +232,10 @@
}*/
// Get the world file name
- if (argc > 1)
+ if (argc >= 1)
worldFileName = argv[0];
+
+ std::cout << "WORLD IFLENAME{" << worldFileName << "]\n";
return 0;
}
Modified: code/gazebo/trunk/server/physics/Body.cc
===================================================================
--- code/gazebo/trunk/server/physics/Body.cc 2010-05-17 20:11:41 UTC (rev
8687)
+++ code/gazebo/trunk/server/physics/Body.cc 2010-05-18 16:33:08 UTC (rev
8688)
@@ -387,7 +387,7 @@
this->cgVisual->AttachMesh("body_cg");
this->cgVisual->SetMaterial("Gazebo/Red");
this->cgVisual->SetCastShadows(false);
- //this->cgVisual->AttachAxes();
+ this->cgVisual->AttachAxes();
std::map< std::string, Geom* >::iterator giter;
Modified: code/gazebo/trunk/server/physics/Geom.cc
===================================================================
--- code/gazebo/trunk/server/physics/Geom.cc 2010-05-17 20:11:41 UTC (rev
8687)
+++ code/gazebo/trunk/server/physics/Geom.cc 2010-05-18 16:33:08 UTC (rev
8688)
@@ -80,6 +80,7 @@
World::Instance()->ConnectShowPhysicsSignal( boost::bind(&Geom::ShowPhysics,
this, _1) );
World::Instance()->ConnectShowJointsSignal( boost::bind(&Geom::ShowJoints,
this, _1) );
+ World::Instance()->ConnectShowPhysicsSignal( boost::bind(&Geom::ShowJoints,
this, _1) );
World::Instance()->ConnectShowBoundingBoxesSignal(
boost::bind(&Geom::ShowBoundingBox, this, _1) );
this->body->ConnectEnabledSignal( boost::bind(&Geom::EnabledCB, this, _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
