Update of /cvsroot/playerstage/code/player/server/drivers/mixed/p2os
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29131
Modified Files:
Tag: release-2-0-patches
p2os.cc sip.cc
Log Message:
fixed bumper counts
Index: sip.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/p2os/sip.cc,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -d -r1.20 -r1.20.2.1
*** sip.cc 20 Jan 2006 02:44:25 -0000 1.20
--- sip.cc 31 Jan 2007 21:18:13 -0000 1.20.2.1
***************
*** 92,101 ****
///////////////////////////////////////////////////////////////
// bumper
! data->bumper.bumpers_count = 10;
int j = 0;
! for(int i=4;i>=0;i--)
data->bumper.bumpers[j++] =
(unsigned char)((this->frontbumpers >> i) & 0x01);
! for(int i=4;i>=0;i--)
data->bumper.bumpers[j++] =
(unsigned char)((this->rearbumpers >> i) & 0x01);
--- 92,101 ----
///////////////////////////////////////////////////////////////
// bumper
! data->bumper.bumpers_count = PlayerRobotParams[param_idx].NumFrontBumpers +
PlayerRobotParams[param_idx].NumRearBumpers;
int j = 0;
! for(int i=PlayerRobotParams[param_idx].NumFrontBumpers-1;i>=0;i--)
data->bumper.bumpers[j++] =
(unsigned char)((this->frontbumpers >> i) & 0x01);
! for(int i=PlayerRobotParams[param_idx].NumRearBumpers-1;i>=0;i--)
data->bumper.bumpers[j++] =
(unsigned char)((this->rearbumpers >> i) & 0x01);
Index: p2os.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/p2os/p2os.cc,v
retrieving revision 1.68.2.1
retrieving revision 1.68.2.2
diff -C2 -d -r1.68.2.1 -r1.68.2.2
*** p2os.cc 6 Nov 2006 16:48:47 -0000 1.68.2.1
--- p2os.cc 31 Jan 2007 21:18:13 -0000 1.68.2.2
***************
*** 2274,2278 ****
}
player_bumper_geom_t geom;
! geom.bumper_def_count = PlayerRobotParams[param_idx].FrontBumpers +
PlayerRobotParams[param_idx].RearBumpers;
for(unsigned int ii = 0; ii < geom.bumper_def_count; ii++)
{
--- 2274,2278 ----
}
player_bumper_geom_t geom;
! geom.bumper_def_count = PlayerRobotParams[param_idx].NumFrontBumpers +
PlayerRobotParams[param_idx].NumRearBumpers;
for(unsigned int ii = 0; ii < geom.bumper_def_count; ii++)
{
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
