Update of /cvsroot/playerstage/code/player/server/drivers/shell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1338/server/drivers/shell
Modified Files:
readlog.cc writelog.cc
Log Message:
applied patch 1749747 to transition to 3d pose structures
Index: writelog.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/writelog.cc,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** writelog.cc 9 Jun 2007 01:28:26 -0000 1.77
--- writelog.cc 9 Jul 2007 17:18:02 -0000 1.78
***************
*** 946,950 ****
geom->pose.px,
geom->pose.py,
! geom->pose.pa,
geom->size.sl,
geom->size.sw);
--- 946,950 ----
geom->pose.px,
geom->pose.py,
! geom->pose.pyaw,
geom->size.sl,
geom->size.sw);
***************
*** 1021,1025 ****
gdata->pose.px,
gdata->pose.py,
! gdata->pose.pa,
gdata->size.sl,
gdata->size.sw);
--- 1021,1025 ----
gdata->pose.px,
gdata->pose.py,
! gdata->pose.pyaw,
gdata->size.sl,
gdata->size.sw);
***************
*** 1128,1132 ****
geom->poses[i].px,
geom->poses[i].py,
! geom->poses[i].pa);
return(0);
--- 1128,1132 ----
geom->poses[i].px,
geom->poses[i].py,
! geom->poses[i].pyaw);
return(0);
***************
*** 1156,1160 ****
geom->poses[i].px,
geom->poses[i].py,
! geom->poses[i].pa);
return(0);
--- 1156,1160 ----
geom->poses[i].px,
geom->poses[i].py,
! geom->poses[i].pyaw);
return(0);
***************
*** 1735,1739 ****
geom->poses[i].px,
geom->poses[i].py,
! geom->poses[i].pa);
return(0);
default:
--- 1735,1739 ----
geom->poses[i].px,
geom->poses[i].py,
! geom->poses[i].pyaw);
return(0);
default:
***************
*** 1771,1775 ****
geom->bumper_def[i].pose.px,
geom->bumper_def[i].pose.py,
! geom->bumper_def[i].pose.pa,
geom->bumper_def[i].length,
geom->bumper_def[i].radius);
--- 1771,1775 ----
geom->bumper_def[i].pose.px,
geom->bumper_def[i].pose.py,
! geom->bumper_def[i].pose.pyaw,
geom->bumper_def[i].length,
geom->bumper_def[i].radius);
***************
*** 1801,1805 ****
geom->bumper_def[i].pose.px,
geom->bumper_def[i].pose.py,
! geom->bumper_def[i].pose.pa,
geom->bumper_def[i].length,
geom->bumper_def[i].radius);
--- 1801,1805 ----
geom->bumper_def[i].pose.px,
geom->bumper_def[i].pose.py,
! geom->bumper_def[i].pose.pyaw,
geom->bumper_def[i].length,
geom->bumper_def[i].radius);
Index: readlog.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/shell/readlog.cc,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** readlog.cc 9 Jun 2007 01:28:26 -0000 1.47
--- readlog.cc 9 Jul 2007 17:18:02 -0000 1.48
***************
*** 1533,1537 ****
geom->pose.px = atof(tokens[7]);
geom->pose.py = atof(tokens[8]);
! geom->pose.pa = atof(tokens[9]);
geom->size.sl = atof(tokens[10]);
geom->size.sw = atof(tokens[11]);
--- 1533,1537 ----
geom->pose.px = atof(tokens[7]);
geom->pose.py = atof(tokens[8]);
! geom->pose.pyaw = atof(tokens[9]);
geom->size.sl = atof(tokens[10]);
geom->size.sw = atof(tokens[11]);
***************
*** 1617,1621 ****
geom.poses[count].px = atof(tokens[i]);
geom.poses[count].py = atof(tokens[i+1]);
! geom.poses[count].pa = atof(tokens[i+2]);
count++;
}
--- 1617,1621 ----
geom.poses[count].px = atof(tokens[i]);
geom.poses[count].py = atof(tokens[i+1]);
! geom.poses[count].pyaw = atof(tokens[i+2]);
count++;
}
***************
*** 1656,1660 ****
geom->poses[count].px = atof(tokens[i]);
geom->poses[count].py = atof(tokens[i+1]);
! geom->poses[count].pa = atof(tokens[i+2]);
count++;
}
--- 1656,1660 ----
geom->poses[count].px = atof(tokens[i]);
geom->poses[count].py = atof(tokens[i+1]);
! geom->poses[count].pyaw = atof(tokens[i+2]);
count++;
}
***************
*** 1750,1754 ****
geom->pose.px = atof(tokens[7]);
geom->pose.py = atof(tokens[8]);
! geom->pose.pa = atof(tokens[9]);
geom->size.sl = atof(tokens[10]);
geom->size.sw = atof(tokens[11]);
--- 1750,1754 ----
geom->pose.px = atof(tokens[7]);
geom->pose.py = atof(tokens[8]);
! geom->pose.pyaw = atof(tokens[9]);
geom->size.sl = atof(tokens[10]);
geom->size.sw = atof(tokens[11]);
-------------------------------------------------------------------------
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
