Revision: 7620
http://playerstage.svn.sourceforge.net/playerstage/?rev=7620&view=rev
Author: natepak
Date: 2009-05-05 02:25:57 +0000 (Tue, 05 May 2009)
Log Message:
-----------
Added player CMakeLists.txt
Modified Paths:
--------------
code/gazebo/trunk/player/ActarrayInterface.cc
code/gazebo/trunk/player/CameraInterface.cc
code/gazebo/trunk/player/FiducialInterface.cc
code/gazebo/trunk/player/GazeboClient.cc
code/gazebo/trunk/player/GazeboDriver.cc
code/gazebo/trunk/player/Graphics3dInterface.cc
code/gazebo/trunk/player/IRInterface.cc
code/gazebo/trunk/player/LaserInterface.cc
code/gazebo/trunk/player/OpaqueInterface.cc
code/gazebo/trunk/player/PTZInterface.cc
code/gazebo/trunk/player/Position2dInterface.cc
code/gazebo/trunk/player/Position3dInterface.cc
code/gazebo/trunk/player/SimulationInterface.cc
Added Paths:
-----------
code/gazebo/trunk/player/CMakeLists.txt
Modified: code/gazebo/trunk/player/ActarrayInterface.cc
===================================================================
--- code/gazebo/trunk/player/ActarrayInterface.cc 2009-05-05 01:24:49 UTC
(rev 7619)
+++ code/gazebo/trunk/player/ActarrayInterface.cc 2009-05-05 02:25:57 UTC
(rev 7620)
@@ -26,9 +26,9 @@
#include <math.h>
+#include <iostream>
#include <boost/thread/recursive_mutex.hpp>
-#include "GazeboError.hh"
#include "gazebo.h"
#include "GazeboDriver.hh"
#include "ActarrayInterface.hh"
Added: code/gazebo/trunk/player/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/player/CMakeLists.txt (rev 0)
+++ code/gazebo/trunk/player/CMakeLists.txt 2009-05-05 02:25:57 UTC (rev
7620)
@@ -0,0 +1,26 @@
+
+SET (sources GazeboDriver.cc
+ GazeboClient.cc
+ GazeboInterface.cc
+ GazeboTime.cc
+ SimulationInterface.cc
+ Position2dInterface.cc
+ Position3dInterface.cc
+ LaserInterface.cc
+ CameraInterface.cc
+ FiducialInterface.cc
+ PTZInterface.cc
+ OpaqueInterface.cc
+ ActarrayInterface.cc
+ GripperInterface.cc
+ BumperInterface.cc
+ IRInterface.cc
+)
+
+INCLUDE_DIRECTORIES( ${PLAYER_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/libgazebo )
+LINK_DIRECTORIES( ${PLAYER_LINK_DIRS} gazeboshm)
+
+ADD_LIBRARY(gazeboplugin SHARED ${sources})
+#TARGET_LINK_LIBRARIES(gazeboplugin ${PLAYER_LINK_LIBS})
+
+INSTALL(TARGETS gazeboplugin DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
Modified: code/gazebo/trunk/player/CameraInterface.cc
===================================================================
--- code/gazebo/trunk/player/CameraInterface.cc 2009-05-05 01:24:49 UTC (rev
7619)
+++ code/gazebo/trunk/player/CameraInterface.cc 2009-05-05 02:25:57 UTC (rev
7620)
@@ -25,10 +25,10 @@
*/
#include <math.h>
+#include <iostream>
#include <boost/thread/recursive_mutex.hpp>
#include "gazebo.h"
-#include "GazeboError.hh"
#include "GazeboDriver.hh"
#include "CameraInterface.hh"
Modified: code/gazebo/trunk/player/FiducialInterface.cc
===================================================================
--- code/gazebo/trunk/player/FiducialInterface.cc 2009-05-05 01:24:49 UTC
(rev 7619)
+++ code/gazebo/trunk/player/FiducialInterface.cc 2009-05-05 02:25:57 UTC
(rev 7620)
@@ -32,10 +32,10 @@
#include <math.h>
+#include <iostream>
#include <libplayerxdr/playerxdr.h>
#include <boost/thread/recursive_mutex.hpp>
-#include "GazeboError.hh"
#include "gazebo.h"
#include "GazeboDriver.hh"
#include "FiducialInterface.hh"
Modified: code/gazebo/trunk/player/GazeboClient.cc
===================================================================
--- code/gazebo/trunk/player/GazeboClient.cc 2009-05-05 01:24:49 UTC (rev
7619)
+++ code/gazebo/trunk/player/GazeboClient.cc 2009-05-05 02:25:57 UTC (rev
7620)
@@ -26,9 +26,9 @@
#include <assert.h>
#include <stdio.h>
+#include <iostream>
#include <libplayercore/playercore.h>
-#include "GazeboError.hh"
#include "GazeboTime.hh"
#include "GazeboClient.hh"
Modified: code/gazebo/trunk/player/GazeboDriver.cc
===================================================================
--- code/gazebo/trunk/player/GazeboDriver.cc 2009-05-05 01:24:49 UTC (rev
7619)
+++ code/gazebo/trunk/player/GazeboDriver.cc 2009-05-05 02:25:57 UTC (rev
7620)
@@ -25,9 +25,8 @@
*/
#include <stdlib.h>
+#include <iostream>
-#include "GazeboError.hh"
-#include "GazeboMessage.hh"
#include "GazeboInterface.hh"
#include "SimulationInterface.hh"
#include "Position2dInterface.hh"
@@ -90,14 +89,7 @@
{
int player_driver_init(DriverTable* table)
{
- try
- {
- GazeboDriver_Register(table);
- }
- catch (GazeboError e)
- {
- gzmsg(-1) << "Error: " << e << "\n";
- }
+ GazeboDriver_Register(table);
return(0);
}
}
@@ -114,14 +106,10 @@
this->deviceCount = 0;
this->deviceMaxCount = 0;
- try
+ if (this->LoadDevices(cf,section) < 0)
{
- this->LoadDevices(cf,section);
+ std::cout << "Error: Loading devices\n";
}
- catch (GazeboError e)
- {
- gzmsg(-1) << "Error: " << e << "\n";
- }
}
Modified: code/gazebo/trunk/player/Graphics3dInterface.cc
===================================================================
--- code/gazebo/trunk/player/Graphics3dInterface.cc 2009-05-05 01:24:49 UTC
(rev 7619)
+++ code/gazebo/trunk/player/Graphics3dInterface.cc 2009-05-05 02:25:57 UTC
(rev 7620)
@@ -31,10 +31,10 @@
- PLAYER_GRAPHICS3D_CMD_DRAW
*/
+#include <iostream>
#include <boost/thread/recursive_mutex.hpp>
#include "gazebo.h"
-#include "GazeboError.hh"
#include "GazeboDriver.hh"
#include "Graphics3dInterface.hh"
Modified: code/gazebo/trunk/player/IRInterface.cc
===================================================================
--- code/gazebo/trunk/player/IRInterface.cc 2009-05-05 01:24:49 UTC (rev
7619)
+++ code/gazebo/trunk/player/IRInterface.cc 2009-05-05 02:25:57 UTC (rev
7620)
@@ -29,10 +29,10 @@
*/
#include <math.h>
+#include <iostream>
#include <libplayerxdr/playerxdr.h>
#include <boost/thread/recursive_mutex.hpp>
-#include "GazeboError.hh"
#include "gazebo.h"
#include "GazeboDriver.hh"
#include "IRInterface.hh"
Modified: code/gazebo/trunk/player/LaserInterface.cc
===================================================================
--- code/gazebo/trunk/player/LaserInterface.cc 2009-05-05 01:24:49 UTC (rev
7619)
+++ code/gazebo/trunk/player/LaserInterface.cc 2009-05-05 02:25:57 UTC (rev
7620)
@@ -28,10 +28,10 @@
*/
#include <math.h>
+#include <iostream>
#include <libplayerxdr/playerxdr.h>
#include <boost/thread/recursive_mutex.hpp>
-#include "GazeboError.hh"
#include "gazebo.h"
#include "GazeboDriver.hh"
#include "LaserInterface.hh"
Modified: code/gazebo/trunk/player/OpaqueInterface.cc
===================================================================
--- code/gazebo/trunk/player/OpaqueInterface.cc 2009-05-05 01:24:49 UTC (rev
7619)
+++ code/gazebo/trunk/player/OpaqueInterface.cc 2009-05-05 02:25:57 UTC (rev
7620)
@@ -34,9 +34,9 @@
- PLAYER_OPAQUE_REQ_DATA
*/
#include <math.h>
+#include <iostream>
#include <boost/thread/recursive_mutex.hpp>
-#include "GazeboError.hh"
#include "gazebo.h"
#include "GazeboDriver.hh"
#include "OpaqueInterface.hh"
Modified: code/gazebo/trunk/player/PTZInterface.cc
===================================================================
--- code/gazebo/trunk/player/PTZInterface.cc 2009-05-05 01:24:49 UTC (rev
7619)
+++ code/gazebo/trunk/player/PTZInterface.cc 2009-05-05 02:25:57 UTC (rev
7620)
@@ -35,9 +35,9 @@
*/
#include <math.h>
+#include <iostream>
#include <boost/thread/recursive_mutex.hpp>
-#include "GazeboError.hh"
#include "gazebo.h"
#include "GazeboDriver.hh"
#include "PTZInterface.hh"
Modified: code/gazebo/trunk/player/Position2dInterface.cc
===================================================================
--- code/gazebo/trunk/player/Position2dInterface.cc 2009-05-05 01:24:49 UTC
(rev 7619)
+++ code/gazebo/trunk/player/Position2dInterface.cc 2009-05-05 02:25:57 UTC
(rev 7620)
@@ -37,9 +37,9 @@
- PLAYER_POSITION2D_REQ_RESET_ODOM
*/
#include <math.h>
+#include <iostream>
#include <boost/thread/recursive_mutex.hpp>
-#include "GazeboError.hh"
#include "gazebo.h"
#include "GazeboDriver.hh"
#include "Position2dInterface.hh"
Modified: code/gazebo/trunk/player/Position3dInterface.cc
===================================================================
--- code/gazebo/trunk/player/Position3dInterface.cc 2009-05-05 01:24:49 UTC
(rev 7619)
+++ code/gazebo/trunk/player/Position3dInterface.cc 2009-05-05 02:25:57 UTC
(rev 7620)
@@ -30,9 +30,9 @@
*/
#include <math.h>
+#include <iostream>
#include <boost/thread/recursive_mutex.hpp>
-#include "GazeboError.hh"
#include "gazebo.h"
#include "GazeboDriver.hh"
#include "Position3dInterface.hh"
Modified: code/gazebo/trunk/player/SimulationInterface.cc
===================================================================
--- code/gazebo/trunk/player/SimulationInterface.cc 2009-05-05 01:24:49 UTC
(rev 7619)
+++ code/gazebo/trunk/player/SimulationInterface.cc 2009-05-05 02:25:57 UTC
(rev 7620)
@@ -25,10 +25,10 @@
*/
#include <time.h>
+#include <iostream>
#include <boost/thread/recursive_mutex.hpp>
#include "gazebo.h"
-#include "GazeboError.hh"
#include "GazeboDriver.hh"
#include "SimulationInterface.hh"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
