[Gcblue-commits] gcb_wx/include/common math_constants.h,1.9,1.10 simmath.h,1.27,1.28
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-03-07 01:54:29
|
Update of /cvsroot/gcblue/gcb_wx/include/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31072/include/common Modified Files: math_constants.h simmath.h Log Message: Passive sonar seeker work Index: simmath.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** simmath.h 2 Mar 2005 22:28:35 -0000 1.27 --- simmath.h 7 Mar 2005 01:54:18 -0000 1.28 *************** *** 89,92 **** --- 89,93 ---- #define TRACK_ACTIVE 0x20 #define TRACK_TRIANGULATED 0x40 + #define TRACK_BEARINGRATE_VALID 0x80 class tcTrack *************** *** 99,102 **** --- 100,104 ---- float mfHeading_rad; float mfClimbAngle_rad; + float bearingRate_radps; ///< bearing rate in rad/s for bearing-only tracks double mfTimestamp; long mnID; *************** *** 113,117 **** mfLon_rad=0;mfLat_rad=0;mfAlt_m=0; mfSpeed_kts=0;mfHeading_rad=0;mfTimestamp=0; ! mnID=0;mfClimbAngle_rad=0;mnFlags = 0; mnPassivePlatformID = -1; } --- 115,119 ---- mfLon_rad=0;mfLat_rad=0;mfAlt_m=0; mfSpeed_kts=0;mfHeading_rad=0;mfTimestamp=0; ! mnID=0;mfClimbAngle_rad=0;bearingRate_radps=0;mnFlags = 0; mnPassivePlatformID = -1; } *************** *** 175,179 **** float mfSpeed_kts; ///< [kts] - float CalculateCollisionPoint(const tcKinematics& collider, float& dxi, float& dyi, float& dzi); float CalculateGroundImpactPoint(float terrainHeight_m, double& lon_rad, double& lat_rad); --- 177,180 ---- *************** *** 184,187 **** --- 185,189 ---- void PredictPosition(float dt_s, double& lon_rad, double& lat_rad, float& alt_m); + float BearingRateTo(float range_km, float bearing_rad, float speed_kts, float heading_rad); float HeadingToTrack(const tcTrack& track); float HeadingToGeoRad(const GeoPoint *apGeoPoint); Index: math_constants.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/math_constants.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** math_constants.h 6 Nov 2004 15:13:39 -0000 1.9 --- math_constants.h 7 Mar 2005 01:54:18 -0000 1.10 *************** *** 40,43 **** --- 40,44 ---- #define C_DEGTOM 111120.0f #define C_KTSTOMPS 0.51444444f + #define C_KTSTOKMPS 0.51444444e-3f #define C_MPSTOKTS 1.94384450f #define C_MPSTODEGPS 8.999280e-006f |