[Robotflow-cvs] RobotFlow/Player/src PlayerHeading.cc,1.7,1.8 PlayerLaser.cc,1.6,1.7 PlayerPTZ.cc,1.8,1.9 PlayerVelocity.cc,1.8,1.9

[Dominic L. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Player/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21473

Modified Files:
	PlayerHeading.cc PlayerLaser.cc PlayerPTZ.cc PlayerVelocity.cc 
Log Message:
compiling version with player 1.5

Index: PlayerLaser.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerLaser.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PlayerLaser.cc	27 May 2004 00:27:39 -0000	1.6
--- PlayerLaser.cc	2 Jun 2004 18:39:35 -0000	1.7
***************
*** 102,111 ****
       }
  
!      Vector<int> *rangeVect = Vector<int>::alloc(m_laserProxy->range_count);
!      Vector<int> *intensityVect = Vector<int>::alloc(m_laserProxy->range_count);
  
       //copy range & intensity values
!      for (int i = 0; i < m_laserProxy->range_count; i++) {
!        (*rangeVect)[i] = m_laserProxy->ranges[i];
         (*intensityVect)[i] = m_laserProxy->intensities[i];
       }
--- 102,111 ----
       }
  
!      Vector<int> *rangeVect = Vector<int>::alloc(m_laserProxy->RangeCount());
!      Vector<int> *intensityVect = Vector<int>::alloc(m_laserProxy->RangeCount());
  
       //copy range & intensity values
!      for (int i = 0; i < m_laserProxy->RangeCount(); i++) {
!        (*rangeVect)[i] = (int)(*m_laserProxy)[i];
         (*intensityVect)[i] = m_laserProxy->intensities[i];
       }

Index: PlayerPTZ.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerPTZ.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PlayerPTZ.cc	27 May 2004 00:27:39 -0000	1.8
--- PlayerPTZ.cc	2 Jun 2004 18:39:35 -0000	1.9
***************
*** 173,179 ****
  
  
!       int pan_command = m_ptzProxy->pan;
!       int tilt_command = m_ptzProxy->tilt;
!       int zoom_command = m_ptzProxy->zoom;
  
        //reading & checking validity of inputs.
--- 173,179 ----
  
  
!       int pan_command = (int)(m_ptzProxy->pan * M_PI / 180.0);
!       int tilt_command = (int)(m_ptzProxy->tilt * M_PI / 180.0);
!       int zoom_command = (int)(m_ptzProxy->zoom);
  
        //reading & checking validity of inputs.
***************
*** 222,228 ****
  
        //output current camera position
!       (*outputs[m_panOutID].buffer)[count]  = ObjectRef(Int::alloc(m_ptzProxy->pan * 10));
!       (*outputs[m_tiltOutID].buffer)[count] = ObjectRef(Int::alloc(m_ptzProxy->tilt * 10));
!       (*outputs[m_zoomOutID].buffer)[count] = ObjectRef(Int::alloc(m_ptzProxy->zoom * 10));
  
     }
--- 222,228 ----
  
        //output current camera position
!       (*outputs[m_panOutID].buffer)[count]  = ObjectRef(Int::alloc((int) (m_ptzProxy->pan * 10 * M_PI / 180.0)));
!       (*outputs[m_tiltOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->tilt * 10 * M_PI / 180.0 )));
!       (*outputs[m_zoomOutID].buffer)[count] = ObjectRef(Int::alloc((int) (m_ptzProxy->zoom * 10)));
  
     }

Index: PlayerHeading.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerHeading.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PlayerHeading.cc	9 Jul 2003 14:25:14 -0000	1.7
--- PlayerHeading.cc	2 Jun 2004 18:39:35 -0000	1.8
***************
*** 93,107 ****
  
  
! 
!      int absolute_heading = m_positionProxy->theta;
  
       //getting abs value
       if (!absHeadingValue->isNil()) {
!        absolute_heading= dereference_cast<int>(absHeadingValue);
       }
  
       //adding relative value
       if (!relHeadingValue->isNil()) {
!        absolute_heading += dereference_cast<int>(relHeadingValue);
       }
  
--- 93,106 ----
  
  
!      double absolute_heading = (int)(m_positionProxy->theta);
  
       //getting abs value
       if (!absHeadingValue->isNil()) {
!        absolute_heading= (int)((double)dereference_cast<int>(absHeadingValue) * M_PI / 180.0);
       }
  
       //adding relative value
       if (!relHeadingValue->isNil()) {
!        absolute_heading += (int)((double)dereference_cast<int>(relHeadingValue) * M_PI / 180.0);
       }
  
***************
*** 110,114 ****
  
       
!      (*outputs[m_HeadingID].buffer)[count] = ObjectRef(Int::alloc(absolute_heading));
    }
  
--- 109,113 ----
  
       
!      (*outputs[m_HeadingID].buffer)[count] = ObjectRef(Int::alloc((int)absolute_heading));
    }
  

Index: PlayerVelocity.cc
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Player/src/PlayerVelocity.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PlayerVelocity.cc	27 May 2004 00:27:39 -0000	1.8
--- PlayerVelocity.cc	2 Jun 2004 18:39:35 -0000	1.9
***************
*** 170,176 ****
  
       //write output
!      (*outputs[m_xposID].buffer)[count] = ObjectRef(Int::alloc(m_positionProxy->Xpos()));
!      (*outputs[m_yposID].buffer)[count] = ObjectRef(Int::alloc(m_positionProxy->Ypos()));
!      (*outputs[m_thetaID].buffer)[count] = ObjectRef(Int::alloc(m_positionProxy->Theta()));
  
     }
--- 170,176 ----
  
       //write output
!      (*outputs[m_xposID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Xpos()));
!      (*outputs[m_yposID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Ypos()));
!      (*outputs[m_thetaID].buffer)[count] = ObjectRef(Int::alloc((int) m_positionProxy->Theta()));
  
     }