[Gcblue-commits] gcb_wx/include/sim tcGameObject.h,1.21,1.22 tcLauncherState.h,1.7,1.8 tcMapView.h,1
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/include/sim tcGameObject.h,1.21,1.22 tcLauncherState.h,1.7,1.8 tcMapView.h,1.21,1.22 tcMissileObject.h,1.9,1.10 tcPlatformObject.h,1.17,1.18 tcSimState.h,1.24,1.25
|
From: Dewitt C. <ddc...@us...> - 2004-07-19 00:52:38
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28586/include/sim Modified Files: tcGameObject.h tcLauncherState.h tcMapView.h tcMissileObject.h tcPlatformObject.h tcSimState.h Log Message: Index: tcGameObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** tcGameObject.h 18 Jul 2004 03:18:00 -0000 1.21 --- tcGameObject.h 19 Jul 2004 00:52:27 -0000 1.22 *************** *** 46,49 **** --- 46,50 ---- class tcCreateStream; class tcUpdateStream; + class tcLauncher; /** *************** *** 137,145 **** virtual void UpdateEffects(); virtual void DesignateDatum(tcPoint p) {} ! virtual void DesignateLauncherDatum(tcPoint p, unsigned int anLauncher) {} virtual bool DesignateLauncherTarget(tnPoolIndex anID, unsigned anLauncher) {return false;} virtual void DesignateTarget(long anID) {} virtual void GetDatum(tsGeoPoint& p) {} ! virtual void GetLauncherState(tcLauncherState*& pLauncherState) {pLauncherState=NULL;} float GetTerrainElevation() {return mcTerrain.mfHeight_m;} virtual void Launch(tnPoolIndex& rnKey, unsigned& rnLauncher) {} --- 138,147 ---- virtual void UpdateEffects(); virtual void DesignateDatum(tcPoint p) {} ! virtual void DesignateLauncherDatum(tsGeoPoint p, unsigned int anLauncher) {} virtual bool DesignateLauncherTarget(tnPoolIndex anID, unsigned anLauncher) {return false;} virtual void DesignateTarget(long anID) {} virtual void GetDatum(tsGeoPoint& p) {} ! virtual void GetLauncherState(tcLauncherState*& pLauncherState) {pLauncherState = NULL;} ! virtual tcLauncher* GetLauncher(unsigned idx) {return 0;} float GetTerrainElevation() {return mcTerrain.mfHeight_m;} virtual void Launch(tnPoolIndex& rnKey, unsigned& rnLauncher) {} Index: tcMissileObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMissileObject.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcMissileObject.h 4 Jun 2004 21:39:22 -0000 1.9 --- tcMissileObject.h 19 Jul 2004 00:52:27 -0000 1.10 *************** *** 44,49 **** --- 44,53 ---- float mfGoalSpeed_kts; double mfInterceptTime; + + // are all 3 of these necessary? needs refactoring float mfLastGuidanceUpdate; + double guidanceStatusTime; float mfGuidanceUpdateInterval; + tsGeoPoint msWaypoint; // nav datum float mfRangeToObjective_km; // for segment determination *************** *** 54,57 **** --- 58,62 ---- void Clear(void); + void LaunchFrom(tcGameObject* obj, unsigned nLauncher); void RandInitNear(float afLon_deg, float afLat_deg); virtual void Update(double afStatusTime); *************** *** 74,77 **** --- 79,87 ---- tcMissileObject(tcMissileDBObject *obj); ~tcMissileObject(); + + private: + teAltitudeMode GetCurrentAltitudeMode(); + teGuidanceMode GetCurrentGuidanceMode(); + }; #endif \ No newline at end of file Index: tcLauncherState.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncherState.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcLauncherState.h 24 May 2004 00:14:46 -0000 1.7 --- tcLauncherState.h 19 Jul 2004 00:52:27 -0000 1.8 *************** *** 84,87 **** --- 84,88 ---- void AddFullLauncher(tnPoolIndex anKey, float azimuth_rad); const char* GetFireControlSensorClass(unsigned nLauncher) const; + tcLauncher* GetLauncher(unsigned int nLauncher); const tcLauncher* GetLauncher(unsigned nLauncher) const; const char* GetLauncherChildClass(unsigned nLauncher) const; *************** *** 108,112 **** void SetFireControlSensor(unsigned nLauncher, tcRadar* radar, unsigned sensorIdx); int SetLaunch(int nLauncher, int quantity); ! bool SetLauncherDatum(unsigned nLauncher, double lon_rad, double lat_rad); bool SetLauncherTarget(unsigned nLauncher, long targetID); void SetParent(tcGameObject *obj) {parent = obj;} --- 109,114 ---- void SetFireControlSensor(unsigned nLauncher, tcRadar* radar, unsigned sensorIdx); int SetLaunch(int nLauncher, int quantity); ! bool SetLauncherDatum(unsigned nLauncher, ! double lon_rad, double lat_rad, float alt_m); bool SetLauncherTarget(unsigned nLauncher, long targetID); void SetParent(tcGameObject *obj) {parent = obj;} Index: tcPlatformObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** tcPlatformObject.h 24 May 2004 00:14:46 -0000 1.17 --- tcPlatformObject.h 19 Jul 2004 00:52:27 -0000 1.18 *************** *** 85,94 **** virtual void Clear(); virtual void DesignateDatum(tcPoint p); ! virtual void DesignateLauncherDatum(tcPoint p, unsigned int anLauncher); virtual bool DesignateLauncherTarget(tnPoolIndex anID, unsigned anLauncher); virtual void DesignateTarget(long anID); virtual void GetDatum(tsGeoPoint& p) {p=msTargetDatum;} virtual int GetLauncherQuantity(unsigned anLauncher); virtual void GetLauncherState(tcLauncherState*& pLauncherState) {pLauncherState=&mcLauncherState;} unsigned GetSensorCount() const; // virtual void GetSensorState(tcSensorState** aapSensorState, int& rnCount); --- 85,96 ---- virtual void Clear(); virtual void DesignateDatum(tcPoint p); ! virtual void DesignateLauncherDatum(tsGeoPoint p, unsigned int anLauncher); virtual bool DesignateLauncherTarget(tnPoolIndex anID, unsigned anLauncher); virtual void DesignateTarget(long anID); virtual void GetDatum(tsGeoPoint& p) {p=msTargetDatum;} + virtual tcLauncher* GetLauncher(unsigned idx); virtual int GetLauncherQuantity(unsigned anLauncher); virtual void GetLauncherState(tcLauncherState*& pLauncherState) {pLauncherState=&mcLauncherState;} + unsigned GetSensorCount() const; // virtual void GetSensorState(tcSensorState** aapSensorState, int& rnCount); Index: tcSimState.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** tcSimState.h 24 May 2004 00:14:46 -0000 1.24 --- tcSimState.h 19 Jul 2004 00:52:27 -0000 1.25 *************** *** 62,65 **** --- 62,66 ---- class tcGoalTracker; class tcStream; + class tcMissileObject; #define N_GAME_OBJECTS 1024 *************** *** 103,107 **** static tcSimState* Get(); ///< accessor for singleton instance ! void AddLaunchedPlatform(long anNewKey, tcGameObject *plaunchingplatform, unsigned anLauncher); void AddPlatform(tcGameObject *pplat); void AddPlatformWithKey(tcGameObject *pplat, tnPoolIndex key); --- 104,108 ---- static tcSimState* Get(); ///< accessor for singleton instance ! void AddLaunchedPlatform(long newKey, tcGameObject* launchingPlatform, unsigned nLauncher); void AddPlatform(tcGameObject *pplat); void AddPlatformWithKey(tcGameObject *pplat, tnPoolIndex key); *************** *** 126,130 **** void DesignateTarget(long anKey, long anTargetKey); void DesignateDatum(long anKey, tcPoint p); ! void DesignateLauncherDatum(tnPoolIndex anKey, tcPoint p, unsigned anLauncher); bool DesignateLauncherTarget(tnPoolIndex anKey, tnPoolIndex anTargetKey, unsigned anLauncher); void GenerateRandomGoals(); --- 127,131 ---- void DesignateTarget(long anKey, long anTargetKey); void DesignateDatum(long anKey, tcPoint p); ! void DesignateLauncherDatum(tnPoolIndex anKey, tsGeoPoint p, unsigned anLauncher); bool DesignateLauncherTarget(tnPoolIndex anKey, tnPoolIndex anTargetKey, unsigned anLauncher); void GenerateRandomGoals(); *************** *** 189,194 **** DateZulu dateZulu; MultiplayerMode multiplayerMode; ///< multiplayer mode, default = MM_OFF ! long timeAcceleration; ///< 0 - paused, 1 - normal, N - Nx accelerated time float GetFractionalDamage(float afDamage, tcGameObject *apGameObj); bool IsDetectedESM(tcESMSensor* apESM, const tcRadar* apEmitterRadar, float& rfAz_rad); --- 190,197 ---- DateZulu dateZulu; MultiplayerMode multiplayerMode; ///< multiplayer mode, default = MM_OFF ! long timeAcceleration; ///< 0 - paused, 1 - normal, N - Nx accelerated time + void EvaluateGuidedMissileHit(tcMissileObject* missile, tcGameObject* target); + void EvaluateImpactMissileHit(tcMissileObject* missile); float GetFractionalDamage(float afDamage, tcGameObject *apGameObj); bool IsDetectedESM(tcESMSensor* apESM, const tcRadar* apEmitterRadar, float& rfAz_rad); Index: tcMapView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapView.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** tcMapView.h 24 Jun 2004 21:35:40 -0000 1.21 --- tcMapView.h 19 Jul 2004 00:52:27 -0000 1.22 *************** *** 330,340 **** Gdiplus::Image* GetSymbol(teAffiliation aeAffiliation, teSymbol aeSymbol); Gdiplus::Image* LoadSymbolImage(char *azSymbolName); void DrawNTDSSurface(Gdiplus::Graphics *apGraphics, teAffiliation affil); void DrawNTDSAirFW(Gdiplus::Graphics *apGraphics, teAffiliation affil); void DrawNTDSAirRW(Gdiplus::Graphics *apGraphics, teAffiliation affil); void DrawNTDSMissile(Gdiplus::Graphics *apGraphics, teAffiliation affil); void DrawNTDSUnknown(Gdiplus::Graphics *apGraphics, teAffiliation affil); int DrawSymbol(Gdiplus::Graphics *apGraphics, tcMapObj *pMO); ! int DrawSymbol2(Gdiplus::Graphics *apGraphics, tcMapObj *pMO); --- 330,343 ---- Gdiplus::Image* GetSymbol(teAffiliation aeAffiliation, teSymbol aeSymbol); Gdiplus::Image* LoadSymbolImage(char *azSymbolName); + void DrawNTDSSurface(Gdiplus::Graphics *apGraphics, teAffiliation affil); + void DrawNTDSGround(Gdiplus::Graphics* graphics, teAffiliation affil); void DrawNTDSAirFW(Gdiplus::Graphics *apGraphics, teAffiliation affil); void DrawNTDSAirRW(Gdiplus::Graphics *apGraphics, teAffiliation affil); void DrawNTDSMissile(Gdiplus::Graphics *apGraphics, teAffiliation affil); void DrawNTDSUnknown(Gdiplus::Graphics *apGraphics, teAffiliation affil); + int DrawSymbol(Gdiplus::Graphics *apGraphics, tcMapObj *pMO); ! int DrawSymbol2(Gdiplus::Graphics* graphics, tcMapObj* pMO); |
