Update of /cvsroot/playerstage/code/stage/libstageplugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11749/libstageplugin
Modified Files:
Tag: opengl
p_driver.cc p_graphics3d.cc p_position.cc p_simulation.cc
Log Message:
fixed plugin
Index: p_driver.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstageplugin/Attic/p_driver.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** p_driver.cc 29 Nov 2007 07:59:00 -0000 1.1.2.3
--- p_driver.cc 8 Jan 2008 00:30:12 -0000 1.1.2.4
***************
*** 411,416 ****
char* typestr )
{
! //printf( "attempting to find a model under model \"%s\" of type [%s]\n",
! // basename, typestr );
StgModel* base_model = world->GetModel( basename );
--- 411,416 ----
char* typestr )
{
! printf( "attempting to find a model under model \"%s\" of type [%s]\n",
! basename, typestr );
StgModel* base_model = world->GetModel( basename );
***************
*** 432,436 ****
// been used before
//return( model_match( base_model, addr, typestr, this->devices ) );
! return( base_model->GetUnsubcribedModelOfType( typestr ) );
}
--- 432,436 ----
// been used before
//return( model_match( base_model, addr, typestr, this->devices ) );
! return( base_model->GetUnsubscribedModelOfType( typestr ) );
}
Index: p_position.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstageplugin/Attic/p_position.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** p_position.cc 24 Dec 2007 11:20:37 -0000 1.1.2.3
--- p_position.cc 8 Jan 2008 00:30:12 -0000 1.1.2.4
***************
*** 293,301 ****
//ppd.pos.pz = mod->est_pose.z;
ppd.pos.pa = mod->est_pose.a;
!
! ppd.vel.px = mod->velocity.x;
! ppd.vel.py = mod->velocity.y;
! //ppd.vel.pz = mod->velocity.z;
! ppd.vel.pa = mod->velocity.a;
// etc
--- 293,302 ----
//ppd.pos.pz = mod->est_pose.z;
ppd.pos.pa = mod->est_pose.a;
!
! stg_velocity_t v = mod->Velocity();
!
! ppd.vel.px = v.x;
! ppd.vel.py = v.y;
! ppd.vel.pa = v.a;
// etc
Index: p_graphics3d.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstageplugin/Attic/p_graphics3d.cc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** p_graphics3d.cc 24 Dec 2007 11:20:37 -0000 1.1.2.2
--- p_graphics3d.cc 8 Jan 2008 00:30:12 -0000 1.1.2.3
***************
*** 41,45 ****
//#include <glext.h>
! extern GList* dl_list;
// DOCUMENTATION ------------------------------------------------------------
--- 41,45 ----
//#include <glext.h>
! //extern GList* dl_list;
// DOCUMENTATION ------------------------------------------------------------
***************
*** 74,78 ****
rebuild_displaylist = FALSE;
! dl_list = g_list_append( dl_list, (void*)displaylist );
}
--- 74,78 ----
rebuild_displaylist = FALSE;
! //dl_list = g_list_append( dl_list, (void*)displaylist );
}
Index: p_simulation.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/libstageplugin/Attic/p_simulation.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** p_simulation.cc 29 Nov 2007 07:59:00 -0000 1.1.2.3
--- p_simulation.cc 8 Jan 2008 00:30:12 -0000 1.1.2.4
***************
*** 140,153 ****
//stg_world_resume( world );
! StgDriver::world->paused = FALSE;
!
// this causes Driver::Update() to be called even when the device is
// not subscribed
driver->alwayson = TRUE;
-
- // Start the device thread; spawns a new thread and executes
- // StgDriver::Main(), which contains the main loop for the driver.
- //puts( "\nStarting thread" );
- //driver->StartThread();
puts( "" ); // end the Stage startup line
--- 140,148 ----
//stg_world_resume( world );
! StgDriver::world->Start();
!
// this causes Driver::Update() to be called even when the device is
// not subscribed
driver->alwayson = TRUE;
puts( "" ); // end the Stage startup line
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
