Thread: [Gcblue-commits] gcb_wx/include/sim tcESMSensorState.h,1.1,1.2 tcFlightPort.h,1.3,1.4 tcLauncherStat

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	tcESMSensorState.h tcFlightPort.h tcLauncherState.h 
	tcRadarSensorState.h tcSensorState.h 
Log Message:
Added database class for flightports

Index: tcESMSensorState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcESMSensorState.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcESMSensorState.h	4 Dec 2003 05:15:22 -0000	1.1
--- tcESMSensorState.h	4 Jan 2004 22:24:52 -0000	1.2
***************
*** 50,54 ****
      tcESMDBObject *mpDBObj;
  
!     bool InitFromDB(tcDatabase *apDatabase, tnPoolIndex anKey);
      bool IsDetected(const tsESMTargetInfo& asETI, float& rfAz_rad);
      void Serialize(tcFile& file, bool mbLoad);
--- 50,54 ----
      tcESMDBObject *mpDBObj;
  
!     bool InitFromDB(tcDatabase *apDatabase, tnPoolIndex anKey, float mountAzimuth_rad);
      bool IsDetected(const tsESMTargetInfo& asETI, float& rfAz_rad);
      void Serialize(tcFile& file, bool mbLoad);

Index: tcFlightPort.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightPort.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcFlightPort.h	11 Nov 2003 11:42:43 -0000	1.3
--- tcFlightPort.h	4 Jan 2004 22:24:52 -0000	1.4
***************
*** 27,30 ****
--- 27,34 ----
  #include "tcGameObject.h"
  
+ namespace Database
+ {
+     class tcFlightportDBObject;
+ }
  
  /** Location info for air unit in flightport.
***************
*** 33,41 ****
  enum teLocation 
  {
!    NOWHERE,
!    HANGAR,   //< longer term storage or repair
!    READY,    //< out of hangar
!    LAUNCH,   //< ready to take off
!    TRANSIT   //< moving
  };
  enum teOperation
--- 37,45 ----
  enum teLocation 
  {
!    NOWHERE = 0,
!    HANGAR = 1,   ///< longer term storage or repair
!    READY = 2,    ///< out of hangar
!    LAUNCH = 3,   ///< ready to take off
!    TRANSIT = 4   ///< moving
  };
  enum teOperation
***************
*** 44,54 ****
     OP_TRANSIT,
     OP_UNLOAD,
!    OP_LOAD,   // or refuel
     OP_REPAIR,
     OP_CHECK
  };
  
! /* state info for units in the flightport
! ** This state info is unique info particular to flightport operations
  */
  class tcAirState
--- 48,59 ----
     OP_TRANSIT,
     OP_UNLOAD,
!    OP_LOAD,   ///< or refuel
     OP_REPAIR,
     OP_CHECK
  };
  
! /**
! * state info for units in the flightport
! * This state info is unique info particular to flightport operations
  */
  class tcAirState
***************
*** 101,105 ****
--- 106,112 ----
      size_t GetCount(void) {return units.size();}
      tsSpotInfo* GetCurrentSpotInfo(tcAirState *airstate);
+     unsigned GetHangarCapacity() const {return hangarCapacity;}
      std::vector<tsSpotInfo>* GetLocVector(teLocation loc);
+     void InitFromDatabase(Database::tcFlightportDBObject *dbObj);
      void InitRelPos(tcAirState *airstate);
      int Launch(int runway); // order unit on runway to take off

Index: tcLauncherState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncherState.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcLauncherState.h	4 Dec 2003 05:15:22 -0000	1.1
--- tcLauncherState.h	4 Jan 2004 22:24:52 -0000	1.2
***************
*** 35,41 ****
   * State for individual launcher.
   */
