[Gcblue-commits] gcb_wx/include/database tcBallisticDBObject.h,1.5,1.6 tcDatabaseObject.h,1.19,1.20 tcGenericDBObject.h,1.15,1.16

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

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

Modified Files:
	tcBallisticDBObject.h tcDatabaseObject.h tcGenericDBObject.h 
Log Message:
Moved launcher position to 3D model animation xml file
Added tcGroundObject for ground SAM site

Index: tcGenericDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcGenericDBObject.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcGenericDBObject.h	16 Jan 2005 18:35:56 -0000	1.15
--- tcGenericDBObject.h	31 Jan 2005 01:32:35 -0000	1.16
***************
*** 80,85 ****
  		std::vector<long> sensorId; ///< database id's of sensors
          std::vector<std::string> launcherName; ///< display names of launchers, e.g. "Tube 1"
!         float launcherAz[MAXLAUNCHERS]; ///< pointing angles of launchers in degrees
! 		tc3DPoint launcherPosition[MAXLAUNCHERS]; ///< relative position of launchers in meters
          float sensorAz[MAXSENSORS]; ///< pointing angles of sensors in degrees
  
--- 80,84 ----
  		std::vector<long> sensorId; ///< database id's of sensors
          std::vector<std::string> launcherName; ///< display names of launchers, e.g. "Tube 1"
! 
          float sensorAz[MAXSENSORS]; ///< pointing angles of sensors in degrees
  
***************
*** 92,95 ****
--- 91,95 ----
          bool IsLeaf() const; ///< returns true if db obj is a leaf obj
  		tcFlightportDBObject* GetFlightport();
+         float GetLauncherAz(unsigned n);
  		tc3DPoint GetLauncherPosition(unsigned n);
  		bool HasAllEmitters(std::vector<long>& emitters);

Index: tcDatabaseObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseObject.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tcDatabaseObject.h	30 Dec 2004 17:26:06 -0000	1.19
--- tcDatabaseObject.h	31 Jan 2005 01:32:35 -0000	1.20
***************
*** 139,143 ****
          static void AttachDatabase(tcDatabase *db) {database = db;}
          virtual const char* GetClassName() {return "Object";} ///< returns class name of database object
!         virtual tc3DModel* Get3DModel();
          bool IsLeaf() const; ///< returns true if db obj is a leaf obj
          void Load3DModel();
--- 139,144 ----
          static void AttachDatabase(tcDatabase *db) {database = db;}
          virtual const char* GetClassName() {return "Object";} ///< returns class name of database object
!         virtual tc3DModel* Copy3DModel(); ///< creates copy of model (must be deleted)
!         virtual tc3DModel* Get3DModel(); ///< gets pointer to database model
          bool IsLeaf() const; ///< returns true if db obj is a leaf obj
          void Load3DModel();

Index: tcBallisticDBObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcBallisticDBObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcBallisticDBObject.h	29 Nov 2004 03:54:48 -0000	1.5
--- tcBallisticDBObject.h	31 Jan 2005 01:32:35 -0000	1.6
***************
*** 38,43 ****
--- 38,48 ----
  	{
  	public:
+         enum {GUN_ROUND = 0, GRAVITY_BOMB = 1};
+         int ballisticType;
+ 
  		float GetGunneryElevation(float range_m, float dz_m, float& tti_s);
  		float GetMaxLevelGunRangeKm();
+         bool IsGravityBomb() const;
+         bool IsGunRound() const;
  
  		virtual const char* GetClassName() {return "Ballistic";} ///< returns class name of database object