[simspark-cvs] simspark/contrib/agentspark hoap2behavior.cpp, 1.1.2.1, 1.1.2.2 hoap2behavior.h, 1.1.2.1, 1.1.2.2

[Markus R. <rol...@us...>]

Update of /cvsroot/simspark/simspark/contrib/agentspark
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21576

Modified Files:
      Tag: WIN32
	hoap2behavior.cpp hoap2behavior.h 
Log Message:
- adapt to changed joint perceptor parameter names

Index: hoap2behavior.h
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/agentspark/Attic/hoap2behavior.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** hoap2behavior.h	23 Feb 2007 19:58:20 -0000	1.1.2.1
--- hoap2behavior.h	25 Feb 2007 19:05:00 -0000	1.1.2.2
***************
*** 33,40 ****
          float angle;
  
!         /** joint angle rate */
!         float rate;
! 
!         HingeJointSense() : angle(0), rate(0) {};
      };
  
--- 33,37 ----
          float angle;
  
!         HingeJointSense() : angle(0) {};
      };
  
***************
*** 47,57 ****
          float angle2;
  
!         /** joint angle rate axis 1*/
!         float rate1;
! 
!         /** joint angle rate axis 2*/
!         float rate2;
! 
!         UniversalJointSense() : angle1(0), angle2(0), rate1(0), rate2(0) {};
      };
  
--- 44,48 ----
          float angle2;
  
!         UniversalJointSense() : angle1(0), angle2(0) {};
      };
  

Index: hoap2behavior.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/agentspark/Attic/hoap2behavior.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** hoap2behavior.cpp	23 Feb 2007 19:58:20 -0000	1.1.2.1
--- hoap2behavior.cpp	25 Feb 2007 19:05:00 -0000	1.1.2.2
***************
*** 133,155 ****
  
      // try to read axis1 angle
!     if (! predicate.GetValue(iter,"axis1", sense.angle1))
      {
          cerr << "(Hoap2Behavior) could not parse universal joint angle1!" << endl;
          return;
      }
!     // try to read axis1 rate
!     if (! predicate.GetValue(iter,"rate1", sense.rate1))
!     {
!         cerr << "(Hoap2Behavior) could not parse universal joint rate1!" << endl;
!         return;
!     }   
      // try to read axis2 angle
!     if (! predicate.GetValue(iter,"axis2", sense.angle2))
!     {
!         cerr << "(Hoap2Behavior) could not parse universal joint angle2!" << endl;
!         return;
!     }   
!     // try to read axis2 rate
!     if (! predicate.GetValue(iter,"rate2", sense.rate2))
      {
          cerr << "(Hoap2Behavior) could not parse universal joint rate2!" << endl;
--- 133,144 ----
  
      // try to read axis1 angle
!     if (! predicate.GetValue(iter,"ax1", sense.angle1))
      {
          cerr << "(Hoap2Behavior) could not parse universal joint angle1!" << endl;
          return;
      }
! 
      // try to read axis2 angle
!     if (! predicate.GetValue(iter,"ax2", sense.angle2))
      {
          cerr << "(Hoap2Behavior) could not parse universal joint rate2!" << endl;