[Gcblue-commits] gcb_wx/include/database tcGenericDBObject.h,1.12,1.13 tcLauncherDBObject.h,1.9,1.10
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/include/database tcGenericDBObject.h,1.12,1.13 tcLauncherDBObject.h,1.9,1.10 tcMissileDBObject.h,1.15,1.16 tcSonarDBObject.h,1.2,1.3 tcTorpedoDBObject.h,1.1,1.2 tcWeaponDBObject.h,1.4,1.5
|
From: Dewitt C. <ddc...@us...> - 2004-12-07 03:59:47
|
Update of /cvsroot/gcblue/gcb_wx/include/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13413/include/database Modified Files: tcGenericDBObject.h tcLauncherDBObject.h tcMissileDBObject.h tcSonarDBObject.h tcTorpedoDBObject.h tcWeaponDBObject.h Log Message: Sonar work, passive sonar, torpedoes Index: tcSonarDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSonarDBObject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcSonarDBObject.h 5 Dec 2004 02:49:46 -0000 1.2 --- tcSonarDBObject.h 7 Dec 2004 03:59:07 -0000 1.3 *************** *** 48,56 **** float maxFrequency_Hz; bool isPassive; ! //bool isActive ///< both isActive and isPassive indicate selectable ! //bool isTowed; ! //float maxTowedScope_m; ! //bool applyScanLoss; ! //float bearingResolution_deg; std::string audioFile; ///< filename for audio sound effect (active only) --- 48,57 ---- float maxFrequency_Hz; bool isPassive; ! bool isActive; ///< both isActive and isPassive indicate selectable at launch ! bool isTowed; ! float maxScope_m; ///< towed array scope or dipping sonar "scope" ! bool isWakeHoming; ///< wake homing vs. surface only ! bool applyScanLoss; ! float bearingResolution_deg; std::string audioFile; ///< filename for audio sound effect (active only) *************** *** 59,63 **** float alpha; ///< CALCULATED attenuation coefficent in dB/km ! // float bearingResolution_rad; ///< CALCULATED virtual tcSensorState* CreateSensor(tcGameObject* parent); ///< factory method --- 60,64 ---- float alpha; ///< CALCULATED attenuation coefficent in dB/km ! float bearingResolution_rad; ///< CALCULATED virtual tcSensorState* CreateSensor(tcGameObject* parent); ///< factory method Index: tcGenericDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcGenericDBObject.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tcGenericDBObject.h 29 Nov 2004 03:54:49 -0000 1.12 --- tcGenericDBObject.h 7 Dec 2004 03:59:07 -0000 1.13 *************** *** 51,55 **** enum { ! MAXLAUNCHERS = 8, MAXSENSORS = 8, MAXANIMATIONS = 4, --- 51,55 ---- enum { ! MAXLAUNCHERS = 10, MAXSENSORS = 8, MAXANIMATIONS = 4, *************** *** 79,82 **** --- 79,83 ---- 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 Index: tcTorpedoDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcTorpedoDBObject.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcTorpedoDBObject.h 5 Dec 2004 02:58:24 -0000 1.1 --- tcTorpedoDBObject.h 7 Dec 2004 03:59:07 -0000 1.2 *************** *** 35,39 **** { class tcSqlReader; ! --- 35,39 ---- { class tcSqlReader; ! class tcSonarDBObject; *************** *** 44,68 **** { public: - enum {MAX_TORPEDO_SEGMENTS = 4}; - /** - * Determines guidance type that is used flight segment. - */ - enum TorpedoGuidanceMode - { - GM_COMMAND = 0, ///< command guidance - GM_NAV = 1, ///< inertial - GM_SENSOR = 2 ///< use primary sensor - }; - /** - * Info that controls torpedo behavior for segment. - */ - struct tsTorpedoSegment - { - float range_km; ///< min range for this segment - float depth_m; ///< depth for segment - float thrust; /// relative thrust for segment, 0-1.0 - TorpedoGuidanceMode meGuidanceMode; ///< guidance mode - }; - // model parameters float mass_kg; ///< mass before launch, fuel assumed 0 kg --- 44,47 ---- *************** *** 72,80 **** float maxThrust_N; ///< max thrust [N] ! float fuel_kg; ! float fuelRate_kgps; ///< fuel rate at max thrust float maxSpeed_kts; ! float acceleration_ktsps; ///< for simple model only float mfRange_km; ///< [km] nominal range --- 51,59 ---- float maxThrust_N; ///< max thrust [N] ! float battery_kJ; ///< battery charge ! float batteryRate_kW; ///< battery rate at max thrust float maxSpeed_kts; ! float acceleration_ktsps; ///< for simple model only float mfRange_km; ///< [km] nominal range *************** *** 83,96 **** std::string sonarClass; ! /// flight profile, array of flight segment info ! std::vector<tsTorpedoSegment> defaultProfile; ///< default maneuver profile /// calculated parameters float maxTurnRate_radps; ///< CALCULATED ! float fuelRate_kgpktps; ///< [kg / kt / s] CALCULATED virtual const char* GetClassName() {return "Torpedo";} ///< returns class name of database object bool IsLeaf() const; ///< returns true if db obj is a leaf obj ! virtual void PrintToFile(tcFile& file); --- 62,75 ---- std::string sonarClass; ! bool wireGuidance; ///< true if wire guidance available ! float preEnableSpeed_kts; ///< default pre-enable speed /// calculated parameters float maxTurnRate_radps; ///< CALCULATED ! float batteryRate_kWpkt; ///< [kW / kt] CALCULATED virtual const char* GetClassName() {return "Torpedo";} ///< returns class name of database object bool IsLeaf() const; ///< returns true if db obj is a leaf obj ! tcSonarDBObject* GetSeekerDBObj() const; virtual void PrintToFile(tcFile& file); Index: tcLauncherDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcLauncherDBObject.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcLauncherDBObject.h 29 Nov 2004 03:54:49 -0000 1.9 --- tcLauncherDBObject.h 7 Dec 2004 03:59:07 -0000 1.10 *************** *** 50,54 **** std::string fireControlSensorClass; ///< class of sensor on platform for fire control ///< (track required to launch) - std::string displayName; ///< name to display in vehicle controls virtual const char* GetClassName() {return "Launcher";} ///< returns class name of database object --- 50,53 ---- Index: tcWeaponDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcWeaponDBObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcWeaponDBObject.h 29 Nov 2004 03:54:49 -0000 1.4 --- tcWeaponDBObject.h 7 Dec 2004 03:59:07 -0000 1.5 *************** *** 33,36 **** --- 33,43 ---- namespace Database { + + #define SURFACE_TARGET 0x0001 + #define AIR_TARGET 0x0002 + #define LAND_TARGET 0x0004 + #define MISSILE_TARGET 0x0008 + #define SUBSURFACE_TARGET 0x0010 + class tcSqlReader; *************** *** 40,43 **** --- 47,51 ---- float mfDamage; ///< damage value float launchSpeed_mps; ///< initial speed at launch, use zero to use plat speed + int targetFlags; ///< 0x01 surf, 0x02 air, 0x04 land, 0x08 missile, 0x10 sub virtual const char* GetClassName() {return "Sensor";} ///< returns class name of database object Index: tcMissileDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcMissileDBObject.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tcMissileDBObject.h 5 Dec 2004 02:49:46 -0000 1.15 --- tcMissileDBObject.h 7 Dec 2004 03:59:07 -0000 1.16 *************** *** 97,106 **** }; - /// these need to be moved to a common area - #define SURFACE_TARGET 0x0001 - #define AIR_TARGET 0x0002 - #define LAND_TARGET 0x0004 - #define MISSILE_TARGET 0x0008 - #define SUBSURFACE_TARGET 0x0010 class tcMissileDBObject : public tcWeaponDBObject --- 97,100 ---- *************** *** 127,131 **** //float mfDamage; ///< damage value //teDamageType meDamageType; ///< damage type enumeration - int mnTargetFlags; ///< 0x01 - surface, 0x02 - air, 0x04 - land float mfRcs_dbsm; ///< radar cross section, [dBsm] float mfRange_km; ///< [km] nominal range --- 121,124 ---- |
