[Gcblue-commits] gcb_wx/include/sim tcAIData.h,1.9,1.10 tcGameObject.h,1.30,1.31 tcLauncher.h,1.10,1.11 tcMapData.h,1.9,1.10 tcMissileObject.h,1.15,1.16 tcPlatformObject.h,1.22,1.23 tcSensorState.h,1.13,1.14 tcSimState.h,1.32,1.33 tcTorpedoObject.h,1.2,1.3

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11465/include/sim

Modified Files:
	tcAIData.h tcGameObject.h tcLauncher.h tcMapData.h 
	tcMissileObject.h tcPlatformObject.h tcSensorState.h 
	tcSimState.h tcTorpedoObject.h 
Log Message:
More OpenAL++ changes and ai improvements

Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** tcGameObject.h	1 Feb 2005 02:28:09 -0000	1.30
--- tcGameObject.h	24 Feb 2005 22:19:14 -0000	1.31
***************
*** 122,127 ****
      void GetRelPosOf(tcGameObject *obj, tsRelativePosition& rel_pos);
      virtual void RandInitNear(float afLon_deg, float afLat_deg);
! 	tsGeoPoint RelPosToLatLonAlt(const tsRelativePosition& rel_pos) const;
! 	tsGeoPoint RelPosToLatLonAlt(const float& dx, const float& dy, const float& dz) const;
      virtual void PrintToFile(tcFile&);
      virtual void SaveToFile(tcFile& file);
--- 122,127 ----
      void GetRelPosOf(tcGameObject *obj, tsRelativePosition& rel_pos);
      virtual void RandInitNear(float afLon_deg, float afLat_deg);
! 	GeoPoint RelPosToLatLonAlt(const tsRelativePosition& rel_pos) const;
! 	GeoPoint RelPosToLatLonAlt(const float& dx, const float& dy, const float& dz) const;
      virtual void PrintToFile(tcFile&);
      virtual void SaveToFile(tcFile& file);
***************
*** 145,152 ****
      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;}
--- 145,152 ----
      virtual void UpdateEffects();
      virtual void DesignateDatum(tcPoint p) {}
!     virtual void DesignateLauncherDatum(GeoPoint p, unsigned int anLauncher) {}
      virtual bool DesignateLauncherTarget(tnPoolIndex anID, unsigned anLauncher) {return false;}
      virtual void DesignateTarget(long anID) {}
!     virtual void GetDatum(GeoPoint& p) {}
      virtual void GetLauncherState(tcLauncherState*& pLauncherState) {pLauncherState = NULL;}
  	virtual tcLauncher* GetLauncher(unsigned idx) {return 0;}

Index: tcLauncher.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcLauncher.h	18 Feb 2005 17:41:37 -0000	1.10
--- tcLauncher.h	24 Feb 2005 22:19:14 -0000	1.11
***************
*** 86,90 ****
      bool isLoading; ///< true if launcher is offline to load/unload weapons
  
!     tsGeoPoint msDatum; ///< datum to pass to weapon nav guidance
      tnPoolIndex mnTargetID; ///< track that seeker can acquire
      teWeaponLaunchMode meLaunchMode;
--- 86,90 ----
      bool isLoading; ///< true if launcher is offline to load/unload weapons
  
!     GeoPoint msDatum; ///< datum to pass to weapon nav guidance
      tnPoolIndex mnTargetID; ///< track that seeker can acquire
      teWeaponLaunchMode meLaunchMode;

Index: tcTorpedoObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcTorpedoObject.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcTorpedoObject.h	7 Dec 2004 03:59:14 -0000	1.2
--- tcTorpedoObject.h	24 Feb 2005 22:19:14 -0000	1.3
***************
*** 69,73 ****
      float guidanceUpdateInterval;
  
!     tsGeoPoint waypoint;   // nav datum
      float runToEnable_m;   
      float ceiling_m; // min depth
--- 69,73 ----
      float guidanceUpdateInterval;
  
!     GeoPoint waypoint;   // nav datum
      float runToEnable_m;   
      float ceiling_m; // min depth

Index: tcMissileObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMissileObject.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcMissileObject.h	1 Feb 2005 02:28:09 -0000	1.15
--- tcMissileObject.h	24 Feb 2005 22:19:14 -0000	1.16
***************
*** 53,57 ****
      float mfGuidanceUpdateInterval;
  
!     tsGeoPoint msWaypoint;   // nav datum
      float mfRangeToObjective_km; // for segment determination
      UINT mnCurrentSegment;
