[Gcblue-commits] gcb_wx/include/sim tcBallisticWeapon.h,1.5,1.6 tcGameObject.h,1.33,1.34 tcSimState.h,1.35,1.36 tcWeaponObject.h,1.7,1.8

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

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

Modified Files:
	tcBallisticWeapon.h tcGameObject.h tcSimState.h 
	tcWeaponObject.h 
Log Message:
OpenAL++ updates, added point defense

Index: tcWeaponObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcWeaponObject.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcWeaponObject.h	17 Aug 2004 02:22:56 -0000	1.7
--- tcWeaponObject.h	25 Mar 2005 03:48:06 -0000	1.8
***************
*** 51,54 ****
--- 51,56 ----
  
  	bool IsDetonated();
+     bool IsGroundFused() const;
+ 
      /// returns true if id is intended target of this weapon
      bool IsIntendedTarget(long id);
***************
*** 69,72 ****
--- 71,80 ----
  	*/
  	float fuseDelay; 
+     enum FuseMode
+     {
+         GROUND_FUSE = 0, ///< detonate on hitting ground
+         TARGET_FUSE = 1  ///< detonate when near target (used for point defense ballistics)
+     };
+     FuseMode fuseMode;
  
      virtual tcUpdateStream& operator<<(tcUpdateStream& stream);
***************
*** 74,77 ****
--- 82,86 ----
  
  	void Detonate(float delay_s = 0);
+     void SetFuseMode(FuseMode mode);
  
      tcWeaponObject();
***************
*** 80,82 ****
      ~tcWeaponObject();
  };
! #endif
\ No newline at end of file
--- 89,92 ----
      ~tcWeaponObject();
  };
! 
! #endif

Index: tcSimState.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSimState.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** tcSimState.h	8 Mar 2005 00:41:47 -0000	1.35
--- tcSimState.h	25 Mar 2005 03:48:06 -0000	1.36
***************
*** 156,159 ****
--- 156,162 ----
      double GetTime() {return mfSimTime;}
      long GetTimeAcceleration() const;
+     bool GetTrack(long id, unsigned alliance, tcSensorMapTrack& track);
+     bool GetTruthTrack(long id, tcTrack& track);
+ 
      bool IsLauncherReady(tcGameObject *apGameObj, unsigned anLauncher);
      bool IsLauncherReady(tnPoolIndex anKey, unsigned anLauncher);
***************
*** 201,204 ****
--- 204,209 ----
  	void EvaluateGuidedMissileHit(tcMissileObject* missile, tcGameObject* target);
  	void EvaluateImpactWeaponHit(tcWeaponObject* weapon);
+     void EvaluatePointDefenseWeaponHit(tcWeaponObject* weapon);
+ 
      void EvaluateTorpedoHit(tcTorpedoObject* torp, tcGameObject* target);
      float GetFractionalDamage(float afDamage, tcGameObject *apGameObj);

Index: tcGameObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** tcGameObject.h	10 Mar 2005 03:28:27 -0000	1.33
--- tcGameObject.h	25 Mar 2005 03:48:06 -0000	1.34
***************
*** 111,115 ****
      tcKinematics mcKin;        ///< position, motion, etc parameters
      tcTerrainInfo mcTerrain;   ///< ground height ASL, water depth
!     float mfDamageLevel;       ///< 0 is no damage, up to toughness amount
  
      float RangeTo(tcGameObject& p) const;
--- 111,115 ----
      tcKinematics mcKin;        ///< position, motion, etc parameters
      tcTerrainInfo mcTerrain;   ///< ground height ASL, water depth
!     float mfDamageLevel;       ///< 0 is no damage, 1 is fully damaged
  
      float RangeTo(tcGameObject& p) const;
***************
*** 183,186 ****
--- 183,187 ----
  
      bool IsHooked() const;
+     void SelfDestruct();
  };
  #endif
\ No newline at end of file

Index: tcBallisticWeapon.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcBallisticWeapon.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcBallisticWeapon.h	31 Jan 2005 01:32:36 -0000	1.5
--- tcBallisticWeapon.h	25 Mar 2005 03:48:06 -0000	1.6
***************
*** 52,55 ****
--- 52,56 ----
      bool IsGravityBomb() const;
      bool IsGunRound() const;
+     bool IsPointDefense() const;
  
      void PrintToFile(tcFile&);
***************
*** 68,71 ****
--- 69,76 ----
  	float vz_mps;  ///< vertical velocity [m/s]
  	float vxy_mps; ///< lateral velocity [m/s]
+     float distFromLaunch_m; ///< horizontal distance from launch point [m]
+ 
+     void UpdateGroundFuse();
+     void UpdateTargetFuse();
  
  };