! typedef struct _ldata {
      int mbActive;
!     long mnDBKey; // key in launcher database
      tcLauncherDBObject *mpLauncherDBObj;
      long mnChildDBKey;
--- 35,42 ----
   * State for individual launcher.
   */
! struct tsLData
! {
      int mbActive;
!     long mnDBKey; ///< key in launcher database
      tcLauncherDBObject *mpLauncherDBObj;
      long mnChildDBKey;
***************
*** 43,52 ****
      float mfTimeToReady;
      unsigned int mnCurrent;
!     tsGeoPoint msDatum; // datum to pass to weapon nav guidance
!     tnPoolIndex mnTargetID; // track that seeker can acquire
      teWeaponLaunchMode meLaunchMode;
!     int mnTargetFlags;  // 0x01 - surface, 0x02 - air, 0x03 - land
      unsigned int mnPending;
! } tsLData;
  
  /**
--- 44,54 ----
      float mfTimeToReady;
      unsigned int mnCurrent;
!     tsGeoPoint msDatum; ///< datum to pass to weapon nav guidance
!     tnPoolIndex mnTargetID; ///< track that seeker can acquire
      teWeaponLaunchMode meLaunchMode;
!     int mnTargetFlags;  ///< 0x01 - surface, 0x02 - air, 0x03 - land
      unsigned int mnPending;
!     float pointingAngle; ///< boresight azimuth angle in radians relative nose/bow
! };
  
  /**
***************
*** 60,64 ****
      static tcDatabase *mpDatabase;
  
!     void AddFullLauncher(tcDatabase *pDatabase, tnPoolIndex anKey);
      int GetLauncherQuantity(unsigned anLauncher) {
          if ((int)anLauncher > mnCount) {return -1;}
--- 62,66 ----
      static tcDatabase *mpDatabase;
  
!     void AddFullLauncher(tcDatabase *pDatabase, tnPoolIndex anKey, float azimuth_rad);
      int GetLauncherQuantity(unsigned anLauncher) {
          if ((int)anLauncher > mnCount) {return -1;}

Index: tcRadarSensorState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcRadarSensorState.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcRadarSensorState.h	4 Dec 2003 05:15:22 -0000	1.1
--- tcRadarSensorState.h	4 Jan 2004 22:24:52 -0000	1.2
***************
*** 47,51 ****
      tcRadarDBObject *mpDBObj;
  
!     bool InitFromDB(tcDatabase *apDatabase, tnPoolIndex anKey);
      bool IsDetected(const tsRadarTargetInfo& asRTI, float& rfRange_km);
      void Serialize(tcFile& file, bool mbLoad);
--- 47,51 ----
      tcRadarDBObject *mpDBObj;
  
!     bool InitFromDB(tcDatabase *apDatabase, tnPoolIndex anKey, float mountAzimuth_rad);
      bool IsDetected(const tsRadarTargetInfo& asRTI, float& rfRange_km);
      void Serialize(tcFile& file, bool mbLoad);

Index: tcSensorState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorState.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcSensorState.h	4 Dec 2003 05:15:22 -0000	1.1
--- tcSensorState.h	4 Jan 2004 22:24:52 -0000	1.2
***************
*** 50,59 ****
      int mnMode;
      tcTrack mcTrack;
!     tsGeoPoint msCurrentPos; // current true position of sensor
!     float mfLookAz_rad;      // azimuth of center of coverage
!     float mfSensorHeight_m;     // additional height for sensor over platform altitude
  
      void GetTestArea(tcRect& region);
!     bool InitFromDB(tcDatabase *apDatabase, tnPoolIndex anKey);
      void Serialize(tcFile& file, bool mbLoad);
      void UpdateCoverage(tsGeoPoint p,float az_rad);
--- 50,60 ----
      int mnMode;
      tcTrack mcTrack;
!     tsGeoPoint msCurrentPos; ///< current true position of sensor
!     float mfLookAz_rad;      ///< azimuth of center of coverage relative to north
!     float mountAz_rad;       ///< mounted azimuth of boresight relative to nose/bow of platform
!     float mfSensorHeight_m;     ///< height of sensor relative to platform altitude
  
      void GetTestArea(tcRect& region);
!     bool InitFromDB(tcDatabase *apDatabase, tnPoolIndex anKey, float mountAzimuth_rad);
      void Serialize(tcFile& file, bool mbLoad);
      void UpdateCoverage(tsGeoPoint p,float az_rad);

Thread: [Gcblue-commits] gcb_wx/include/sim tcESMSensorState.h,1.1,1.2 tcFlightPort.h,1.3,1.4 tcLauncherStat

gcblue-commits