Revision: 8775
http://playerstage.svn.sourceforge.net/playerstage/?rev=8775&view=rev
Author: natepak
Date: 2010-06-22 22:39:28 +0000 (Tue, 22 Jun 2010)
Log Message:
-----------
Added libgazebo as a namespace
Modified Paths:
--------------
code/gazebo/trunk/examples/libgazebo/bandit/bandit.cc
code/gazebo/trunk/examples/libgazebo/bumper/bumper.cc
code/gazebo/trunk/examples/libgazebo/camera/camera.cc
code/gazebo/trunk/examples/libgazebo/epuck/main.cc
code/gazebo/trunk/examples/libgazebo/factory/factory.cc
code/gazebo/trunk/examples/libgazebo/graphics3d/graphics3d.cc
code/gazebo/trunk/examples/libgazebo/laser/laser.cc
code/gazebo/trunk/examples/libgazebo/openal/openal.cc
code/gazebo/trunk/examples/libgazebo/position/position.cc
code/gazebo/trunk/examples/libgazebo/simiface/simiface.cc
code/gazebo/trunk/examples/libgazebo/stereo/stereo.cc
Modified: code/gazebo/trunk/examples/libgazebo/bandit/bandit.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/bandit/bandit.cc 2010-06-22
22:37:46 UTC (rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/bandit/bandit.cc 2010-06-22
22:39:28 UTC (rev 8775)
@@ -13,9 +13,9 @@
int main()
{
- gazebo::Client *client = new gazebo::Client();
- gazebo::SimulationIface *simIface = new gazebo::SimulationIface();
- gazebo::ActarrayIface *actarrayIface = new gazebo::ActarrayIface();
+ liblibgazebo::Client *client = new libgazebo::Client();
+ liblibgazebo::SimulationIface *simIface = new libgazebo::SimulationIface();
+ liblibgazebo::ActarrayIface *actarrayIface = new libgazebo::ActarrayIface();
int serverId = 0;
Modified: code/gazebo/trunk/examples/libgazebo/bumper/bumper.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/bumper/bumper.cc 2010-06-22
22:37:46 UTC (rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/bumper/bumper.cc 2010-06-22
22:39:28 UTC (rev 8775)
@@ -3,8 +3,8 @@
int main()
{
- gazebo::Client *client = new gazebo::Client();
- gazebo::BumperIface *bumperIface = new gazebo::BumperIface();
+ libgazebo::Client *client = new gazebo::Client();
+ libgazebo::BumperIface *bumperIface = new gazebo::BumperIface();
int serverId = 0;
@@ -13,7 +13,7 @@
{
client->ConnectWait(serverId, GZ_CLIENT_ID_USER_FIRST);
}
- catch (gazebo::GazeboError e)
+ catch (libgazebo::GazeboError e)
{
std::cout << "Gazebo error: Unable to connect\n" << e << "\n";
return -1;
Modified: code/gazebo/trunk/examples/libgazebo/camera/camera.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/camera/camera.cc 2010-06-22
22:37:46 UTC (rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/camera/camera.cc 2010-06-22
22:39:28 UTC (rev 8775)
@@ -3,7 +3,7 @@
////////////////////////////////////////////////////////////////////////////////
// Save an image frame
-void SaveFrame(const char *filename, gazebo::CameraData *data)
+void SaveFrame(const char *filename, libgazebo::CameraData *data)
{
int i, width, height;
FILE *file;
@@ -28,9 +28,9 @@
int main()
{
- gazebo::Client *client = new gazebo::Client();
- gazebo::SimulationIface *simIface = new gazebo::SimulationIface();
- gazebo::CameraIface *camIface = new gazebo::CameraIface();
+ libgazebo::Client *client = new gazebo::Client();
+ libgazebo::SimulationIface *simIface = new gazebo::SimulationIface();
+ libgazebo::CameraIface *camIface = new gazebo::CameraIface();
int serverId = 0;
@@ -39,7 +39,7 @@
{
client->ConnectWait(serverId, GZ_CLIENT_ID_USER_FIRST);
}
- catch (gazebo::GazeboError e)
+ catch (libgazebo::GazeboError e)
{
std::cout << "Gazebo error: Unable to connect\n" << e << "\n";
return -1;
@@ -50,7 +50,7 @@
{
simIface->Open(client, "default");
}
- catch (gazebo::GazeboError e)
+ catch (libgazebo::GazeboError e)
{
std::cout << "Gazebo error: Unable to connect to the sim interface\n" << e
<< "\n";
return -1;
Modified: code/gazebo/trunk/examples/libgazebo/epuck/main.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/epuck/main.cc 2010-06-22 22:37:46 UTC
(rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/epuck/main.cc 2010-06-22 22:39:28 UTC
(rev 8775)
@@ -11,9 +11,9 @@
int main()
{
- gazebo::Client *client = new gazebo::Client();
- gazebo::SimulationIface *simIface = new gazebo::SimulationIface();
- gazebo::FactoryIface *factoryIface = new gazebo::FactoryIface();
+ libgazebo::Client *client = new gazebo::Client();
+ libgazebo::SimulationIface *simIface = new gazebo::SimulationIface();
+ libgazebo::FactoryIface *factoryIface = new gazebo::FactoryIface();
int serverId = 0;
@@ -23,7 +23,7 @@
{
client->ConnectWait(serverId, GZ_CLIENT_ID_USER_FIRST);
}
- catch (gazebo::GazeboError e)
+ catch (libgazebo::GazeboError e)
{
std::cout << "Gazebo error: Unable to connect\n" << e << "\n";
return -1;
@@ -35,7 +35,7 @@
{
simIface->Open(client, "default");
}
- catch (gazebo::GazeboError e)
+ catch (libgazebo::GazeboError e)
{
std::cout << "Gazebo error: Unable to connect to the sim interface\n" << e
<< "\n";
return -1;
@@ -48,7 +48,7 @@
{
factoryIface->Open(client, "factory_model-factory_iface");
}
- catch (gazebo::GazeboError e)
+ catch (libgazebo::GazeboError e)
{
std::cout << "Gazebo error: Unable to connect to the factory interface\n"
<< e << "\n";
Modified: code/gazebo/trunk/examples/libgazebo/factory/factory.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/factory/factory.cc 2010-06-22
22:37:46 UTC (rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/factory/factory.cc 2010-06-22
22:39:28 UTC (rev 8775)
@@ -4,9 +4,9 @@
int main()
{
- gazebo::Client *client = new gazebo::Client();
- gazebo::SimulationIface *simIface = new gazebo::SimulationIface();
- gazebo::FactoryIface *factoryIface = new gazebo::FactoryIface();
+ libgazebo::Client *client = new gazebo::Client();
+ libgazebo::SimulationIface *simIface = new gazebo::SimulationIface();
+ libgazebo::FactoryIface *factoryIface = new gazebo::FactoryIface();
int serverId = 0;
Modified: code/gazebo/trunk/examples/libgazebo/graphics3d/graphics3d.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/graphics3d/graphics3d.cc
2010-06-22 22:37:46 UTC (rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/graphics3d/graphics3d.cc
2010-06-22 22:39:28 UTC (rev 8775)
@@ -8,33 +8,33 @@
#include <gazebo/gazebo.h>
// All the interfaces
-gazebo::Client *client;
-gazebo::SimulationIface *simIface;
-gazebo::Graphics3dIface *g3dIface;
+libgazebo::Client *client;
+libgazebo::SimulationIface *simIface;
+libgazebo::Graphics3dIface *g3dIface;
// Stuff to draw the square
std::string squareName = "square";
-gazebo::Vec3 squareSize;
+libgazebo::Vec3 squareSize;
int dir = 1;
// Stuff to draw the sphere
std::string sphereName = "sphere";
-gazebo::Vec3 spherePos, sphereSize;
+libgazebo::Vec3 spherePos, sphereSize;
float radius = 0.2;
float theta = 0;
// Stuff to draw the robot's path
std::string pathName = "path";
-std::vector<gazebo::Vec3> positions;
+std::vector<libgazebo::Vec3> positions;
// Stuff to draw the text
std::string textName = "velocities";
void UpdatePath()
{
- gazebo::Pose rPos;
- gazebo::Vec3 blockSize;
- gazebo::Color clr;
+ libgazebo::Pose rPos;
+ libgazebo::Vec3 blockSize;
+ libgazebo::Color clr;
std::ostringstream blockName;
blockSize.x = 0.05;
@@ -58,7 +58,7 @@
// Store the new position
positions.push_back(rPos.pos);
- gazebo::Vec3 tmpvec[positions.size()];
+ libgazebo::Vec3 tmpvec[positions.size()];
for (unsigned int j =0; j < positions.size(); j++)
{
tmpvec[j].x = positions[j].x;
@@ -72,7 +72,7 @@
// Draw the line
g3dIface->DrawSimple(pathName.c_str(),
- gazebo::Graphics3dDrawData::LINE_STRIP,
+ libgazebo::Graphics3dDrawData::LINE_STRIP,
tmpvec, positions.size(), clr);
blockName << "path_block:" << positions.size();
@@ -83,7 +83,7 @@
clr.a = 1.0;
g3dIface->DrawShape(blockName.str().c_str(),
- gazebo::Graphics3dDrawData::CUBE, tmpvec[positions.size()-1],
+ libgazebo::Graphics3dDrawData::CUBE, tmpvec[positions.size()-1],
blockSize, clr);
}
}
@@ -91,9 +91,9 @@
int main()
{
- client = new gazebo::Client();
- simIface = new gazebo::SimulationIface();
- g3dIface = new gazebo::Graphics3dIface();
+ client = new libgazebo::Client();
+ simIface = new libgazebo::SimulationIface();
+ g3dIface = new libgazebo::Graphics3dIface();
int serverId = 0;
@@ -132,7 +132,7 @@
sphereSize.y = 0.1;
sphereSize.z = 0.1;
- gazebo::Color barClr;
+ libgazebo::Color barClr;
barClr.r = 1.0;
barClr.g = 1.0;
barClr.b = 0.0;
Modified: code/gazebo/trunk/examples/libgazebo/laser/laser.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/laser/laser.cc 2010-06-22 22:37:46 UTC
(rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/laser/laser.cc 2010-06-22 22:39:28 UTC
(rev 8775)
@@ -6,9 +6,9 @@
int main()
{
- gazebo::Client *client = new gazebo::Client();
- gazebo::SimulationIface *simIface = new gazebo::SimulationIface();
- gazebo::LaserIface *laserIface = new gazebo::LaserIface();
+ libgazebo::Client *client = new gazebo::Client();
+ libgazebo::SimulationIface *simIface = new gazebo::SimulationIface();
+ libgazebo::LaserIface *laserIface = new gazebo::LaserIface();
int serverId = 0;
Modified: code/gazebo/trunk/examples/libgazebo/openal/openal.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/openal/openal.cc 2010-06-22
22:37:46 UTC (rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/openal/openal.cc 2010-06-22
22:39:28 UTC (rev 8775)
@@ -2,15 +2,15 @@
#include <iostream>
#include <gazebo/gazebo.h>
-gazebo::Client *client = NULL;
-gazebo::SimulationIface *simIface = NULL;
-gazebo::AudioIface *audioIface = NULL;
+libgazebo::Client *client = NULL;
+libgazebo::SimulationIface *simIface = NULL;
+libgazebo::AudioIface *audioIface = NULL;
int main()
{
- client = new gazebo::Client();
- simIface = new gazebo::SimulationIface();
- audioIface = new gazebo::AudioIface();
+ client = new libgazebo::Client();
+ simIface = new libgazebo::SimulationIface();
+ audioIface = new libgazebo::AudioIface();
int serverId = 0;
Modified: code/gazebo/trunk/examples/libgazebo/position/position.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/position/position.cc 2010-06-22
22:37:46 UTC (rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/position/position.cc 2010-06-22
22:39:28 UTC (rev 8775)
@@ -3,9 +3,9 @@
int main()
{
- gazebo::Client *client = new gazebo::Client();
- gazebo::SimulationIface *simIface = new gazebo::SimulationIface();
- gazebo::PositionIface *posIface = new gazebo::PositionIface();
+ libgazebo::Client *client = new gazebo::Client();
+ libgazebo::SimulationIface *simIface = new gazebo::SimulationIface();
+ libgazebo::PositionIface *posIface = new gazebo::PositionIface();
int serverId = 0;
Modified: code/gazebo/trunk/examples/libgazebo/simiface/simiface.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/simiface/simiface.cc 2010-06-22
22:37:46 UTC (rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/simiface/simiface.cc 2010-06-22
22:39:28 UTC (rev 8775)
@@ -15,8 +15,8 @@
int main()
{
- gazebo::Client *client = new gazebo::Client();
- gazebo::SimulationIface *simIface = new gazebo::SimulationIface();
+ libgazebo::Client *client = new gazebo::Client();
+ libgazebo::SimulationIface *simIface = new gazebo::SimulationIface();
int serverId = 0;
@@ -47,7 +47,7 @@
// Example of how to move a model (box1_model)
char name[512] = "pioneer2dx_model1";
- gazebo::Pose pose;
+ libgazebo::Pose pose;
bool got = false;
for (int i=0; i< 600; i++)
@@ -68,14 +68,14 @@
simIface->SetPose3d(name, pose);
}
- /*gazebo::Pose pose;
+ /*libgazebo::Pose pose;
//pose.pos.x = i+0.1;
pose.pos.z = .145;
pose.yaw = M_PI/2;
- gazebo::Vec3 linearVel(0.2, 0, 0);
- gazebo::Vec3 angularVel(0, 0, 0);
- gazebo::Vec3 linearAccel(0, 0, 0);
- gazebo::Vec3 angularAccel(0, 0, 0);
+ libgazebo::Vec3 linearVel(0.2, 0, 0);
+ libgazebo::Vec3 angularVel(0, 0, 0);
+ libgazebo::Vec3 linearAccel(0, 0, 0);
+ libgazebo::Vec3 angularAccel(0, 0, 0);
simIface->SetState(name, pose, linearVel, angularVel,
linearAccel, angularAccel );
Modified: code/gazebo/trunk/examples/libgazebo/stereo/stereo.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/stereo/stereo.cc 2010-06-22
22:37:46 UTC (rev 8774)
+++ code/gazebo/trunk/examples/libgazebo/stereo/stereo.cc 2010-06-22
22:39:28 UTC (rev 8775)
@@ -1,9 +1,9 @@
#include <gazebo/gazebo.h>
#include <gazebo/GazeboError.hh>
-gazebo::Client *client = NULL;
-gazebo::SimulationIface *simIface = NULL;
-gazebo::StereoCameraIface *stereoIface = NULL;
+libgazebo::Client *client = NULL;
+libgazebo::SimulationIface *simIface = NULL;
+libgazebo::StereoCameraIface *stereoIface = NULL;
int saveCount = 0;
void SaveFrame()
@@ -48,9 +48,9 @@
int main()
{
- client = new gazebo::Client();
- simIface = new gazebo::SimulationIface();
- stereoIface = new gazebo::StereoCameraIface();
+ client = new libgazebo::Client();
+ simIface = new libgazebo::SimulationIface();
+ stereoIface = new libgazebo::StereoCameraIface();
int serverId = 0;
@@ -60,7 +60,7 @@
{
client->ConnectWait(serverId, GZ_CLIENT_ID_USER_FIRST);
}
- catch (gazebo::GazeboError e)
+ catch (libgazebo::GazeboError e)
{
std::cout << "Gazebo error: Unable to connect\n" << e << "\n";
return -1;
@@ -71,7 +71,7 @@
{
simIface->Open(client, "default");
}
- catch (gazebo::GazeboError e)
+ catch (libgazebo::GazeboError e)
{
std::cout << "Gazebo error: Unable to connect to the sim interface\n" << e
<< "\n";
return -1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
