simspark-cvs

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30964

Modified Files:
      Tag: projectx
	hingejoint.cpp 
Log Message:
merge from HEAD


Index: hingejoint.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/hingejoint.cpp,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -d -r1.5 -r1.5.4.1
*** hingejoint.cpp	19 Feb 2006 13:15:26 -0000	1.5
--- hingejoint.cpp	17 Jun 2007 08:13:09 -0000	1.5.4.1
***************
*** 118,127 ****
  }
  
! float HingeJoint::GetAngle()
  {
      return gRadToDeg(dJointGetHingeAngle(mODEJoint));
  }
  
! float HingeJoint::GetAngleRate()
  {
      return gRadToDeg(dJointGetHingeAngleRate(mODEJoint));
--- 118,127 ----
  }
  
! float HingeJoint::GetAngle() const
  {
      return gRadToDeg(dJointGetHingeAngle(mODEJoint));
  }
  
! float HingeJoint::GetAngleRate() const
  {
      return gRadToDeg(dJointGetHingeAngleRate(mODEJoint));