[Gcblue-commits] gcb_wx/include/common math_constants.h,1.8,1.9 simmath.h,1.23,1.24 tcOptions.h,1.8,
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-11-06 15:14:36
|
Update of /cvsroot/gcblue/gcb_wx/include/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31472/include/common Modified Files: math_constants.h simmath.h tcOptions.h Log Message: Added optical sensor model, fixed generic model display for sensor tracks Index: tcOptions.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcOptions.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcOptions.h 2 Oct 2004 22:41:32 -0000 1.8 --- tcOptions.h 6 Nov 2004 15:13:39 -0000 1.9 *************** *** 73,76 **** --- 73,79 ---- int debugLevel; + /// 0 - own-alliance only, 1 - raw track data, 2 - add true pitch roll if available, 3 - use true data if avail + int mn3DCheatMode; + tsOptionInfo maOptionInfo[N_OPTIONS]; int mnNumOptions; Index: simmath.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** simmath.h 1 Nov 2004 03:17:15 -0000 1.23 --- simmath.h 6 Nov 2004 15:13:39 -0000 1.24 *************** *** 134,138 **** --- 134,140 ---- bool IsSurface() {return ((mnClassification & PTYPE_SURFACE) != 0);} bool IsValid() {return mnID != -1;} + bool IsBearingOnly() const; void SetAllValid() {mnFlags |= 0x0F;} + float GetOrGuessAltitude() const; void GetPrediction(tcTrack& td, double mfTime); tcTrack PredictAhead(float timeDelta_s); Index: math_constants.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/math_constants.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** math_constants.h 12 Aug 2004 01:14:27 -0000 1.8 --- math_constants.h 6 Nov 2004 15:13:39 -0000 1.9 *************** *** 53,57 **** #define C_MTORAD 1.5678552e-7f #define C_RADARHOR 3.92482f ///< radar horizon in km = constant*sqrt(h in meters) ! namespace UnitConversions { --- 53,57 ---- #define C_MTORAD 1.5678552e-7f #define C_RADARHOR 3.92482f ///< radar horizon in km = constant*sqrt(h in meters) ! #define C_VISUALHOR 2.78f ///< visible horizon in km = constant*sqrt(h in meters) namespace UnitConversions { |