[Gcblue-commits] gcb_wx/include/database tcAirDBObject.h,1.6,1.7 tcDatabaseObject.h,1.9,1.10 tcESMDB
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-03-28 23:23:49
|
Update of /cvsroot/gcblue/gcb_wx/include/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1383/include/database Modified Files: tcAirDBObject.h tcDatabaseObject.h tcESMDBObject.h tcFixedDBObject.h tcFlightportDBObject.h tcGenericDBObject.h tcLauncherDBObject.h tcMissileDBObject.h tcRadarDBObject.h tcSensorDBObject.h Log Message: Index: tcGenericDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcGenericDBObject.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcGenericDBObject.h 28 Mar 2004 14:26:35 -0000 1.6 --- tcGenericDBObject.h 28 Mar 2004 23:12:27 -0000 1.7 *************** *** 31,34 **** --- 31,35 ---- struct animationDBInfo; + class TiXmlElement; namespace Database *************** *** 74,81 **** --- 75,84 ---- void Animate3DModel(); + virtual const char* GetClassName() {return "Generic";} ///< returns class name of database object void RandInit(); virtual void PrintToFile(tcFile& file); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization + virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings tcGenericDBObject(); Index: tcDatabaseObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseObject.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcDatabaseObject.h 28 Mar 2004 19:02:17 -0000 1.9 --- tcDatabaseObject.h 28 Mar 2004 23:12:27 -0000 1.10 *************** *** 127,130 **** --- 127,131 ---- static void AttachDatabase(tcDatabase *db) {database = db;} + virtual const char* GetClassName() {return "Object";} ///< returns class name of database object tc3DModel* Get3DModel(); void Load3DModel(); Index: tcRadarDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcRadarDBObject.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcRadarDBObject.h 28 Mar 2004 14:22:57 -0000 1.6 --- tcRadarDBObject.h 28 Mar 2004 23:12:27 -0000 1.7 *************** *** 29,32 **** --- 29,34 ---- #include "tcSensorDBObject.h" + class TiXmlElement; + namespace Database { *************** *** 45,51 **** --- 47,55 ---- float mfGrowth[8]; ///< growth fields (TODO delete, but make sure nothing breaks!) + virtual const char* GetClassName() {return "Radar";} ///< returns class name of database object virtual void PrintToFile(tcFile& file); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization + virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings tcRadarDBObject(); Index: tcSensorDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSensorDBObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcSensorDBObject.h 28 Mar 2004 18:47:07 -0000 1.3 --- tcSensorDBObject.h 28 Mar 2004 23:12:27 -0000 1.4 *************** *** 29,32 **** --- 29,34 ---- #include "tcDatabaseObject.h" + class TiXmlElement; + namespace Database { *************** *** 39,46 **** --- 41,51 ---- float mfScanPeriod_s; ///< [s] + virtual const char* GetClassName() {return "Sensor";} ///< returns class name of database object virtual void PrintToFile(tcFile& file); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization + virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings + tcSensorDBObject(); tcSensorDBObject(tcSensorDBObject& obj); ///< copy constructor Index: tcFixedDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcFixedDBObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcFixedDBObject.h 28 Mar 2004 18:47:07 -0000 1.3 --- tcFixedDBObject.h 28 Mar 2004 23:12:27 -0000 1.4 *************** *** 29,32 **** --- 29,34 ---- #include "tcDatabaseObject.h" + + namespace Database { *************** *** 34,40 **** --- 36,44 ---- { public: + virtual const char* GetClassName() {return "Fixed";} ///< returns class name of database object virtual void PrintToFile(tcFile& file); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization + virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings Index: tcAirDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcAirDBObject.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcAirDBObject.h 28 Mar 2004 14:24:27 -0000 1.6 --- tcAirDBObject.h 28 Mar 2004 23:12:27 -0000 1.7 *************** *** 34,37 **** --- 34,39 ---- #include "tcFile.h" + class TiXmlElement; + namespace Database { *************** *** 60,67 **** float mfMaxCl; ///< max lift coefficient float mfGmax; ///< max Gs ! void PrintToFile(tcFile& file) {} ///< not supported, redundant with CSV serialization, TODO get rid of these int Serialize(tcFile& file, bool mbLoad) {return 0;} ///< binary serialization not supported here int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings --- 62,71 ---- float mfMaxCl; ///< max lift coefficient float mfGmax; ///< max Gs ! ! virtual const char* GetClassName() {return "Air";} ///< returns class name of database object void PrintToFile(tcFile& file) {} ///< not supported, redundant with CSV serialization, TODO get rid of these int Serialize(tcFile& file, bool mbLoad) {return 0;} ///< binary serialization not supported here int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization + virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings Index: tcLauncherDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcLauncherDBObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcLauncherDBObject.h 28 Mar 2004 14:24:27 -0000 1.4 --- tcLauncherDBObject.h 28 Mar 2004 23:12:27 -0000 1.5 *************** *** 29,32 **** --- 29,34 ---- #include "tcDatabaseObject.h" + class TiXmlElement; + namespace Database { *************** *** 43,50 **** std::string fireControlSensorClass; ///< class of sensor on platform for fire control ///< (track required to launch) ! virtual void PrintToFile(tcFile& file); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings --- 45,53 ---- std::string fireControlSensorClass; ///< class of sensor on platform for fire control ///< (track required to launch) ! virtual const char* GetClassName() {return "Launcher";} ///< returns class name of database object virtual void PrintToFile(tcFile& file); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization + virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings Index: tcMissileDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcMissileDBObject.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcMissileDBObject.h 28 Mar 2004 14:22:57 -0000 1.7 --- tcMissileDBObject.h 28 Mar 2004 23:12:27 -0000 1.8 *************** *** 29,32 **** --- 29,34 ---- #include "tcDatabaseObject.h" + class TiXmlElement; + namespace Database { *************** *** 109,112 **** --- 111,115 ---- tsMissileFlightSegment maFlightProfile[MAX_MISSILE_FLIGHT_SEGMENTS]; + virtual const char* GetClassName() {return "Missile";} ///< returns class name of database object teWeaponLaunchMode GetLaunchMode(void); tnPoolIndex GetPrimarySeekerKey(); *************** *** 114,117 **** --- 117,121 ---- int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization + virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings tcMissileDBObject(); Index: tcESMDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcESMDBObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcESMDBObject.h 28 Mar 2004 18:47:07 -0000 1.3 --- tcESMDBObject.h 28 Mar 2004 23:12:27 -0000 1.4 *************** *** 36,43 **** { public: ! virtual void PrintToFile(tcFile& file); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings tcESMDBObject(); --- 36,44 ---- { public: ! virtual const char* GetClassName() {return "ESM";} ///< returns class name of database object virtual void PrintToFile(tcFile& file); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization + virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings tcESMDBObject(); Index: tcFlightportDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcFlightportDBObject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcFlightportDBObject.h 28 Mar 2004 14:26:35 -0000 1.2 --- tcFlightportDBObject.h 28 Mar 2004 23:12:27 -0000 1.3 *************** *** 29,32 **** --- 29,34 ---- #include <vector> + class TiXmlElement; + namespace Database { *************** *** 53,60 **** unsigned int hangarCapacity; std::vector<spotDBInfo> spotInfo; ! void RandInit(); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings tcFlightportDBObject(); --- 55,64 ---- unsigned int hangarCapacity; std::vector<spotDBInfo> spotInfo; ! ! virtual const char* GetClassName() {return "FlightPort";} ///< returns class name of database object void RandInit(); int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion); int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization + virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings tcFlightportDBObject(); |