[Gcblue-commits] gcb_wx/include/common simmath.h,1.5,1.6

[<ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/common
In directory sc8-pr-cvs1:/tmp/cvs-serv11677/include/common

Modified Files:
	simmath.h 
Log Message:


Index: simmath.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** simmath.h	3 Jan 2004 00:45:12 -0000	1.5
--- simmath.h	8 Jan 2004 23:54:26 -0000	1.6
***************
*** 162,170 ****
      float RangeToKm(const tsGeoPoint *apGeoPoint);
      float RangeToKm(tcKinematics& k);
      float RangeToKmAlt(tcKinematics& k);
      //float InterceptHeadingToTrack(tcTrack& track, float& afTimeToIntercept);
!     void GetInterceptData2D(tcTrack& track, float& rfHeading_rad, 
          float& rfTimeToIntercept);
!     void GetInterceptData3D(tcTrack& track, float& rfHeading_rad, 
          float& rfClimbAngle_rad, float& rfTimeToIntercept, float& rfRange_rad);
      void Serialize(tcFile& file, bool abLoad);
--- 162,171 ----
      float RangeToKm(const tsGeoPoint *apGeoPoint);
      float RangeToKm(tcKinematics& k);
+     float RangeToKm(const tcTrack& track);
      float RangeToKmAlt(tcKinematics& k);
      //float InterceptHeadingToTrack(tcTrack& track, float& afTimeToIntercept);
!     void GetInterceptData2D(const tcTrack& track, float& rfHeading_rad, 
          float& rfTimeToIntercept);
!     void GetInterceptData3D(const tcTrack& track, float& rfHeading_rad, 
          float& rfClimbAngle_rad, float& rfTimeToIntercept, float& rfRange_rad);
      void Serialize(tcFile& file, bool abLoad);