[Gcblue-commits] gcb_wx/include/database tcGenericDBObject.h, 1.22, 1.23 tcRadarDBObject.h, 1.15, 1.16

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

Update of /cvsroot/gcblue/gcb_wx/include/database
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8449/include/database

Modified Files:
	tcGenericDBObject.h tcRadarDBObject.h 
Log Message:


Index: tcGenericDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcGenericDBObject.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcGenericDBObject.h	18 Jun 2006 00:47:51 -0000	1.22
--- tcGenericDBObject.h	24 Oct 2006 01:33:57 -0000	1.23
***************
*** 90,94 ****
          bool IsLeaf() const; ///< returns true if db obj is a leaf obj
  		tcFlightportDBObject* GetFlightport();
! 		float GetFuelConsumptionConstant() const;
  		osg::Vec2 GetLauncherAttitude(unsigned n);
  		tc3DPoint GetLauncherPosition(unsigned n);
--- 90,94 ----
          bool IsLeaf() const; ///< returns true if db obj is a leaf obj
  		tcFlightportDBObject* GetFlightport();
! 		float GetFuelConsumptionConstant(float speed_kts = 0) const;
  		osg::Vec2 GetLauncherAttitude(unsigned n);
  		tc3DPoint GetLauncherPosition(unsigned n);
***************
*** 111,114 ****
--- 111,115 ----
  	private:
  		float fuelConsumptionConstant; ///< = (fuel rate / max speed)
+ 		float invMaxSpeed; ///< 1/max_speed
  
  		void CalculateParams();

Index: tcRadarDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcRadarDBObject.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcRadarDBObject.h	22 Mar 2006 01:23:28 -0000	1.15
--- tcRadarDBObject.h	24 Oct 2006 01:33:57 -0000	1.16
***************
*** 38,48 ****
      {
      public:
!         float mfERP_dBW;           ///< [dBW] effective radiated power
!         unsigned int maxFireControlTracks; ///< max number of simultaneous fire control tracks
!         bool isSemiactive;         ///< set true if this is a semiactive radar
!         bool isCommandReceiver;    ///< set true if this is a command guidance receiver (a workaround)
!         bool mbDetectsSurface;     ///< set true if detects surface targets
!         bool mbDetectsAir;         ///< set true if detects airborne targets
!         bool mbDetectsGround;      ///< set true if detects ground targets
  
          virtual tcSensorState* CreateSensor(tcGameObject* parent); ///< factory method
--- 38,49 ----
      {
      public:
! 		float mfERP_dBW;           ///< [dBW] effective radiated power
! 		unsigned int maxFireControlTracks; ///< max number of simultaneous fire control tracks
! 		bool isSemiactive;         ///< set true if this is a semiactive radar
! 		bool isCommandReceiver;    ///< set true if this is a command guidance receiver (a workaround)
! 		bool mbDetectsSurface;     ///< set true if detects surface targets
! 		bool mbDetectsAir;         ///< set true if detects airborne targets
! 		bool mbDetectsMissile;	   ///< set true if detects missiles
! 		bool mbDetectsGround;      ///< set true if detects ground targets
  
          virtual tcSensorState* CreateSensor(tcGameObject* parent); ///< factory method