--- 53,57 ----
      float mfGuidanceUpdateInterval;
  
!     GeoPoint msWaypoint;   // nav datum
      float mfRangeToObjective_km; // for segment determination
      UINT mnCurrentSegment;

Index: tcMapData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapData.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcMapData.h	20 Feb 2005 21:54:32 -0000	1.9
--- tcMapData.h	24 Feb 2005 22:19:14 -0000	1.10
***************
*** 118,122 ****
      float GetHRLonSpan() {return 0.5f*mrTheaterView.Width();}
      void GetMapDataInfo(tsMapDataInfo *pMDI);
!     tsGeoPoint GetRandomPointNear(float lon, float lat, float r, 
          float minAlt = -16000.0f, float maxAlt = 16000.0f);
      float GetTerrainHeight(float afLon_deg, float afLat_deg, double afStatusTime);
--- 118,122 ----
      float GetHRLonSpan() {return 0.5f*mrTheaterView.Width();}
      void GetMapDataInfo(tsMapDataInfo *pMDI);
!     GeoPoint GetRandomPointNear(float lon, float lat, float r, 
          float minAlt = -16000.0f, float maxAlt = 16000.0f);
      float GetTerrainHeight(float afLon_deg, float afLat_deg, double afStatusTime);

Index: tcPlatformObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcPlatformObject.h	16 Feb 2005 23:13:38 -0000	1.22
--- tcPlatformObject.h	24 Feb 2005 22:19:14 -0000	1.23
***************
*** 89,93 ****
      Brain* brain;
      tcLaunchRequest mcLaunchRequest;
!     tsGeoPoint msTargetDatum;
      tsFormationParameters msFormationParameters;
      tcGenericDBObject *mpDBObject;
--- 89,93 ----
      Brain* brain;
      tcLaunchRequest mcLaunchRequest;
!     GeoPoint msTargetDatum;
      tsFormationParameters msFormationParameters;
      tcGenericDBObject *mpDBObject;
***************
*** 98,106 ****
      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); 
      Brain* GetBrain();
!     virtual void GetDatum(tsGeoPoint& p) {p=msTargetDatum;}
  	virtual tcLauncher* GetLauncher(unsigned idx);
  	wxString GetLauncherDescription();
--- 98,106 ----
      virtual void Clear();
      virtual void DesignateDatum(tcPoint p); 
!     virtual void DesignateLauncherDatum(GeoPoint p, unsigned int anLauncher);  
      virtual bool DesignateLauncherTarget(tnPoolIndex anID, unsigned anLauncher);
      virtual void DesignateTarget(long anID); 
      Brain* GetBrain();
!     virtual void GetDatum(GeoPoint& p) {p=msTargetDatum;}
  	virtual tcLauncher* GetLauncher(unsigned idx);
  	wxString GetLauncherDescription();

Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** tcSimState.h	11 Dec 2004 01:09:05 -0000	1.32
--- tcSimState.h	24 Feb 2005 22:19:14 -0000	1.33
***************
*** 130,134 ****
      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();
--- 130,134 ----
      void DesignateTarget(long anKey, long anTargetKey);
      void DesignateDatum(long anKey, tcPoint p);
!     void DesignateLauncherDatum(tnPoolIndex anKey, GeoPoint p, unsigned anLauncher);
      bool DesignateLauncherTarget(tnPoolIndex anKey, tnPoolIndex anTargetKey, unsigned anLauncher);
      void GenerateRandomGoals();

Index: tcSensorState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorState.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcSensorState.h	23 Nov 2004 23:30:50 -0000	1.13
--- tcSensorState.h	24 Feb 2005 22:19:14 -0000	1.14
***************
*** 64,68 ****
      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
--- 64,68 ----
      int mnMode;
      tcTrack mcTrack;
!     //GeoPoint 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

Index: tcAIData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAIData.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcAIData.h	20 Feb 2005 18:20:18 -0000	1.9
--- tcAIData.h	24 Feb 2005 22:19:14 -0000	1.10
***************
*** 39,43 ****
      public:
          std::string mstrOrdername;
!         tsGeoPoint msDestination; ///< destination for order
          double mfTime; ///< time for order
          long data; ///< additional data for order (e.g. target ID)
--- 39,43 ----
      public:
          std::string mstrOrdername;
!         GeoPoint msDestination; ///< destination for order
          double mfTime; ///< time for order
          long data; ///< additional data for order (e.g. target ID)