simspark-cvs

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

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

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


Index: universaljoint.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/universaljoint.cpp,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** universaljoint.cpp	12 Feb 2006 11:36:52 -0000	1.3
--- universaljoint.cpp	17 Jun 2007 08:07:32 -0000	1.3.4.1
***************
*** 79,83 ****
  }
  
! void UniversalJoint::SetAxis1(Vector3f & axis)
  {
      Vector3f first(GetWorldTransform().Rotate(axis));
--- 79,83 ----
  }
  
! void UniversalJoint::SetAxis1(const Vector3f & axis)
  {
      Vector3f first(GetWorldTransform().Rotate(axis));
***************
*** 85,89 ****
  }
  
! void UniversalJoint::SetAxis2(Vector3f & axis)
  {
      Vector3f second(GetWorldTransform().Rotate(axis));
--- 85,89 ----
  }
  
! void UniversalJoint::SetAxis2(const Vector3f & axis)
  {
      Vector3f second(GetWorldTransform().Rotate(axis));
***************
*** 91,95 ****
  }
  
! Vector3f UniversalJoint::GetAxis(EAxisIndex idx)
  {
      Vector3f vec(0,0,0);
--- 91,95 ----
  }
  
! Vector3f UniversalJoint::GetAxis(EAxisIndex idx) const
  {
      Vector3f vec(0,0,0);
***************
*** 118,122 ****
  }
  
! float UniversalJoint::GetAngle(EAxisIndex idx)
  {
      switch (idx)
--- 118,122 ----
  }
  
! float UniversalJoint::GetAngle(EAxisIndex idx) const
  {
      switch (idx)
***************
*** 133,137 ****
  }
  
! float UniversalJoint::GetAngleRate(EAxisIndex idx)
  {
      switch (idx)
--- 133,137 ----
  }
  
! float UniversalJoint::GetAngleRate(EAxisIndex idx) const
  {
      switch (idx)