Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

making sure

  • Loading branch information...
commit c6c30f3dc5874ac43d477931c207fdb258812a22 1 parent a8b3ae0
rtv authored
View
1  CMakeLists.txt
@@ -5,6 +5,7 @@ SET( V_MINOR 0 )
SET( V_BUGFIX 0 )
SET( VERSION ${V_MAJOR}.${V_MINOR}.${V_BUGFIX} )
+SET( APIVERSION ${V_MAJOR}.${V_MINOR} )
MESSAGE (STATUS "${PROJECT_NAME} version ${VERSION}")
View
9 README
@@ -4,6 +4,15 @@
* $Id: README,v 1.18 2006-03-29 05:13:44 rtv Exp $
****************************************************************************
+CMAKE building notes - to be integrated properly:
+
+export PLAYER=$HOME/Stage-3.0
+export PKG_CONFIG_PATH=$PLAYER/lib/pkgconfig
+
+export CMAKE_INCLUDE_PATH=/opt/local/include
+export CMAKE_LIBRARY_PATH=/opt/local/lib
+export CMAKE_INSTALL_PREFIX=$PLAYER
+
** Release Notes for 2.0.2 **
New features:
View
25 libstage/main.cc
@@ -8,9 +8,6 @@
#include "stage_internal.hh"
-//const char* PACKAGE = "Stage";
-//const char* VERSION = "3.dev";
-
/* options descriptor */
static struct option longopts[] = {
{ "gui", no_argument, NULL, 'g' },
@@ -18,7 +15,6 @@ static struct option longopts[] = {
{ NULL, 0, NULL, 0 }
};
-
int main( int argc, char* argv[] )
{
printf( "%s %s ", PROJECT, VERSION );
@@ -48,11 +44,22 @@ int main( int argc, char* argv[] )
// initialize libstage
Stg::Init( &argc, &argv );
+
+ // arguments at index optindex and later are not options, so they
+ // must be world file names
- StgWorldGui world( 800, 700, argv[0]);
-
- world.Load( argv[argc-1] );
- world.Start();
- world.Run();
+ while( optindex < argc )
+ {
+ if( optindex > 0 )
+ {
+ const char* worldfilename = argv[optindex];
+ StgWorldGui* world = new StgWorldGui( 400, 300, worldfilename );
+ world->Load( worldfilename );
+ world->Start();
+ }
+ optindex++;
+ }
+
+ StgWorldGui::Run(); // run all the simulations
}
View
2  libstage/model.cc
@@ -965,7 +965,7 @@ void StgModel::Draw( uint32_t flags, Stg::StgCanvas* canvas )
float h = gl_height() / canvas->scale + 2*margin;
- PushColor( 0.8,0.8,1.0,1.0 ); // pale blue
+ PushColor( 0,1,0,0.5 ); // transparent green
glRectf( 0,0, w,h ); // draw bubble
PopColor();
View
2  libstage/stage.hh
@@ -1775,7 +1775,7 @@ public:
~StgWorldGui();
/** Start the simulation and GUI. Does not return */
- void Run();
+ static void Run();
void Start();
void Cycle();
View
2  libstage/worldgui.cc
@@ -171,7 +171,6 @@ void view_toggle_cb(Fl_Menu_Bar* menubar, StgCanvas* canvas )
//printf( "value: %d\n", item->value() );
}
-
StgWorldGui::StgWorldGui(int W,int H,const char* L)
: Fl_Window(0,0,W,H,L)
{
@@ -342,6 +341,7 @@ static void idle_callback( StgWorld* world )
world->Update();
}
+
void StgWorldGui::Start()
{
// if a non-zero interval was requested, call Update() after that
View
4 worlds/fasr.world
@@ -26,7 +26,7 @@ window
rotate [ 0.000 0.000 ]
scale 33.306
show_data 0
- interval 50
+ interval 100
)
# load an environment bitmap
@@ -61,6 +61,8 @@ define autorob pioneer2dx
sicklaser( pose [ 0.040 0.000 0.000 ] samples 32 range_max 5 laser_return 2 )
ctrl "fasr"
+
+ say "Autolab"
)
Please sign in to comment.
Something went wrong with that request. Please try again.