Update of /cvsroot/playerstage/code/player/server/drivers/map
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1338/server/drivers/map
Modified Files:
mapfile.cc
Log Message:
applied patch 1749747 to transition to 3d pose structures
Index: mapfile.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/map/mapfile.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mapfile.cc 5 Apr 2006 16:16:15 -0000 1.27
--- mapfile.cc 9 Jul 2007 17:18:00 -0000 1.28
***************
*** 129,133 ****
int negate;
int size_x, size_y;
! player_pose_t origin;
char* mapdata;
--- 129,133 ----
int negate;
int size_x, size_y;
! player_pose2d_t origin;
char* mapdata;
***************
*** 139,143 ****
public:
MapFile(ConfigFile* cf, int section, const char* file,
! double res, int neg, player_pose_t o);
~MapFile();
int Setup();
--- 139,143 ----
public:
MapFile(ConfigFile* cf, int section, const char* file,
! double res, int neg, player_pose2d_t o);
~MapFile();
int Setup();
***************
*** 157,161 ****
double resolution;
int negate;
! player_pose_t origin;
if(!(filename = cf->ReadFilename(section,"filename", NULL)))
--- 157,161 ----
double resolution;
int negate;
! player_pose2d_t origin;
if(!(filename = cf->ReadFilename(section,"filename", NULL)))
***************
*** 189,193 ****
// this one has no data or commands, just configs
MapFile::MapFile(ConfigFile* cf, int section, const char* file,
! double res, int neg, player_pose_t o)
: Driver(cf, section, true, PLAYER_MSGQUEUE_DEFAULT_MAXLEN, PLAYER_MAP_CODE)
{
--- 189,193 ----
// this one has no data or commands, just configs
MapFile::MapFile(ConfigFile* cf, int section, const char* file,
! double res, int neg, player_pose2d_t o)
: Driver(cf, section, true, PLAYER_MSGQUEUE_DEFAULT_MAXLEN, PLAYER_MAP_CODE)
{
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
