gcblue-commits

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

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

Modified Files:
	tcGameObject.h tcLauncher.h tcLauncherState.h 
	tcMissileObject.h tcObjectControl.h tcPlatformObject.h 
	tcSensorState.h tcSimState.h 
Log Message:
0.7.0 release snapshot

Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** tcGameObject.h	25 Mar 2005 03:48:06 -0000	1.34
--- tcGameObject.h	29 Mar 2005 00:12:24 -0000	1.35
***************
*** 113,116 ****
--- 113,117 ----
      float mfDamageLevel;       ///< 0 is no damage, 1 is fully damaged
  
+     virtual void ApplyDamage(float damage); ///< called when new damage occurs
      float RangeTo(tcGameObject& p) const;
      float BearingTo(tcGameObject& p) const;

Index: tcLauncher.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcLauncher.h	10 Mar 2005 03:28:27 -0000	1.12
--- tcLauncher.h	29 Mar 2005 00:12:24 -0000	1.13
***************
*** 69,73 ****
          LAUNCHER_INACTIVE = 10,
          NO_FIRECONTROL = 11,
!         TOO_DEEP = 12 ///< too deep for sub launch
      }; ///< launcher status codes
  
--- 69,74 ----
          LAUNCHER_INACTIVE = 10,
          NO_FIRECONTROL = 11,
!         TOO_DEEP = 12, ///< too deep for sub launch
!         DAMAGED = 13 ///< cannot operate due to damage
      }; ///< launcher status codes
  
***************
*** 124,131 ****
--- 125,134 ----
      float GetSectorWidth() const; ///< returns width of engagement sector in radians
      bool IsAutoPoint() const;
+     bool IsDamaged() const;
  
      void SetErrorCode(int code) {errorCode = code;}
      void SetChildClass(const std::string& childClass);
      void SetChildQuantity(unsigned int quantity);
+     void SetDamaged(bool state);
      void SetLoadState(bool state);
      void SetParent(tcGameObject *obj);
***************
*** 141,144 ****
--- 144,148 ----
  private:
      tcGameObject* parent;
+     bool isDamaged;
      static tcSimState* simState;
  

Index: tcObjectControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcObjectControl.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcObjectControl.h	4 Mar 2005 00:46:15 -0000	1.14
--- tcObjectControl.h	29 Mar 2005 00:12:24 -0000	1.15
***************
*** 89,97 ****
  enum teButtonState
  {
!     BS_DISABLED,
!     BS_READYING,
!     BS_READY,
!     BS_ACTIVE,
!     BS_LOADING
  };
  
--- 89,98 ----
  enum teButtonState
  {
!     BS_DAMAGED, ///< damaged
!     BS_DISABLED, ///< out of ammo
!     BS_READYING, ///< items loaded, launcher readying
!     BS_READY, ///< ready for immediate launch
!     BS_ACTIVE, ///<  active but launch conditions not satisfied yet
!     BS_LOADING ///< loading item(s) into launcher
  };
  
***************
*** 202,206 ****
  
  
! 
      void CreateHeadingCircles();
      void DrawBarObject(tsBarObjectInfo *apBOI, float afValue, float afValueGoal);
--- 203,208 ----
  
  
!     void AddSensorRangeCircles();
!     void AddWeaponRangeCircles();
      void CreateHeadingCircles();
      void DrawBarObject(tsBarObjectInfo *apBOI, float afValue, float afValueGoal);

Index: tcMissileObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMissileObject.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcMissileObject.h	24 Feb 2005 22:19:14 -0000	1.16
--- tcMissileObject.h	29 Mar 2005 00:12:24 -0000	1.17
***************
*** 69,72 ****
--- 69,73 ----
  	teAltitudeMode GetCurrentAltitudeMode();
  	teGuidanceMode GetCurrentGuidanceMode();
+     float GetDistanceFromLaunch() const;
      virtual void SetSpeed(float afNewSpeed) {mfGoalSpeed_kts=afNewSpeed;}
      virtual tcRadar* GetSensorState();
