[Gcblue-commits] gcb_wx/include/sim tcAeroAirObject.h,1.6,1.7 tcAirObject.h,1.11,1.12 tcMissileObjec
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-11-07 03:41:51
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4233/include/sim Modified Files: tcAeroAirObject.h tcAirObject.h tcMissileObject.h tcRadar.h Log Message: Added optical sensor model, fixed generic model display for sensor tracks Index: tcAirObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirObject.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcAirObject.h 9 Aug 2004 02:35:14 -0000 1.11 --- tcAirObject.h 7 Nov 2004 03:40:43 -0000 1.12 *************** *** 80,85 **** tcCommandObject commandObj; ! virtual void UpdateHeading(float dt_s); float maxPitch_rad; ///< user imposed restriction to pitch angle }; --- 80,86 ---- tcCommandObject commandObj; ! virtual void UpdateEffects(); virtual void UpdateHeading(float dt_s); + virtual void UpdateSpeed(float dt_s); float maxPitch_rad; ///< user imposed restriction to pitch angle }; Index: tcAeroAirObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAeroAirObject.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcAeroAirObject.h 17 Aug 2004 02:22:56 -0000 1.6 --- tcAeroAirObject.h 7 Nov 2004 03:40:43 -0000 1.7 *************** *** 59,62 **** --- 59,63 ---- protected: virtual void UpdateClimb(float dt_s); + virtual void UpdateEffects(); virtual void UpdateHeading(float dt_s); virtual void Update(double afStatusTime); Index: tcMissileObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMissileObject.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tcMissileObject.h 17 Aug 2004 02:22:56 -0000 1.12 --- tcMissileObject.h 7 Nov 2004 03:40:43 -0000 1.13 *************** *** 59,63 **** tcMissileDBObject *mpDBObject; // pointer to valid database obj ! void Clear(void); void LaunchFrom(tcGameObject* obj, unsigned nLauncher); void RandInitNear(float afLon_deg, float afLat_deg); --- 59,63 ---- tcMissileDBObject *mpDBObject; // pointer to valid database obj ! void Clear(); void LaunchFrom(tcGameObject* obj, unsigned nLauncher); void RandInitNear(float afLon_deg, float afLat_deg); *************** *** 66,73 **** --- 66,76 ---- virtual void UpdateGuidance(double afStatusTime); virtual void SetHeading(float afNewHeading) {mfGoalHeading_rad=afNewHeading;} + teAltitudeMode GetCurrentAltitudeMode(); + teGuidanceMode GetCurrentGuidanceMode(); virtual void SetSpeed(float afNewSpeed) {mfGoalSpeed_kts=afNewSpeed;} virtual tcRadar* GetSensorState() {return &mcSensorState;} virtual void DesignateTarget(long anID); virtual int GetGuidanceParameters(tsGuidanceParameters& gp); + float RuntimeRemaining(); void PrintToFile(tcFile&); void SaveToFile(tcFile& file); *************** *** 81,89 **** tcMissileObject(tcMissileDBObject *obj); ~tcMissileObject(); - - private: - teAltitudeMode GetCurrentAltitudeMode(); - teGuidanceMode GetCurrentGuidanceMode(); - }; #endif \ No newline at end of file --- 84,87 ---- Index: tcRadar.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcRadar.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcRadar.h 6 Nov 2004 15:13:40 -0000 1.9 --- tcRadar.h 7 Nov 2004 03:40:43 -0000 1.10 *************** *** 79,82 **** --- 79,83 ---- virtual bool IsCommandReceiver() {return isCommandReceiver;} virtual bool IsSemiactive() const {return isSemiactive;} + virtual void SetCommandState(bool state); virtual void SetIlluminator(long illum_id, unsigned sensor_idx); |