Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv29250
Modified Files:
Tag: projectx
universaljoint.h
Log Message:
merge from HEAD
Index: universaljoint.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/universaljoint.h,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** universaljoint.h 12 Feb 2006 11:36:52 -0000 1.3
--- universaljoint.h 17 Jun 2007 08:06:53 -0000 1.3.4.1
***************
*** 48,57 ****
\param axis a vector describing the axis in relative coordinates
*/
! void SetAxis1(salt::Vector3f & axis);
/** This function sets up the second axis of the joint
\param axis a vector describing the axis in local coordinates
*/
! void SetAxis2(salt::Vector3f & axis);
/** returns the vector describing one of the two axis
--- 48,57 ----
\param axis a vector describing the axis in relative coordinates
*/
! void SetAxis1(const salt::Vector3f & axis);
/** This function sets up the second axis of the joint
\param axis a vector describing the axis in local coordinates
*/
! void SetAxis2(const salt::Vector3f & axis);
/** returns the vector describing one of the two axis
***************
*** 59,63 ****
\param idx index of the desired axis
*/
! salt::Vector3f GetAxis(EAxisIndex idx);
/** returns one of the axis angles in degrees, measured between
--- 59,63 ----
\param idx index of the desired axis
*/
! salt::Vector3f GetAxis(EAxisIndex idx) const;
/** returns one of the axis angles in degrees, measured between
***************
*** 65,72 ****
environment.
*/
! float GetAngle(EAxisIndex idx);
/** returns the time derivate of one of the hinge angles */
! float GetAngleRate(EAxisIndex idx);
/** sets a joint parameter value */
--- 65,72 ----
environment.
*/
! float GetAngle(EAxisIndex idx) const;
/** returns the time derivate of one of the hinge angles */
! float GetAngleRate(EAxisIndex idx) const;
/** sets a joint parameter value */
|
