Revision: 7304
http://playerstage.svn.sourceforge.net/playerstage/?rev=7304&view=rev
Author: rtv
Date: 2009-01-26 22:42:12 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
fixed libstageplugin. some usuability issues remain, but it works
Modified Paths:
--------------
code/stage/trunk/CMakeLists.txt
code/stage/trunk/docsrc/stage.dox
code/stage/trunk/libstage/canvas.hh
code/stage/trunk/libstageplugin/CMakeLists.txt
code/stage/trunk/libstageplugin/p_blobfinder.cc
code/stage/trunk/libstageplugin/p_driver.cc
code/stage/trunk/libstageplugin/p_driver.h
code/stage/trunk/libstageplugin/p_fiducial.cc
code/stage/trunk/libstageplugin/p_laser.cc
code/stage/trunk/libstageplugin/p_position.cc
code/stage/trunk/libstageplugin/p_simulation.cc
code/stage/trunk/libstageplugin/p_sonar.cc
code/stage/trunk/libstageplugin/p_speech.cc
code/stage/trunk/libstageplugin/stg_time.cc
code/stage/trunk/worlds/simple.cfg
code/stage/trunk/worlds/simple.world
Modified: code/stage/trunk/CMakeLists.txt
===================================================================
--- code/stage/trunk/CMakeLists.txt 2009-01-26 22:41:12 UTC (rev 7303)
+++ code/stage/trunk/CMakeLists.txt 2009-01-26 22:42:12 UTC (rev 7304)
@@ -141,7 +141,7 @@
IF( PLAYER_FOUND )
MESSAGE( STATUS ${INDENT} "Player version ${PLAYER_VERSION} detected at
${PLAYER_PREFIX}" )
MESSAGE( STATUS " PLAYER_CFLAGS: ${PLAYER_CFLAGS}" )
- MESSAGE( STATUS " PLAYER_LDFLAGS: ${PLAYER_LDFLAGS}" )
+ MESSAGE( STATUS " PLAYER_LDFLAGS: ${PLAYER_LDFLAGS}" )
ELSE( PLAYER_FOUND )
MESSAGE( ${INDENT} "Player not detected. If Player is installed but not
detected, check your PKG_CONFIG_PATH." )
ENDIF( PLAYER_FOUND )
Modified: code/stage/trunk/docsrc/stage.dox
===================================================================
--- code/stage/trunk/docsrc/stage.dox 2009-01-26 22:41:12 UTC (rev 7303)
+++ code/stage/trunk/docsrc/stage.dox 2009-01-26 22:42:12 UTC (rev 7304)
@@ -87,7 +87,7 @@
# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
-ABBREVIATE_BRIEF = NO
+ABBREVIATE_BRIEF = YES
# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
# Doxygen will generate a detailed section even if there is only a brief
@@ -219,7 +219,7 @@
# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-EXTRACT_ALL = NO
+EXTRACT_ALL = YES
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
@@ -1138,7 +1138,7 @@
# So in most cases it will be better to enable call graphs for selected
# functions only using the \callgraph command.
-CALL_GRAPH = YES
+CALL_GRAPH = NO
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
# will graphical hierarchy of all classes instead of a textual one.
Modified: code/stage/trunk/libstage/canvas.hh
===================================================================
--- code/stage/trunk/libstage/canvas.hh 2009-01-26 22:41:12 UTC (rev 7303)
+++ code/stage/trunk/libstage/canvas.hh 2009-01-26 22:42:12 UTC (rev 7304)
@@ -84,7 +84,7 @@
visualizeAll;
public:
- Canvas( WorldGui* world, int x, int y, int width, int height);
+ Canvas( WorldGui* world, int x, int y, int width, int height);
~Canvas();
bool graphics;
Modified: code/stage/trunk/libstageplugin/CMakeLists.txt
===================================================================
--- code/stage/trunk/libstageplugin/CMakeLists.txt 2009-01-26 22:41:12 UTC
(rev 7303)
+++ code/stage/trunk/libstageplugin/CMakeLists.txt 2009-01-26 22:42:12 UTC
(rev 7304)
@@ -15,9 +15,11 @@
stg_time.cc
)
+# TODO
+# p_graphics3d.cc
+
add_library( stageplugin MODULE ${stagepluginSrcs} )
-# p_graphics3d.cc
target_link_libraries( stageplugin
@@ -30,6 +32,9 @@
set_source_files_properties( ${stagepluginSrcs} PROPERTIES COMPILE_FLAGS
"${FLTK_CFLAGS}" )
+# delete the "lib" prefix from the plugin
+SET_TARGET_PROPERTIES( stageplugin PROPERTIES PREFIX "" )
+
IF (BUILD_LSPTEST)
ADD_SUBDIRECTORY(test)
ENDIF (BUILD_LSPTEST)
Modified: code/stage/trunk/libstageplugin/p_blobfinder.cc
===================================================================
--- code/stage/trunk/libstageplugin/p_blobfinder.cc 2009-01-26 22:41:12 UTC
(rev 7303)
+++ code/stage/trunk/libstageplugin/p_blobfinder.cc 2009-01-26 22:42:12 UTC
(rev 7304)
@@ -36,6 +36,7 @@
// CODE
#include "p_driver.h"
+using namespace Stg;
InterfaceBlobfinder::InterfaceBlobfinder( player_devaddr_t addr,
StgDriver* driver,
Modified: code/stage/trunk/libstageplugin/p_driver.cc
===================================================================
--- code/stage/trunk/libstageplugin/p_driver.cc 2009-01-26 22:41:12 UTC (rev
7303)
+++ code/stage/trunk/libstageplugin/p_driver.cc 2009-01-26 22:42:12 UTC (rev
7304)
@@ -150,6 +150,7 @@
#include <math.h>
#include "p_driver.h"
+using namespace Stg;
const char* copyright_notice =
"\n * Part of the Player Project [http://playerstage.sourceforge.net]\n";
Modified: code/stage/trunk/libstageplugin/p_driver.h
===================================================================
--- code/stage/trunk/libstageplugin/p_driver.h 2009-01-26 22:41:12 UTC (rev
7303)
+++ code/stage/trunk/libstageplugin/p_driver.h 2009-01-26 22:42:12 UTC (rev
7304)
@@ -7,9 +7,8 @@
#include <libplayercore/playercore.h>
-#include "../libstage/stage_internal.hh"
+#include "../libstage/stage.hh"
-
#define DRIVER_ERROR(X) printf( "Stage driver error: %s\n", X )
// foward declare;
@@ -39,15 +38,15 @@
virtual void Update();
/// all player devices share the same Stage world (for now)
- static WorldGui* world;
+ static Stg::WorldGui* world;
/// find the device record with this Player id
Interface* LookupDevice( player_devaddr_t addr );
- Model* LocateModel( char* basename,
- player_devaddr_t* addr,
- stg_model_type_t type );
-
+ Stg::Model* LocateModel( char* basename,
+
player_devaddr_t* addr,
+
Stg::stg_model_type_t type );
+
protected:
/// an array of pointers to Interface objects, defined below
@@ -101,9 +100,9 @@
StgDriver* driver,
ConfigFile* cf,
int section,
- stg_model_type_t type );
+ Stg::stg_model_type_t type );
- Model* mod;
+ Stg::Model* mod;
virtual ~InterfaceModel( void ){ /* TODO: clean up*/ };
Modified: code/stage/trunk/libstageplugin/p_fiducial.cc
===================================================================
--- code/stage/trunk/libstageplugin/p_fiducial.cc 2009-01-26 22:41:12 UTC
(rev 7303)
+++ code/stage/trunk/libstageplugin/p_fiducial.cc 2009-01-26 22:42:12 UTC
(rev 7304)
@@ -45,6 +45,7 @@
// CODE
#include "p_driver.h"
+using namespace Stg;
InterfaceFiducial::InterfaceFiducial( player_devaddr_t addr,
Modified: code/stage/trunk/libstageplugin/p_laser.cc
===================================================================
--- code/stage/trunk/libstageplugin/p_laser.cc 2009-01-26 22:41:12 UTC (rev
7303)
+++ code/stage/trunk/libstageplugin/p_laser.cc 2009-01-26 22:42:12 UTC (rev
7304)
@@ -39,6 +39,7 @@
// CODE ----------------------------------------------------------------------
#include "p_driver.h"
+using namespace Stg;
InterfaceLaser::InterfaceLaser( player_devaddr_t addr,
StgDriver* driver,
Modified: code/stage/trunk/libstageplugin/p_position.cc
===================================================================
--- code/stage/trunk/libstageplugin/p_position.cc 2009-01-26 22:41:12 UTC
(rev 7303)
+++ code/stage/trunk/libstageplugin/p_position.cc 2009-01-26 22:42:12 UTC
(rev 7304)
@@ -43,9 +43,8 @@
// CODE ----------------------------------------------------------------------
#include "p_driver.h"
-//#include "playerclient.h"
+using namespace Stg;
-
InterfacePosition::InterfacePosition( player_devaddr_t addr,
StgDriver* driver,
ConfigFile* cf,
Modified: code/stage/trunk/libstageplugin/p_simulation.cc
===================================================================
--- code/stage/trunk/libstageplugin/p_simulation.cc 2009-01-26 22:41:12 UTC
(rev 7303)
+++ code/stage/trunk/libstageplugin/p_simulation.cc 2009-01-26 22:42:12 UTC
(rev 7304)
@@ -52,6 +52,7 @@
#include <libplayercore/globals.h> // for player_argc & player_argv
#include "p_driver.h"
+using namespace Stg;
// these are Player globals
extern bool player_quiet_startup;
Modified: code/stage/trunk/libstageplugin/p_sonar.cc
===================================================================
--- code/stage/trunk/libstageplugin/p_sonar.cc 2009-01-26 22:41:12 UTC (rev
7303)
+++ code/stage/trunk/libstageplugin/p_sonar.cc 2009-01-26 22:42:12 UTC (rev
7304)
@@ -37,6 +37,7 @@
// CODE ----------------------------------------------------------------------
#include "p_driver.h"
+using namespace Stg;
//
// SONAR INTERFACE
Modified: code/stage/trunk/libstageplugin/p_speech.cc
===================================================================
--- code/stage/trunk/libstageplugin/p_speech.cc 2009-01-26 22:41:12 UTC (rev
7303)
+++ code/stage/trunk/libstageplugin/p_speech.cc 2009-01-26 22:42:12 UTC (rev
7304)
@@ -28,6 +28,7 @@
#include "p_driver.h"
+using namespace Stg;
/** @addtogroup player
@par Speech interface
Modified: code/stage/trunk/libstageplugin/stg_time.cc
===================================================================
--- code/stage/trunk/libstageplugin/stg_time.cc 2009-01-26 22:41:12 UTC (rev
7303)
+++ code/stage/trunk/libstageplugin/stg_time.cc 2009-01-26 22:42:12 UTC (rev
7304)
@@ -26,8 +26,10 @@
//
///////////////////////////////////////////////////////////////////////////
+#include <math.h>
+
#include "p_driver.h"
-#include "math.h"
+using namespace Stg;
// Constructor
StTime::StTime( StgDriver* driver )
Modified: code/stage/trunk/worlds/simple.cfg
===================================================================
--- code/stage/trunk/worlds/simple.cfg 2009-01-26 22:41:12 UTC (rev 7303)
+++ code/stage/trunk/worlds/simple.cfg 2009-01-26 22:42:12 UTC (rev 7304)
@@ -11,7 +11,7 @@
(
name "stage"
provides [ "simulation:0" ]
- plugin "libstageplugin"
+ plugin "stageplugin"
# load the named file into the simulator
worldfile "simple.world"
Modified: code/stage/trunk/worlds/simple.world
===================================================================
--- code/stage/trunk/worlds/simple.world 2009-01-26 22:41:12 UTC (rev
7303)
+++ code/stage/trunk/worlds/simple.world 2009-01-26 22:42:12 UTC (rev
7304)
@@ -7,9 +7,9 @@
include "sick.inc"
interval_sim 100 # simulation timestep in milliseconds
-interval_real 10 # real-time interval between simulation updates in
milliseconds
+interval_real 100 # real-time interval between simulation updates in
milliseconds
-paused 1
+paused 0
resolution 0.02
@@ -17,7 +17,8 @@
window
(
size [ 556.000 557.000 ] # in pixels
- scale 28.116 # pixels per meter
+ scale 28.116
+ # pixels per meter
center [ 8.058 7.757 ]
rotate [ 0 0 ]
@@ -42,6 +43,6 @@
pose [ 0.892 0.800 0 56.500 ]
sicklaser()
- ctrl "wander"
+ #ctrl "wander"
)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
