[Gcblue-commits] gcb_wx/include/sim Game.h, 1.71, 1.72 tcAeroAirObject.h, 1.15, 1.16 tcAirObject.h,
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/include/sim Game.h, 1.71, 1.72 tcAeroAirObject.h, 1.15, 1.16 tcAirObject.h, 1.15, 1.16 tcAirfieldObject.h, 1.6, 1.7 tcCarrierObject.h, 1.15, 1.16 tcGroundObject.h, 1.2, 1.3 tcGroundVehicleObject.h, 1.1, 1.2 tcHeloObject.h, 1.4, 1.5 tcLauncher.h, 1.27, 1.28 tcOpticalSensor.h, 1.4, 1.5 tcPlatformObject.h, 1.39, 1.40 tcStores.h, 1.11, 1.12 tcSurfaceObject.h, 1.14, 1.15
|
From: Dewitt C. <ddc...@us...> - 2006-11-20 00:16:34
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29360/include/sim Modified Files: Game.h tcAeroAirObject.h tcAirObject.h tcAirfieldObject.h tcCarrierObject.h tcGroundObject.h tcGroundVehicleObject.h tcHeloObject.h tcLauncher.h tcOpticalSensor.h tcPlatformObject.h tcStores.h tcSurfaceObject.h Log Message: Index: tcGroundVehicleObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGroundVehicleObject.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcGroundVehicleObject.h 18 Jun 2006 00:47:51 -0000 1.1 --- tcGroundVehicleObject.h 20 Nov 2006 00:16:29 -0000 1.2 *************** *** 33,37 **** namespace database { ! class tcGenericDBObject; } --- 33,37 ---- namespace database { ! class tcPlatformDBObject; } *************** *** 44,48 **** { public: ! tcGenericDBObject* mpDBObject; virtual void Clear(); --- 44,48 ---- { public: ! tcPlatformDBObject* mpDBObject; virtual void Clear(); *************** *** 65,69 **** tcGroundVehicleObject(); tcGroundVehicleObject(tcGroundVehicleObject&); ! tcGroundVehicleObject(tcGenericDBObject* obj); ~tcGroundVehicleObject(); --- 65,69 ---- tcGroundVehicleObject(); tcGroundVehicleObject(tcGroundVehicleObject&); ! tcGroundVehicleObject(tcPlatformDBObject* obj); ~tcGroundVehicleObject(); Index: tcLauncher.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** tcLauncher.h 5 Sep 2006 01:04:24 -0000 1.27 --- tcLauncher.h 20 Nov 2006 00:16:29 -0000 1.28 *************** *** 75,79 **** DAMAGED = 15, ///< cannot operate due to damage INVALID_TARGET = 16, ///< not effective vs. target type ! OUT_OF_RANGE = 17 ///< target is beyond 1.5 x max range }; ///< launcher status codes --- 75,80 ---- DAMAGED = 15, ///< cannot operate due to damage INVALID_TARGET = 16, ///< not effective vs. target type ! OUT_OF_RANGE = 17, ///< target is beyond 1.5 x max range ! INVALID_FUEL_OPERATION = 18 ///< invalid op for external fuel tank }; ///< launcher status codes *************** *** 85,88 **** --- 86,91 ---- long mnChildDBKey; tcDatabaseObject *mpChildDBObj; + bool isExternalFuelTank; ///< true if child is fuel tank + float itemWeight_kg; ///< current unit weight of loaded items float mfTimeToReady; *************** *** 135,138 **** --- 138,142 ---- float GetSectorCenter() const; ///< returns center of engagement sector in radians float GetSectorWidth() const; ///< returns width of engagement sector in radians + float GetWeight() const; bool IsAutoPoint() const; bool IsDamaged() const; Index: tcOpticalSensor.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcOpticalSensor.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcOpticalSensor.h 22 Mar 2006 01:23:29 -0000 1.4 --- tcOpticalSensor.h 20 Nov 2006 00:16:29 -0000 1.5 *************** *** 65,68 **** --- 65,69 ---- protected: + float CalculateNightPenalty(float lon_rad) const; // bool isSemiactive; //tcRadar* GetSemiactiveIlluminator(); // add semi-active later for laser designated guidance *************** *** 75,79 **** ** (didn't want to modify virtual method CanDetectTarget to pass this info directly) */ long detectionCandidate; ! float detectionScore; }; --- 76,80 ---- ** (didn't want to modify virtual method CanDetectTarget to pass this info directly) */ long detectionCandidate; ! float last_margin_dB; // detection margin from last CanDetectTarget call }; Index: tcGroundObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGroundObject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcGroundObject.h 22 Mar 2006 01:23:29 -0000 1.2 --- tcGroundObject.h 20 Nov 2006 00:16:29 -0000 1.3 *************** *** 49,53 **** tcGroundObject(); tcGroundObject(tcGroundObject&); ! tcGroundObject(tcGenericDBObject* obj); virtual ~tcGroundObject(); }; --- 49,53 ---- tcGroundObject(); tcGroundObject(tcGroundObject&); ! tcGroundObject(tcPlatformDBObject* obj); virtual ~tcGroundObject(); }; Index: tcAirfieldObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirfieldObject.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcAirfieldObject.h 27 Mar 2006 01:08:30 -0000 1.6 --- tcAirfieldObject.h 20 Nov 2006 00:16:29 -0000 1.7 *************** *** 1,18 **** ! /* @file tcAirfieldObject.h */ ! /* ! ** Copyright (C) 2004 Dewitt Colclough (de...@gc...) ** All rights reserved. ! ** ** This file is part of the Global Conflict Blue (GCB) program. ** GCB is free software; you can redistribute it and/or modify ** it under the terms of version 2 of the GNU General Public License as ** published by the Free Software Foundation. ! ** ** GCB is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. ! ** ** You should have received a copy of the GNU General Public License ** along with GCB; if not, write to the Free Software --- 1,18 ---- ! /** ! ** @file tcAirfieldObject.h */ ! /* Copyright (C) 2004-2006 Dewitt Colclough (de...@gc...) ** All rights reserved. ! ** This file is part of the Global Conflict Blue (GCB) program. ** GCB is free software; you can redistribute it and/or modify ** it under the terms of version 2 of the GNU General Public License as ** published by the Free Software Foundation. ! ** GCB is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. ! ** You should have received a copy of the GNU General Public License ** along with GCB; if not, write to the Free Software *************** *** 31,34 **** --- 31,39 ---- #include "tcFlightOpsObject.h" + namespace database + { + class tcGroundDBObject; + } + namespace scriptinterface { *************** *** 75,80 **** tcAirfieldObject(); ! tcAirfieldObject(tcAirfieldObject&); ! tcAirfieldObject(tcGenericDBObject* obj); virtual ~tcAirfieldObject(); }; --- 80,84 ---- tcAirfieldObject(); ! tcAirfieldObject(tcGroundDBObject* obj); virtual ~tcAirfieldObject(); }; Index: tcHeloObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcHeloObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcHeloObject.h 22 Mar 2006 01:23:29 -0000 1.4 --- tcHeloObject.h 20 Nov 2006 00:16:29 -0000 1.5 *************** *** 52,57 **** tcHeloObject(); ! tcHeloObject(tcHeloObject&); ! tcHeloObject(tcGenericDBObject* obj); virtual ~tcHeloObject(); }; --- 52,56 ---- tcHeloObject(); ! tcHeloObject(tcAirDBObject* obj); virtual ~tcHeloObject(); }; Index: tcAeroAirObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAeroAirObject.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tcAeroAirObject.h 22 Mar 2006 01:23:29 -0000 1.15 --- tcAeroAirObject.h 20 Nov 2006 00:16:29 -0000 1.16 *************** *** 29,33 **** namespace database { ! class tcAirDBObject; } namespace scriptinterface --- 29,33 ---- namespace database { ! class tcJetDBObject; } namespace scriptinterface *************** *** 46,50 **** { public: ! tcAirDBObject *mpDBObject; virtual void ApplyRestrictions(); --- 46,50 ---- { public: ! tcJetDBObject *mpDBObject; virtual void ApplyRestrictions(); *************** *** 70,74 **** tcAeroAirObject(); tcAeroAirObject(tcAeroAirObject&); ! tcAeroAirObject(tcAirDBObject *obj); virtual ~tcAeroAirObject(); protected: --- 70,74 ---- tcAeroAirObject(); tcAeroAirObject(tcAeroAirObject&); ! tcAeroAirObject(tcJetDBObject *obj); virtual ~tcAeroAirObject(); protected: *************** *** 89,93 **** float GetParasiticDragCoefficient(float vmach) const; ! float UpdateThrust(float dt_s); }; --- 89,93 ---- float GetParasiticDragCoefficient(float vmach) const; ! float UpdateThrust(float dt_s, float inv_ias_mps); }; Index: tcStores.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcStores.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcStores.h 24 Oct 2006 01:34:01 -0000 1.11 --- tcStores.h 20 Nov 2006 00:16:29 -0000 1.12 *************** *** 95,99 **** bool AddItems(const std::string& item, unsigned long quantity); ! unsigned long CurrentItemQuantity(const std::string& item) const; unsigned long CurrentQuantity() const; unsigned long IncomingQuantity() const; --- 95,100 ---- bool AddItems(const std::string& item, unsigned long quantity); ! ! unsigned long CurrentItemQuantity(const std::string& itemMask, std::string& matchingItem) const; unsigned long CurrentQuantity() const; unsigned long IncomingQuantity() const; *************** *** 111,115 **** bool IsFull() const; bool LoadLauncher(unsigned int idx, const std::string& item, ! tcGameObject* child = 0); bool LoadOther(const std::string& item, tcGameObject* child = 0); virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger); --- 112,116 ---- bool IsFull() const; bool LoadLauncher(unsigned int idx, const std::string& item, ! tcGameObject* child = 0, unsigned int maxToLoad = 12345); bool LoadOther(const std::string& item, tcGameObject* child = 0); virtual void SaveToPython(scriptinterface::tcScenarioLogger& logger); *************** *** 141,144 **** --- 142,154 ---- private: + struct WeaponInfo + { + std::string name; + size_t quantity; // quantity avail in stores + size_t capacity; // capacity of launcher + float range_km; + int targetFlags; + float weight_kg; + }; tcStoresDBObject* storesDBObj; tcPlatformObject* parent; *************** *** 172,176 **** bool UnloadPlatform(tcGameObject* child); bool LoadPlatform(tcGameObject* child, const std::string& type); ! void GetWeaponInfo(const std::string& name, float& range_km, int& targetFlags) const; }; #endif \ No newline at end of file --- 182,186 ---- bool UnloadPlatform(tcGameObject* child); bool LoadPlatform(tcGameObject* child, const std::string& type); ! void GetWeaponInfo(WeaponInfo& info) const; }; #endif \ No newline at end of file Index: tcAirObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirObject.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tcAirObject.h 22 Mar 2006 01:23:29 -0000 1.15 --- tcAirObject.h 20 Nov 2006 00:16:29 -0000 1.16 *************** *** 30,33 **** --- 30,38 ---- #include "tcCommandObject.h" + namespace database + { + class tcAirDBObject; + } + class tcUpdateStream; class tcCommandStream; *************** *** 46,50 **** }; ! tcGenericDBObject *mpDBObject; int readyForLanding; ///< 1 if gear down/ready for landing, 0 otherwise --- 51,55 ---- }; ! tcAirDBObject* mpDBObject; int readyForLanding; ///< 1 if gear down/ready for landing, 0 otherwise *************** *** 54,61 **** --- 59,71 ---- virtual bool IsDestroyed(); virtual void RandInitNear(float afLon_deg, float afLat_deg); + float GetTotalWeight() const; + virtual void SetAltitude(float new_altitude_m); virtual void SetLandingState(int state); void SetPitchLimit(float limit_rad); virtual void UpdateClimb(float dt_s); virtual void Update(double afStatusTime); + + bool IsOverweight() const; + bool IsReadyForLaunch(); void PrintToFile(tcFile& file); *************** *** 75,83 **** tcAirObject(); tcAirObject(tcAirObject&); ! tcAirObject(tcGenericDBObject *obj); virtual ~tcAirObject(); protected: tcCommandObject commandObj; virtual void UpdateDestroyed(double t); virtual void UpdateEffects(); --- 85,94 ---- tcAirObject(); tcAirObject(tcAirObject&); ! tcAirObject(tcAirDBObject* obj); virtual ~tcAirObject(); protected: tcCommandObject commandObj; + float GlimitedHeadingRate() const; virtual void UpdateDestroyed(double t); virtual void UpdateEffects(); Index: tcPlatformObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** tcPlatformObject.h 24 Oct 2006 01:34:01 -0000 1.39 --- tcPlatformObject.h 20 Nov 2006 00:16:29 -0000 1.40 *************** *** 48,52 **** namespace database { ! class tcGenericDBObject; } --- 48,52 ---- namespace database { ! class tcPlatformDBObject; } *************** *** 89,92 **** --- 89,94 ---- double fuel_kg; ///< current fuel + float externalFuelCapacity_kg; ///< for external fuel tanks + tcLauncherState mcLauncherState; std::vector<tcStores*> magazines; *************** *** 99,103 **** GeoPoint msTargetDatum; tsFormationParameters msFormationParameters; ! tcGenericDBObject *mpDBObject; tcCommandObject commandObj; --- 101,105 ---- GeoPoint msTargetDatum; tsFormationParameters msFormationParameters; ! tcPlatformDBObject *mpDBObject; tcCommandObject commandObj; *************** *** 112,115 **** --- 114,118 ---- virtual void GetDatum(GeoPoint& p) {p=msTargetDatum;} virtual tcLauncher* GetLauncher(unsigned idx); + virtual const tcLauncher* GetLauncher(unsigned idx) const; unsigned int GetLauncherCount() const; wxString GetLauncherDescription(); *************** *** 125,132 **** virtual bool IsInterceptingTrack(long id); bool IsRefueling() const; bool IsCapableVsTargetType(int targetFlag); bool IsEquippedForTargetType(int targetFlag); - bool IsReadyForLaunch(); bool AllLaunchersEmpty(); bool AllLaunchersFull(); --- 128,136 ---- virtual bool IsInterceptingTrack(long id); bool IsRefueling() const; + float GetFuelCapacity() const; + void AdjustExternalFuelCapacity(float change_kg); bool IsCapableVsTargetType(int targetFlag); bool IsEquippedForTargetType(int targetFlag); bool AllLaunchersEmpty(); bool AllLaunchersFull(); *************** *** 166,170 **** tcPlatformObject(); tcPlatformObject(tcPlatformObject&); ! tcPlatformObject(tcGenericDBObject *obj); virtual ~tcPlatformObject(); --- 170,174 ---- tcPlatformObject(); tcPlatformObject(tcPlatformObject&); ! tcPlatformObject(tcPlatformDBObject *obj); virtual ~tcPlatformObject(); *************** *** 176,180 **** virtual void ApplyRestrictions(); virtual void SetFireControlSensors(); - virtual void Move(float dt_s); --- 180,183 ---- Index: Game.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** Game.h 24 Sep 2006 19:50:19 -0000 1.71 --- Game.h 20 Nov 2006 00:16:29 -0000 1.72 *************** *** 250,253 **** --- 250,254 ---- void CheckGoals(); ///< checks if any win/loss goals satisfied void ConsoleMessage(const char *s); ///< print string to info console + const char* GetTimeString(); void HookRandomFriendly(); ///< hooks random friendly platform void NewGroupHook(wxCommandEvent& event); ///< event for group of units hooked Index: tcSurfaceObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSurfaceObject.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcSurfaceObject.h 18 Jun 2006 00:47:51 -0000 1.14 --- tcSurfaceObject.h 20 Nov 2006 00:16:29 -0000 1.15 *************** *** 1,19 **** /** ! * Copyright (C) 2003 Dewitt Colclough (de...@gc...) ! * All rights reserved. ! * ! * This file is part of the Global Conflict Blue (GCB) program. ! * GCB is free software; you can redistribute it and/or modify ! * it under the terms of version 2 of the GNU General Public License as ! * published by the Free Software Foundation. ! * ! * GCB is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. ! * ! * You should have received a copy of the GNU General Public License ! * along with GCB; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ --- 1,21 ---- /** ! ** @file tcSurfaceObject.h ! */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@gc...) ! ** All rights reserved. ! ! ** This file is part of the Global Conflict Blue (GCB) program. ! ** GCB is free software; you can redistribute it and/or modify ! ** it under the terms of version 2 of the GNU General Public License as ! ** published by the Free Software Foundation. ! ! ** GCB is distributed in the hope that it will be useful, ! ** but WITHOUT ANY WARRANTY; without even the implied warranty of ! ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! ** GNU General Public License for more details. ! ! ** You should have received a copy of the GNU General Public License ! ** along with GCB; if not, write to the Free Software ! ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ *************** *** 31,35 **** namespace database { ! class tcGenericDBObject; } --- 33,37 ---- namespace database { ! class tcShipDBObject; } *************** *** 42,46 **** { public: ! tcGenericDBObject *mpDBObject; virtual void Clear(); --- 44,48 ---- { public: ! tcShipDBObject *mpDBObject; virtual void Clear(); *************** *** 60,64 **** tcSurfaceObject(); tcSurfaceObject(tcSurfaceObject&); ! tcSurfaceObject(tcGenericDBObject *obj); ~tcSurfaceObject(); --- 62,66 ---- tcSurfaceObject(); tcSurfaceObject(tcSurfaceObject&); ! tcSurfaceObject(tcShipDBObject* obj); ~tcSurfaceObject(); Index: tcCarrierObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCarrierObject.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tcCarrierObject.h 27 Mar 2006 01:08:30 -0000 1.15 --- tcCarrierObject.h 20 Nov 2006 00:16:29 -0000 1.16 *************** *** 74,78 **** tcCarrierObject(); tcCarrierObject(tcCarrierObject&); ! tcCarrierObject(tcGenericDBObject *obj); virtual ~tcCarrierObject(); }; --- 74,78 ---- tcCarrierObject(); tcCarrierObject(tcCarrierObject&); ! tcCarrierObject(tcShipDBObject* obj); virtual ~tcCarrierObject(); }; |