***************
*** 85,88 ****
      tcMissileObject(tcMissileDBObject *obj);
      ~tcMissileObject();
  };
! #endif
\ No newline at end of file
--- 86,93 ----
      tcMissileObject(tcMissileDBObject *obj);
      ~tcMissileObject();
+ 
+ private:
+     float distanceFromLaunch; ///< distance traveled from launch
  };
! 
! #endif

Index: tcLauncherState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncherState.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcLauncherState.h	7 Dec 2004 03:59:14 -0000	1.13
--- tcLauncherState.h	29 Mar 2005 00:12:24 -0000	1.14
***************
*** 71,75 ****
      const tcLauncher* GetLauncher(unsigned nLauncher) const;
      std::string GetLauncherChildClass(unsigned nLauncher) const;
!     int GetLauncherCount() const;
      int GetLauncherQuantity(unsigned anLauncher);
      int GetLauncherStatus(unsigned nLauncher);
--- 71,75 ----
      const tcLauncher* GetLauncher(unsigned nLauncher) const;
      std::string GetLauncherChildClass(unsigned nLauncher) const;
!     unsigned int GetLauncherCount() const;
      int GetLauncherQuantity(unsigned anLauncher);
      int GetLauncherStatus(unsigned nLauncher);

Index: tcPlatformObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** tcPlatformObject.h	4 Mar 2005 00:46:15 -0000	1.24
--- tcPlatformObject.h	29 Mar 2005 00:12:24 -0000	1.25
***************
*** 93,97 ****
      tcCommandObject commandObj;
  
! 
      virtual void Clear();
      virtual void DesignateDatum(tcPoint p); 
--- 93,97 ----
      tcCommandObject commandObj;
  
!     virtual void ApplyDamage(float damage);
      virtual void Clear();
      virtual void DesignateDatum(tcPoint p); 
***************
*** 102,105 ****
--- 102,106 ----
      virtual void GetDatum(GeoPoint& p) {p=msTargetDatum;}
  	virtual tcLauncher* GetLauncher(unsigned idx);
+     unsigned int GetLauncherCount() const;
  	wxString GetLauncherDescription();
      virtual int GetLauncherQuantity(unsigned anLauncher);

Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** tcSimState.h	25 Mar 2005 03:48:06 -0000	1.36
--- tcSimState.h	29 Mar 2005 00:12:24 -0000	1.37
***************
*** 152,155 ****
--- 152,156 ----
      void GetPlatformsWithinRegion(std::vector<long>& keyList, tcRect *apRegion);
      long GetRandomPlatform();
+     const char* GetScenarioName() const;
      int GetSeekerTrack(long anKey, tcTrack& track);
      tcSensorMap* GetSensorMap();

Index: tcSensorState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorState.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcSensorState.h	2 Mar 2005 22:28:40 -0000	1.15
--- tcSensorState.h	29 Mar 2005 00:12:24 -0000	1.16
***************
*** 73,77 ****
      void GetTestArea(tcRect& region);
      virtual bool InitFromDatabase(long key); ///< initializes sensor using database data at key
! 	bool IsHidden() const;
      
      virtual bool IsESM() const;
--- 73,78 ----
      void GetTestArea(tcRect& region);
      virtual bool InitFromDatabase(long key); ///< initializes sensor using database data at key
! 	bool IsDamaged() const;
!     bool IsHidden() const;
      
      virtual bool IsESM() const;
***************
*** 85,88 ****
--- 86,90 ----
  
      virtual void SetActive(bool active);
+     void SetDamaged(bool state);
      void SetMountAz(float az);
      void SetParent(tcGameObject *obj) {parent = obj;}
***************
*** 101,104 ****
--- 103,107 ----
  
  	bool isHidden; ///< hidden sensors are not displayed in object control view
+     bool isDamaged;
  };
  #endif
\ No newline at end of file