|
From: <mk...@us...> - 2003-04-25 20:36:45
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv1956/Include/SimData
Modified Files:
Quaternion.h Ref.h
Log Message:
see CHANGES.current
Index: Quaternion.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Quaternion.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Quaternion.h 18 Apr 2003 11:51:28 -0000 1.7
--- Quaternion.h 25 Apr 2003 20:36:07 -0000 1.8
***************
*** 333,344 ****
/**
* Convert a quaternion to Euler angles.
*/
static Vector3 MakeEulerAnglesFromQ(Quaternion const &q);
/**
* Construct a new quaternion from Euler angles.
*/
static Quaternion MakeQFromEulerAngles(double x, double y, double z);
!
/**
* String representation.
--- 333,361 ----
/**
* Convert a quaternion to Euler angles.
+ *
+ * X axis is roll.
+ * Y axis is pitch.
+ * Z axis is yaw.
*/
static Vector3 MakeEulerAnglesFromQ(Quaternion const &q);
/**
+ * Convert a quaternion to Modified Euler angles.
+ *
+ * X axis is pitch.
+ * Y axis is roll.
+ * Z axis is -yaw.
+ */
+ static Vector3 MakeModifiedEulerAnglesFromQ(Quaternion const &q);
+
+ /**
* Construct a new quaternion from Euler angles.
+ *
+ * @param x roll angle (radians)
+ * @param y pitch angle (radians)
+ * @param z yaw angle (radians)
*/
static Quaternion MakeQFromEulerAngles(double x, double y, double z);
!
/**
* String representation.
Index: Ref.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Ref.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Ref.h 24 Apr 2003 21:50:43 -0000 1.3
--- Ref.h 25 Apr 2003 20:36:07 -0000 1.4
***************
*** 217,220 ****
--- 217,235 ----
}
+ /**
+ * Comparison with other simdata pointers.
+ */
+ template <class Q>
+ inline bool operator!=(Ref<Q> const & p) const {
+ return _reference != p.get();
+ }
+
+ /**
+ * Comparison with other simdata pointers.
+ */
+ inline bool operator!=(Referenced const * p) const {
+ return _reference != p;
+ }
+
protected:
|