[Gcblue-commits] gcb_wx/include/sim tcLauncher.h,1.6,1.7 tcLauncherState.h,1.11,1.12 tcSimState.h,1.30,1.31 tcSonar.h,1.1,1.2

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

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

Modified Files:
	tcLauncher.h tcLauncherState.h tcSimState.h tcSonar.h 
Log Message:
Sonar work, passive sonar, torpedoes

Index: tcLauncher.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcLauncher.h	2 Dec 2004 04:17:24 -0000	1.6
--- tcLauncher.h	5 Dec 2004 02:49:46 -0000	1.7
***************
*** 93,99 ****
--- 93,102 ----
      void SetErrorCode(int code) {errorCode = code;}
      void SetChildClass(const std::string& childClass);
+     void SetChildQuantity(unsigned int quantity);
      void SetLoadState(bool state);
      unsigned int GetCompatibleCount() const;
      std::string GetCompatibleName(unsigned int idx) const;
+     bool IsItemCompatible(const std::string& item) const;
+ 
      tcLauncher();
      tcLauncher(tcLauncherDBObject* dbObj);

Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** tcSimState.h	14 Nov 2004 22:52:20 -0000	1.30
--- tcSimState.h	5 Dec 2004 02:49:46 -0000	1.31
***************
*** 64,67 ****
--- 64,68 ----
  class tcStream;
  class tcMissileObject;
+ class tcTorpedoObject;
  
  #define N_GAME_OBJECTS 1024
***************
*** 196,199 ****
--- 197,201 ----
  	void EvaluateGuidedMissileHit(tcMissileObject* missile, tcGameObject* target);
  	void EvaluateImpactWeaponHit(tcWeaponObject* weapon);
+     void EvaluateTorpedoHit(tcTorpedoObject* torp, tcGameObject* target);
      float GetFractionalDamage(float afDamage, tcGameObject *apGameObj);
      bool IsDetectedESM(tcESMSensor* apESM, const tcRadar* apEmitterRadar, float& rfAz_rad);

Index: tcLauncherState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncherState.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcLauncherState.h	29 Nov 2004 03:54:49 -0000	1.11
--- tcLauncherState.h	5 Dec 2004 02:49:46 -0000	1.12
***************
*** 88,92 ****
  	tcLauncher* GetLauncher(unsigned int nLauncher);
      const tcLauncher* GetLauncher(unsigned nLauncher) const;
!     const char* GetLauncherChildClass(unsigned nLauncher) const;
      int GetLauncherCount() const;
      int GetLauncherQuantity(unsigned anLauncher);
--- 88,92 ----
  	tcLauncher* GetLauncher(unsigned int nLauncher);
      const tcLauncher* GetLauncher(unsigned nLauncher) const;
!     std::string GetLauncherChildClass(unsigned nLauncher) const;
      int GetLauncherCount() const;
      int GetLauncherQuantity(unsigned anLauncher);

Index: tcSonar.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSonar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcSonar.h	2 Dec 2004 04:17:24 -0000	1.1
--- tcSonar.h	5 Dec 2004 02:49:46 -0000	1.2
***************
*** 60,65 ****
--- 60,68 ----
      void Serialize(tcFile& file, bool mbLoad);
  
+     bool IsPassive() const;
      virtual bool IsRadar() const;
      virtual bool IsSonar() const;
+     void SetActiveSonar();
+     void SetPassiveSonar();
      virtual void Update(double t);
  
***************
*** 75,78 ****
--- 78,83 ----
  
  protected:
+     bool isPassive;
+ 
      void UpdateSeeker(double t);
      void UpdateSensorMapActive(double t, const tcGameObject* target, float range_km);
***************
*** 82,86 ****
  private:
      float last_az_rad; ///< [rad] target azimuth from last call to CanDetectTarget
! 
  };
  
--- 87,91 ----
  private:
      float last_az_rad; ///< [rad] target azimuth from last call to CanDetectTarget
!     float last_snr_excess; ///< [dB] snr excess from last call to CanDetectTarget
  };