gcblue-commits Mailing List for Global Conflict Blue (Page 46)
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
gcblue-commits — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(112) |
Feb
(106) |
Mar
(88) |
Apr
(111) |
May
(53) |
Jun
(60) |
Jul
(58) |
Aug
(61) |
Sep
(45) |
Oct
(31) |
Nov
(71) |
Dec
(70) |
| 2005 |
Jan
(33) |
Feb
(57) |
Mar
(98) |
Apr
(47) |
May
(53) |
Jun
(79) |
Jul
(79) |
Aug
|
Sep
(33) |
Oct
(1) |
Nov
(20) |
Dec
(64) |
| 2006 |
Jan
(20) |
Feb
(1) |
Mar
(43) |
Apr
(11) |
May
(8) |
Jun
(23) |
Jul
|
Aug
(28) |
Sep
(58) |
Oct
(25) |
Nov
(47) |
Dec
(70) |
|
From: Dewitt C. <ddc...@us...> - 2004-08-16 01:43:39
|
Update of /cvsroot/gcblue/gcb_wx/src/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3228/src/common Modified Files: simmath.cpp Log Message: Index: simmath.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** simmath.cpp 8 Aug 2004 00:31:33 -0000 1.15 --- simmath.cpp 16 Aug 2004 01:43:30 -0000 1.16 *************** *** 289,293 **** } ! void tcTrack::GetPrediction(tcTrack& td, double afTime) { float dt_s = (float)(afTime - mfTimestamp); --- 289,310 ---- } ! /** ! * This is a version of GetPrediction that returns a predicted track instead of using a reference ! * and uses delta time vs. absolute time. ! * ! * @param timeDelta_s time difference from track time to predict ahead or use < 0 to predict back ! * @see tcTrack::GetPrediction ! */ ! tcTrack tcTrack::PredictAhead(float timeDelta_s) ! { ! tcTrack track; ! ! GetPrediction(track, mfTimestamp + timeDelta_s); ! ! return track; ! } ! ! void tcTrack::GetPrediction(tcTrack& td, double afTime) ! { float dt_s = (float)(afTime - mfTimestamp); *************** *** 300,309 **** else {td.mfHeading_rad = 0;} ! if (bSpeedValid && bHeadingValid) { float fGroundSpeed_kts; ! if (bClimbValid) { fGroundSpeed_kts = mfSpeed_kts*cosf(mfClimbAngle_rad); } ! else { fGroundSpeed_kts = mfSpeed_kts; } --- 317,329 ---- else {td.mfHeading_rad = 0;} ! if (bSpeedValid && bHeadingValid) ! { float fGroundSpeed_kts; ! if (bClimbValid) ! { fGroundSpeed_kts = mfSpeed_kts*cosf(mfClimbAngle_rad); } ! else ! { fGroundSpeed_kts = mfSpeed_kts; } *************** *** 313,317 **** td.mfSpeed_kts = mfSpeed_kts; } ! else { td.mfLat_rad = mfLat_rad; td.mfLon_rad = mfLon_rad; --- 333,338 ---- td.mfSpeed_kts = mfSpeed_kts; } ! else ! { td.mfLat_rad = mfLat_rad; td.mfLon_rad = mfLon_rad; *************** *** 319,328 **** } ! if (bAltValid && bClimbValid) { float fClimbRate_mps = C_KTSTOMPS*mfSpeed_kts*sinf(mfClimbAngle_rad); td.mfAlt_m = mfAlt_m + fClimbRate_mps*dt_s; td.mfClimbAngle_rad = mfClimbAngle_rad; } ! else { td.mfAlt_m = mfAlt_m; td.mfClimbAngle_rad = 0; --- 340,351 ---- } ! if (bAltValid && bClimbValid) ! { float fClimbRate_mps = C_KTSTOMPS*mfSpeed_kts*sinf(mfClimbAngle_rad); td.mfAlt_m = mfAlt_m + fClimbRate_mps*dt_s; td.mfClimbAngle_rad = mfClimbAngle_rad; } ! else ! { td.mfAlt_m = mfAlt_m; td.mfClimbAngle_rad = 0; |
|
From: Dewitt C. <ddc...@us...> - 2004-08-16 01:43:39
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3228/include/sim Modified Files: Game.h tcLauncherState.h tcMapView.h tcPopupControl.h Log Message: Index: tcPopupControl.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPopupControl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcPopupControl.h 8 Aug 2004 00:31:33 -0000 1.4 --- tcPopupControl.h 16 Aug 2004 01:43:30 -0000 1.5 *************** *** 1,6 **** ! /* ! ** tcPopupControl.h ! ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,6 ---- ! /** ! ** @file tcPopupControl.h ! */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 48,51 **** --- 48,52 ---- MENUMODE_GAME, MENUMODE_PLATFORM, + MENUMODE_GROUP, MENUMODE_TRACK, MENUMODE_GAMEEDIT, *************** *** 64,73 **** void AttachPythonInterface(tcSimPythonInterface *apIF) {mpPythonInterface = apIF;} void SetMenu(teMenuMode mode); ! void SetMenu(void); bool Track(wxPoint point); void OnLButtonDown(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event); ! int Draw(void); ! void UpdateRegions(void); void InitMenu(); tcPopupControl(wxWindow *parent, --- 65,74 ---- void AttachPythonInterface(tcSimPythonInterface *apIF) {mpPythonInterface = apIF;} void SetMenu(teMenuMode mode); ! void SetMenu(); ///< this shouldn't be an override? bool Track(wxPoint point); void OnLButtonDown(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event); ! int Draw(); ! void UpdateRegions(); void InitMenu(); tcPopupControl(wxWindow *parent, Index: Game.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Game.h 8 Aug 2004 00:31:33 -0000 1.43 --- Game.h 16 Aug 2004 01:43:30 -0000 1.44 *************** *** 222,226 **** void ConsoleMessage(const char *s); ///< print string to info console void HookSomethingFriendly(); ///< used to avoid blank 3D screen in rand scenario ! void NewHook(wxCommandEvent& event); void NewHook(long hookID); void OnChar(wxKeyEvent& event); --- 222,227 ---- void ConsoleMessage(const char *s); ///< print string to info console void HookSomethingFriendly(); ///< used to avoid blank 3D screen in rand scenario ! void NewGroupHook(wxCommandEvent& event); ///< event for group of units hooked ! void NewHook(wxCommandEvent& event); ///< event for single unit hooked (deprecated) void NewHook(long hookID); void OnChar(wxKeyEvent& event); Index: tcMapView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapView.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** tcMapView.h 8 Aug 2004 00:31:33 -0000 1.23 --- tcMapView.h 16 Aug 2004 01:43:30 -0000 1.24 *************** *** 260,264 **** void UpdateNavPoints(std::vector<tcPoint> *mpPoints); ! int GetClosest(wxPoint pscreen); void GetMapCmdDatum(tcPoint& p) {p=mpointGeoDatum;} --- 260,265 ---- void UpdateNavPoints(std::vector<tcPoint> *mpPoints); ! /// returns id of closest unit to <pscreen> within fixed dist or -1 if none ! long GetClosest(wxPoint pscreen); void GetMapCmdDatum(tcPoint& p) {p=mpointGeoDatum;} *************** *** 286,291 **** --- 287,294 ---- long GetHookID(size_t idx = 0); long Hook(wxPoint pscreen); + void HookAnother(wxPoint pscreen); void HookGroup(wxRect& region); long HookSecondary(wxPoint pscreen); + bool IsFirstHook(long id); bool IsHooked(long id); bool IsMapCmdActive() {return meMapCmd != MC_NONE;} *************** *** 343,348 **** Gdiplus::Graphics* GetGraphicsFromImage(Gdiplus::Image* apImage); ! ! void UpdateScreenNavPoints(void); }; --- 346,351 ---- Gdiplus::Graphics* GetGraphicsFromImage(Gdiplus::Image* apImage); ! ! void UpdateScreenNavPoints(); }; Index: tcLauncherState.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncherState.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcLauncherState.h 19 Jul 2004 00:52:27 -0000 1.8 --- tcLauncherState.h 16 Aug 2004 01:43:30 -0000 1.9 *************** *** 83,86 **** --- 83,87 ---- void AddFullLauncher(tnPoolIndex anKey, float azimuth_rad); + float EstimateInterceptTimeForLauncher(unsigned nLauncher, tcTrack& track); const char* GetFireControlSensorClass(unsigned nLauncher) const; tcLauncher* GetLauncher(unsigned int nLauncher); |
|
From: Dewitt C. <ddc...@us...> - 2004-08-16 01:43:39
|
Update of /cvsroot/gcblue/gcb_wx/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3228/scripts Modified Files: Menu.py UnitCommands.py Log Message: Index: UnitCommands.py =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/scripts/UnitCommands.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** UnitCommands.py 9 Aug 2004 02:35:14 -0000 1.8 --- UnitCommands.py 16 Aug 2004 01:43:30 -0000 1.9 *************** *** 1,5 **** --- 1,18 ---- + def AddWaypointOrderGroup(GI, lon, lat): + unit_count = GI.GetUnitCount() + for n in range(0, unit_count): + UnitInfo = GI.GetPlatformInterface(n) + AddWaypointOrder(UnitInfo, lon, lat) + def AddWaypointOrder(UI, lon, lat): UI.AddNavOrder(lon,lat) + + def AddPatrolOrderGroup(GI): + unit_count = GI.GetUnitCount() + for n in range(0, unit_count): + UnitInfo = GI.GetPlatformInterface(n) + AddPatrolOrder(UnitInfo) + def AddPatrolOrder(UI): UI.AddOrder('Patrol',0) *************** *** 12,15 **** --- 25,34 ---- + def ClearOrdersGroup(GI): + unit_count = GI.GetUnitCount() + for n in range(0, unit_count): + UnitInfo = GI.GetPlatformInterface(n) + ClearOrders(UnitInfo) + def ClearOrders(UI): UI.ClearOrders() *************** *** 51,56 **** if UI.IsDatumLaunch(launcher): track_info = UI.GetTargetTrackInfo() ! lat = track_info.Lat ! lon = track_info.Lon UI.HandoffTargetToLauncher(launcher) # so that intended target is set LaunchDatum(UI, lon, lat, launcher) --- 70,77 ---- if UI.IsDatumLaunch(launcher): track_info = UI.GetTargetTrackInfo() ! tti_s = UI.GetLauncherInterceptTime(launcher, track_info) ! predicted_track = track_info.PredictAhead(tti_s) ! lat = predicted_track.Lat ! lon = predicted_track.Lon UI.HandoffTargetToLauncher(launcher) # so that intended target is set LaunchDatum(UI, lon, lat, launcher) *************** *** 110,113 **** --- 131,140 ---- UI.SetSpeed(k*max_speed) + def SetHeadingGroup(GI, h): + unit_count = GI.GetUnitCount() + for n in range(0, unit_count): + UnitInfo = GI.GetPlatformInterface(n) + SetHeading(UnitInfo, h) + def SetHeading(UI,h): UI.SetHeadingRad(h) Index: Menu.py =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/scripts/Menu.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Menu.py 29 Jan 2004 00:05:21 -0000 1.4 --- Menu.py 16 Aug 2004 01:43:30 -0000 1.5 *************** *** 27,30 **** --- 27,45 ---- TrackInfo.DropTrack() + def BuildGroupMenu(GroupMenu, GroupInfo): + GroupMenu.Clear() + + unit_count = GroupInfo.GetUnitCount() + #GroupMenu.AddItem('Total units: %d' % unit_count, '') + GroupMenu.AddItemUI('Change heading','SetHeadingGroup','Heading') + + # Group orders + GroupMenu.AddItem('Orders','') + GroupMenu.BeginSubMenu() + GroupMenu.AddItem('Add patrol order','AddPatrolOrderGroup') + GroupMenu.AddItemUI('Add waypoint order', 'AddWaypointOrderGroup', 'Datum') + GroupMenu.AddItem('Clear orders','ClearOrdersGroup') + GroupMenu.EndSubMenu() + ###### Unit menu scripts ##### |
|
From: Dewitt C. <ddc...@us...> - 2004-08-12 01:14:37
|
Update of /cvsroot/gcblue/gcb_wx/src/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30041/src/sim Modified Files: tcBallisticWeapon.cpp Log Message: Index: tcBallisticWeapon.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcBallisticWeapon.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcBallisticWeapon.cpp 6 Aug 2004 02:47:51 -0000 1.4 --- tcBallisticWeapon.cpp 12 Aug 2004 01:14:28 -0000 1.5 *************** *** 95,102 **** tsGeoPoint targetDatum = pLauncher->msDatum; ! mcKin.mfHeading_rad = obj->mcKin.HeadingToGeoRad(&targetDatum); ! float range_m = 1000.0f * obj->mcKin.RangeToKm(&targetDatum); ! float dz_m = targetDatum.mfAlt_m - obj->mcKin.mfAlt_m; float tti_s; --- 95,102 ---- tsGeoPoint targetDatum = pLauncher->msDatum; ! mcKin.mfHeading_rad = mcKin.HeadingToGeoRad(&targetDatum); ! float range_m = 1000.0f * mcKin.RangeToKm(&targetDatum); ! float dz_m = targetDatum.mfAlt_m - mcKin.mfAlt_m; float tti_s; |
|
From: Dewitt C. <ddc...@us...> - 2004-08-12 01:14:37
|
Update of /cvsroot/gcblue/gcb_wx/src/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30041/src/database Modified Files: tcBallisticDBObject.cpp Log Message: Index: tcBallisticDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcBallisticDBObject.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcBallisticDBObject.cpp 8 Aug 2004 00:31:33 -0000 1.3 --- tcBallisticDBObject.cpp 12 Aug 2004 01:14:28 -0000 1.4 *************** *** 48,53 **** { float launchSpeed = launchSpeed_mps; ! float fac = range_m * range_m * C_G * C_G; // 4 * 0.25 = 1 float b = -launchSpeed * launchSpeed; float b2 = b * b; --- 48,56 ---- { float launchSpeed = launchSpeed_mps; ! ! float fac = range_m * range_m * C_G2; // 4 * 0.25 = 1 float b = -launchSpeed * launchSpeed; + const float two_over_g = 2.0f / C_G; + float one_over_launchSpeed = 1.0f / launchSpeed_mps; float b2 = b * b; *************** *** 58,66 **** } ! float vz = sqrtf( 0.5f * (-b - sqrt(b2 - fac)) ); // -b + for lofted trajectory ! tti_s = 2 * vz / C_G; ! float elevation_rad = asinf(vz / launchSpeed); return elevation_rad; --- 61,94 ---- } ! float vz = sqrtf( 0.5f * (-b - sqrtf(b2 - fac)) ); // -b + for lofted trajectory ! tti_s = two_over_g * vz; ! float elevation_rad = asinf(one_over_launchSpeed * vz); ! ! // if target altitude difference is negligible, return ! if (fabsf(dz_m) <= 1.0f) return elevation_rad; ! ! ! /* otherwise re-estimate with range adjusted for altitude difference. ! ** This is a coarse approximation and will still have error. ! ** A better approximation can be done using an enhanced quadratic (or ! ** an iterative solution of the exact equation). ! */ ! wxASSERT(dz_m != 0); ! range_m += (dz_m / vz) * launchSpeed * cosf(elevation_rad); ! ! // update calculations with new range_m ! fac = range_m * range_m * C_G2; ! ! if (b2 < fac) ! { ! tti_s = 0; ! return 0.25f * C_PI; ! } ! ! vz = sqrtf( 0.5f * (-b - sqrtf(b2 - fac)) ); ! tti_s = two_over_g * vz; ! elevation_rad = asinf(one_over_launchSpeed * vz); return elevation_rad; |
|
From: Dewitt C. <ddc...@us...> - 2004-08-12 01:14:36
|
Update of /cvsroot/gcblue/gcb_wx/include/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30041/include/common Modified Files: math_constants.h Log Message: Index: math_constants.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/math_constants.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** math_constants.h 8 Aug 2004 00:31:31 -0000 1.7 --- math_constants.h 12 Aug 2004 01:14:27 -0000 1.8 *************** *** 43,47 **** #define C_MPSTODEGPS 8.999280e-006f #define C_MPSTORADPS 1.5706707e-7f ! #define C_G 9.80665f #define C_KTSTODEGPS 4.6296296296296e-6f #define C_KTSTORADPS 8.0802280e-8f --- 43,48 ---- #define C_MPSTODEGPS 8.999280e-006f #define C_MPSTORADPS 1.5706707e-7f ! #define C_G 9.80665f ///< gravitational acceleration in m/s^2 ! #define C_G2 96.170384f ///< g^2 #define C_KTSTODEGPS 4.6296296296296e-6f #define C_KTSTORADPS 8.0802280e-8f *************** *** 51,55 **** #define C_KMTORAD 1.5678552e-4f #define C_MTORAD 1.5678552e-7f ! #define C_RADARHOR 3.92482f // radar horizon in km = constant*sqrt(h in meters) namespace UnitConversions --- 52,56 ---- #define C_KMTORAD 1.5678552e-4f #define C_MTORAD 1.5678552e-7f ! #define C_RADARHOR 3.92482f ///< radar horizon in km = constant*sqrt(h in meters) namespace UnitConversions |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:36:08
|
Update of /cvsroot/gcblue/gcb_wx/include/scriptinterface In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/include/scriptinterface Modified Files: tcPlatformInterface.h Log Message: Index: tcPlatformInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcPlatformInterface.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** tcPlatformInterface.h 19 Jul 2004 00:52:26 -0000 1.22 --- tcPlatformInterface.h 9 Aug 2004 02:35:14 -0000 1.23 *************** *** 150,158 **** bool IsSurface() {return (mpPlatformObj->mnModelType == MTYPE_SURFACE);} /// returns true if platform is an air platform ! bool IsAir() { UINT32 nModelType = mpPlatformObj->mnModelType; return (nModelType == MTYPE_FIXEDWING)||(nModelType == MTYPE_FIXEDWINGX) ! ||(nModelType == MTYPE_AIR); } // script variables --- 150,163 ---- bool IsSurface() {return (mpPlatformObj->mnModelType == MTYPE_SURFACE);} /// returns true if platform is an air platform ! bool IsAir() ! { UINT32 nModelType = mpPlatformObj->mnModelType; return (nModelType == MTYPE_FIXEDWING)||(nModelType == MTYPE_FIXEDWINGX) ! ||(nModelType == MTYPE_AIR)||(nModelType == MTYPE_HELO); } + bool IsHelo() + { + return (mpPlatformObj->mnModelType == MTYPE_HELO); + } // script variables |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:36:07
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/include/sim Modified Files: tc3DViewer.h tcAirObject.h tcFlightPort.h Added Files: tcHeloObject.h Log Message: Index: tcFlightPort.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightPort.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcFlightPort.h 8 Aug 2004 00:31:33 -0000 1.6 --- tcFlightPort.h 9 Aug 2004 02:35:14 -0000 1.7 *************** *** 132,135 **** --- 132,136 ---- std::vector<tsSpotInfo> launch_spots; + tcFlightportDBObject* mpDBObject; unsigned hangarCapacity; unsigned inHangarCount; // count of units in hangar or in transit to hangar Index: tcAirObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirObject.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcAirObject.h 8 Aug 2004 00:31:33 -0000 1.10 --- tcAirObject.h 9 Aug 2004 02:35:14 -0000 1.11 *************** *** 1,4 **** ! /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,6 ---- ! /** ! ** @file tcAirObject.h ! */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 21,25 **** --- 23,29 ---- #define _AIROBJECT_H_ + #if _MSC_VER > 1000 #pragma once + #endif #include "tcPlatformObject.h" --- NEW FILE: tcHeloObject.h --- /** ** @file tcHeloObject.h */ /* Copyright (C) 2004 Dewitt Colclough (de...@tw...) ** 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 */ #ifndef _HELOOBJECT_H_ #define _HELOOBJECT_H_ #if _MSC_VER > 1000 #pragma once #endif #include "tcAirObject.h" /** * Models helo object that can hover */ class tcHeloObject : public tcAirObject { public: virtual void ApplyRestrictions(); virtual void Clear(); virtual void RandInitNear(float afLon_deg, float afLat_deg); virtual void UpdateClimb(float dt_s); virtual void Update(double afStatusTime); void PrintToFile(tcFile& file); void SaveToFile(tcFile& file); void LoadFromFile(tcFile& file); virtual void Serialize(tcFile& file, bool mbLoad); tcHeloObject(); tcHeloObject(tcHeloObject&); tcHeloObject(tcGenericDBObject* obj); virtual ~tcHeloObject(); }; #endif Index: tc3DViewer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tc3DViewer.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** tc3DViewer.h 8 Aug 2004 00:31:33 -0000 1.25 --- tc3DViewer.h 9 Aug 2004 02:35:14 -0000 1.26 *************** *** 23,27 **** --- 23,29 ---- #define _3DVIEWER_H_ + #if _MSC_VER > 1000 #pragma once + #endif |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:36:07
|
Update of /cvsroot/gcblue/gcb_wx/include/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/include/database Modified Files: tcDBObjSerializerSql.h tcSqlReader.h Log Message: Index: tcDBObjSerializerSql.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBObjSerializerSql.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcDBObjSerializerSql.h 8 Aug 2004 00:31:32 -0000 1.1 --- tcDBObjSerializerSql.h 9 Aug 2004 02:35:13 -0000 1.2 *************** *** 32,35 **** --- 32,36 ---- #include <string> #include "sqlite/sqlite_plus.h" + #include "database/tcSqlReader.h" #include <wx/wx.h> *************** *** 68,82 **** { ! // check if the table exists, abort if it doesn't ! string countStr = ! sqlConn.executescalar("select count(*) from sqlite_master where name='%s';", ! tableName.c_str()); ! if (countStr == "0") { ! fprintf(stderr, "tcDBObjSerializerSql<T>::Load() table (%s) not found\n", ! tableName.c_str()); return false; } --- 69,125 ---- { ! try ! { ! // check if the table exists, abort if it doesn't ! string countStr = ! sqlConn.executescalar("select count(*) from sqlite_master where name='%s';", ! tableName.c_str()); ! if (countStr == "0") ! { ! wxString message = wxString::Format( ! "tcDBObjSerializerSql<T>::Load() table (%s) not found\n", ! tableName.c_str()); + wxMessageBox(message.GetData(), "Error", wxICON_ERROR); + return false; + } ! } ! catch (exception& ex) { ! wxMessageBox(ex.what(), "Error", wxICON_ERROR); ! return false; ! } ! ! ! ! try ! { ! sqlite::reader tableInfo = sqlConn.executereader( ! "pragma table_info(%s);", tableName.c_str() ); ! ! sqlite::reader tableData = sqlConn.executereader( ! "select * from %s;", tableName.c_str()); ! ! tcSqlReader sqlReader(tableInfo, tableData); ! ! while (sqlReader.Read()) ! { ! tnPoolIndex key; ! T* obj = new T; ! obj->ReadSql(sqlReader); ! ! database->mcObjectData.AddElement(obj, key); // add to database, key gets new key val ! obj->mnKey = key; // set key val of object (may not be necessary anymore) ! } ! ! tableInfo.close(); ! tableData.close(); ! ! } ! catch (exception& ex) ! { ! wxMessageBox(ex.what(), "Error", wxICON_ERROR); return false; } Index: tcSqlReader.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSqlReader.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcSqlReader.h 8 Aug 2004 00:31:32 -0000 1.1 --- tcSqlReader.h 9 Aug 2004 02:35:14 -0000 1.2 *************** *** 54,59 **** --- 54,64 ---- public: double GetDouble(std::string& field); + double GetDouble(const char* fmt, ...); + int GetInt(std::string& field); + int GetInt(const char* fmt, ...); + std::string GetString(std::string& field); + std::string GetString(const char* fmt, ...); bool Read(); *************** *** 64,67 **** --- 69,73 ---- std::map<std::string, unsigned int> columnLookup; sqlite::reader& data; + char buffer[128]; ///< internal buffer for formatting column names, watch overrun! void BuildColumnLookup(sqlite::reader& tableInfo); |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:35:53
|
Update of /cvsroot/gcblue/gcb_wx/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/docs Modified Files: CHANGES.txt Log Message: Index: CHANGES.txt =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/docs/CHANGES.txt,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** CHANGES.txt 8 Aug 2004 00:31:31 -0000 1.32 --- CHANGES.txt 9 Aug 2004 02:35:13 -0000 1.33 *************** *** 3,6 **** --- 3,13 ---- 0.6 --------------------------------------------------------------------- + *** 2004-08-08 Dewitt Colclough *** + - Added read portion of SQL database upgrade using sqlite library. + - Random scenario now starts at a random date and time + - Adjusted max camera elevation to 65 deg (to allow look down more + with cam) + - Added helo sim class using generics database table + *** 2004-08-07 Dewitt Colclough *** - Added write portion of SQL database upgrade using sqlite library. *************** *** 8,12 **** *** 2004-08-05 Dewitt Colclough *** - Added launcher location field to database. Launched objects (e.g. ! missiles) start at this location. *** 2004-08-04 Dewitt Colclough *** --- 15,20 ---- *** 2004-08-05 Dewitt Colclough *** - Added launcher location field to database. Launched objects (e.g. ! missiles) start at this location. Note this messes up gun targeting. ! Need to add altitude difference correction to gun targeting. *** 2004-08-04 Dewitt Colclough *** |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:35:53
|
Update of /cvsroot/gcblue/gcb_wx/include/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/include/common Modified Files: simmath.h Log Message: Index: simmath.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/simmath.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** simmath.h 6 Aug 2004 02:47:50 -0000 1.18 --- simmath.h 9 Aug 2004 02:35:13 -0000 1.19 *************** *** 159,173 **** }; class tcKinematics { public: ! double mfLon_rad; ///< longitude [rad] ! double mfLat_rad; ///< latitude [rad] float mfAlt_m; ///< altitude, negative is subsurface depth [m] float mfHeading_rad; ///< relative to north [rad] ! float mfClimbAngle_rad; // ! float mfYaw_rad; ///< heading and climb angle define motion vector ! float mfPitch_rad; ///< yaw, pitch, roll define orientation ! float mfRoll_rad; float mfSpeed_kts; ///< [kts] --- 159,179 ---- }; + /** + * Class to hold kinematic state information + * + * heading and climb angle define motion vector, + * yaw, pitch, roll define orientation + */ class tcKinematics { public: ! double mfLon_rad; ///< longitude [rad] ! double mfLat_rad; ///< latitude [rad] float mfAlt_m; ///< altitude, negative is subsurface depth [m] float mfHeading_rad; ///< relative to north [rad] ! float mfClimbAngle_rad; ///< climb angle defines vertical motion vector [rad] ! float mfYaw_rad; ///< orientation in azimuthal plane ! float mfPitch_rad; ///< orientation in elevation plane ! float mfRoll_rad; ///< orienation about roll axis float mfSpeed_kts; ///< [kts] |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:35:51
|
Update of /cvsroot/gcblue/gcb_wx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303 Modified Files: GCblue.vcproj Log Message: Index: GCblue.vcproj =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/GCblue.vcproj,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** GCblue.vcproj 8 Aug 2004 00:31:31 -0000 1.62 --- GCblue.vcproj 9 Aug 2004 02:35:08 -0000 1.63 *************** *** 410,413 **** --- 410,416 ---- </File> <File + RelativePath=".\src\sim\tcHeloObject.cpp"> + </File> + <File RelativePath="src\sim\tcHookInfo.cpp"> </File> *************** *** 1244,1247 **** --- 1247,1253 ---- </File> <File + RelativePath=".\include\sim\tcHeloObject.h"> + </File> + <File RelativePath="include\sim\tcHookInfo.h"> </File> |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:35:29
|
Update of /cvsroot/gcblue/gcb_wx/src/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/src/sim Modified Files: Game.cpp tc3DViewer.cpp tcAirObject.cpp tcAirfieldObject.cpp tcFlightOpsObject.cpp tcFlightPort.cpp tcGameObject.cpp tcLauncherState.cpp tcMapView.cpp tcObjectControl.cpp tcPlatformObject.cpp tcScenarioSelectView.cpp tcSimState.cpp Added Files: tcHeloObject.cpp Log Message: --- NEW FILE: tcHeloObject.cpp --- /** ** @file tcHeloObject.cpp */ /* Copyright (C) 2004 Dewitt Colclough (de...@tw...) ** 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 */ #include "stdwx.h" #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "tcHeloObject.h" #include "tcGenericDBObject.h" void tcHeloObject::Clear() { tcAirObject::Clear(); } void tcHeloObject::RandInitNear(float afLon_deg, float afLat_deg) { if (mpDBObject == NULL) {return;} tcAirObject::RandInitNear(afLon_deg, afLat_deg); // replace unit prefix, otherwise use tcAirObject RandInitNear mzUnit = "HELO_"; mzUnit.AssignRandomSuffix(); } void tcHeloObject::PrintToFile(tcFile& file) { tcAirObject::PrintToFile(file); } void tcHeloObject::SaveToFile(tcFile& file) { tcAirObject::SaveToFile(file); } void tcHeloObject::LoadFromFile(tcFile& file) { tcAirObject::LoadFromFile(file); } void tcHeloObject::Serialize(tcFile& file, bool mbLoad) { if (mbLoad) { LoadFromFile(file); } else { SaveToFile(file); } } void tcHeloObject::ApplyRestrictions() { // check for crash if ((mcKin.mfAlt_m <= 0)||(mcTerrain.mfHeight_m >= mcKin.mfAlt_m)) { mfDamageLevel = 1.0f; } } /** * Has problems for large time steps, > about 1 sec */ void tcHeloObject::UpdateClimb(float dt_s) { float dalt_min, dalt_max, fAltitudeRate_mps; float dalt_m = mcGS.mfGoalAltitude_m - mcKin.mfAlt_m; // set pitch based on speed mcKin.mfPitch_rad = -0.20f * mcKin.mfSpeed_kts / mpDBObject->mfMaxSpeed_kts; // set climb angle to zero and let this method update altitude mcKin.mfClimbAngle_rad = 0; if ((dalt_m > -0.25f)&&(dalt_m < 0.25f)) { return; } const float fHighZone = 100.0f; const float fLowZone = -100.0f; float fMaxRate = mpDBObject->mfAltitudeRate_mps; // reduce rate to zero near max altitude if (mcKin.mfAlt_m > mpDBObject->mfMaxAltitude_m - 200) { fMaxRate *= 0.005f * (mpDBObject->mfMaxAltitude_m - mcKin.mfAlt_m); } if ((dalt_m > fHighZone)||(dalt_m < fLowZone)) { fAltitudeRate_mps = fMaxRate; } else if (dalt_m < 0) { fAltitudeRate_mps = fMaxRate*(dalt_m/fLowZone) + 2.0f; } else { fAltitudeRate_mps = fMaxRate*(dalt_m/fHighZone) + 2.0f; } // restrict climb to altitude rate dalt_max = fAltitudeRate_mps * dt_s; dalt_min = (mcKin.mfAlt_m <= 200.0f) ? -dalt_max : -2.0f*dalt_max; if (dalt_m < dalt_min) {dalt_m = dalt_min;} else if (dalt_m > dalt_max) {dalt_m = dalt_max;} mcKin.mfAlt_m += dalt_m; } void tcHeloObject::Update(double afStatusTime) { const float min_update_s = 0.0f; float dt_s = (float)(afStatusTime - mfStatusTime); UpdateEffects(); // shouldn't be called for child objects if (parent != NULL) {return;} // captive, let parent update if applicable if (dt_s <= min_update_s) {return;} // added for pause case wxASSERT(mpDBObject); UpdateFormationGuidance(); // formation heading/speed calculation // don't use air method since we don't care about roll tcPlatformObject::UpdateHeading(dt_s); UpdateSpeed(dt_s); UpdateClimb(dt_s); ApplyRestrictions(); // crash check Move(dt_s); UpdateLauncherState(dt_s); UpdateSensors(afStatusTime); mfStatusTime = afStatusTime; } tcHeloObject::tcHeloObject() { mnModelType = MTYPE_HELO; SetAltitude(1000.0f); SetHeading(75.0f); SetSpeed(100.0f); readyForLanding = 0; } /** * Constructor that initializes using info from database entry. */ tcHeloObject::tcHeloObject(tcGenericDBObject *obj) : tcAirObject(obj) { mnModelType = MTYPE_HELO; } tcHeloObject::~tcHeloObject() { } Index: tcFlightPort.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcFlightPort.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcFlightPort.cpp 8 Aug 2004 00:31:35 -0000 1.9 --- tcFlightPort.cpp 9 Aug 2004 02:35:16 -0000 1.10 *************** *** 1,21 **** ! /** @file tcFlightport.cpp */ ! /** ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) ! * 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 ! */ #include "stdwx.h" // precompiled header file --- 1,22 ---- ! /** ! ** @file tcFlightport.cpp ! */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ! ** 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 ! */ #include "stdwx.h" // precompiled header file *************** *** 31,34 **** --- 32,36 ---- #include "tcAirObject.h" #include "tcAeroAirObject.h" + #include "tcHeloObject.h" #include "tcFlightportDBObject.h" #include "tcGenericDBObject.h" *************** *** 140,143 **** --- 142,152 ---- int tcFlightPort::CheckLanding(tcGameObject *obj) { + bool isAir = dynamic_cast<tcAirObject*>(obj) != 0; + bool isHelo = dynamic_cast<tcHeloObject*>(obj) != 0; + + bool compatible = isAir && (!mpDBObject->heloOnly || isHelo); + + if (!compatible) return 0; + int nRunways = (int)launch_spots.size(); for (int n=0;n<nRunways;n++) *************** *** 387,393 **** Clear(); - hangarCapacity = dbObj->hangarCapacity; - inHangarCount = 0; size_t nSpots = dbObj->spotInfo.size(); for(size_t spot=0;spot<nSpots;spot++) --- 396,405 ---- Clear(); + mpDBObject = dbObj; + + hangarCapacity = mpDBObject->hangarCapacity; + inHangarCount = 0; + size_t nSpots = dbObj->spotInfo.size(); for(size_t spot=0;spot<nSpots;spot++) *************** *** 437,444 **** if (airstate->current_location == TRANSIT) { ! if (time >= airstate->ready_time) { airstate->current_location = airstate->goal_location; airstate->current_spot = airstate->goal_spot; airstate->op = OP_NONE; InitRelPos(airstate); } --- 449,462 ---- if (airstate->current_location == TRANSIT) { ! if (time >= airstate->ready_time) ! { ! if (airstate->current_location == HANGAR) inHangarCount--; ! if (airstate->goal_location == HANGAR) inHangarCount++; airstate->current_location = airstate->goal_location; airstate->current_spot = airstate->goal_spot; airstate->op = OP_NONE; + + wxASSERT(inHangarCount <= hangarCapacity); + InitRelPos(airstate); } *************** *** 452,459 **** tcGameObject *parent = unit->parent; if (parent == NULL) return; // error unit->mcKin = parent->mcKin; unit->mcKin.mfHeading_rad += unit->rel_pos.yaw; unit->mcKin.mfAlt_m += unit->rel_pos.dy; - unit->mcKin.mfSpeed_kts += 200.0f; unit->SetHeading(unit->mcKin.mfHeading_rad); unit->mfStatusTime = parent->mfStatusTime; --- 470,477 ---- tcGameObject *parent = unit->parent; if (parent == NULL) return; // error + unit->mcKin = parent->mcKin; unit->mcKin.mfHeading_rad += unit->rel_pos.yaw; unit->mcKin.mfAlt_m += unit->rel_pos.dy; unit->SetHeading(unit->mcKin.mfHeading_rad); unit->mfStatusTime = parent->mfStatusTime; *************** *** 473,482 **** --- 491,509 ---- if (tcAeroAirObject* aa_unit = dynamic_cast<tcAeroAirObject*>(unit)) { + aa_unit->mcKin.mfSpeed_kts += 200.0f; aa_unit->SetThrottleFraction(1.1); aa_unit->SetAltitude(unit->mcKin.mfAlt_m + 500.0f); aa_unit->SetLandingState(0); } + else if (tcHeloObject* helo_unit = dynamic_cast<tcHeloObject*>(unit)) + { + helo_unit->mcKin.mfClimbAngle_rad = 1.5f; + helo_unit->SetSpeed(helo_unit->mcKin.mfSpeed_kts + 5); + helo_unit->SetAltitude(helo_unit->mcKin.mfAlt_m + 500.0f); + helo_unit->SetLandingState(0); + } else if (tcAirObject *air_unit = dynamic_cast<tcAirObject*>(unit)) { + air_unit->mcKin.mfSpeed_kts += 200.0f; air_unit->SetSpeed(air_unit->mpDBObject->mfMaxSpeed_kts); air_unit->SetAltitude(unit->mcKin.mfAlt_m + 500.0f); *************** *** 524,528 **** { tcGameObject *obj = toLand.at(n); ! AddObject(obj, READY); // add landed objects to deck if possible } toLand.clear(); --- 551,560 ---- { tcGameObject *obj = toLand.at(n); ! // add landed objects to deck if possible ! if (!AddObject(obj, READY)) ! { ! obj->mfDamageLevel += 10000; // destroy object ! toLaunch.push_back(obj); // kick it out to be destroyed ! } } toLand.clear(); *************** *** 535,538 **** --- 567,571 ---- Clear(); parent = NULL; + mpDBObject = NULL; } tcFlightPort::~tcFlightPort() Index: tcPlatformObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcPlatformObject.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** tcPlatformObject.cpp 19 Jul 2004 00:53:01 -0000 1.27 --- tcPlatformObject.cpp 9 Aug 2004 02:35:16 -0000 1.28 *************** *** 1,6 **** ! /** @file tcPlatformObject.cpp */ ! /* ! ** Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,6 ---- ! /** ! ** @file tcPlatformObject.cpp */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 197,203 **** float ds_max = mpDBObject->mfAccel_ktsps*dt_s; float ds_min = -ds_max; ! if (ds_kts < ds_min) {ds_kts = ds_min;} // restrict to turn rate else if (ds_kts > ds_max) {ds_kts = ds_max;} mcKin.mfSpeed_kts += ds_kts; } --- 197,206 ---- float ds_max = mpDBObject->mfAccel_ktsps*dt_s; float ds_min = -ds_max; ! ! if (ds_kts < ds_min) {ds_kts = ds_min;} // restrict to acceleration else if (ds_kts > ds_max) {ds_kts = ds_max;} mcKin.mfSpeed_kts += ds_kts; + + if (mcKin.mfSpeed_kts < 0) mcKin.mfSpeed_kts = 0; } Index: tcObjectControl.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcObjectControl.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** tcObjectControl.cpp 24 May 2004 00:14:47 -0000 1.16 --- tcObjectControl.cpp 9 Aug 2004 02:35:16 -0000 1.17 *************** *** 488,492 **** // intercept data for missiles ! if (mpHookedGameObj->mnModelType==MTYPE_MISSILE) { tsGuidanceParameters gp; --- 488,492 ---- // intercept data for missiles ! if (mpHookedGameObj->mnModelType == MTYPE_MISSILE) { tsGuidanceParameters gp; *************** *** 534,541 **** DrawHeadingObject(pGraphics, &msHOI, pkin->mfHeading_rad, mfGoalHeading_rad); // object heading ! bool mbSurface = (mpHookedGameObj->mnModelType == MTYPE_SURFACE) ! || (mpHookedGameObj->mnModelType == MTYPE_CARRIER); ! bool mbAir = (mpHookedGameObj->mnModelType == MTYPE_FIXEDWING) ! || (mpHookedGameObj->mnModelType == MTYPE_FIXEDWINGX); bool mbDrawSpeed = mbSurface || mbAir; bool mbDrawAltitude = mbAir; --- 534,544 ---- DrawHeadingObject(pGraphics, &msHOI, pkin->mfHeading_rad, mfGoalHeading_rad); // object heading ! bool mbSurface = (mpHookedGameObj->mnModelType == MTYPE_SURFACE) || ! (mpHookedGameObj->mnModelType == MTYPE_CARRIER); ! ! bool mbAir = (mpHookedGameObj->mnModelType == MTYPE_FIXEDWING) || ! (mpHookedGameObj->mnModelType == MTYPE_FIXEDWINGX) || ! (mpHookedGameObj->mnModelType == MTYPE_HELO); ! bool mbDrawSpeed = mbSurface || mbAir; bool mbDrawAltitude = mbAir; *************** *** 1062,1065 **** --- 1065,1071 ---- strcpy(zClass,"AIR"); break; + case DTYPE_BALLISTIC: + strcpy(zClass,"BAL"); + break; default: strcpy(zClass,"ERR"); *************** *** 1090,1093 **** --- 1096,1108 ---- strcpy(zModel,"FXAIR"); break; + case MTYPE_HELO: + strcpy(zModel,"HELO"); + break; + case MTYPE_BALLISTIC: + strcpy(zModel,"BAL"); + break; + case MTYPE_AIRFIELD: + strcpy(zModel,"FIELD"); + break; default: strcpy(zModel,"ERR"); *************** *** 1133,1136 **** --- 1148,1154 ---- strcpy(zType,"LAND"); break; + case PTYPE_BALLISTIC: + strcpy(zType,"BAL"); + break; default: strcpy(zType,"ERR"); *************** *** 1442,1445 **** --- 1460,1464 ---- case MTYPE_FIXEDWING: case MTYPE_FIXEDWINGX: + case MTYPE_HELO: { //tcSurfaceObject *pSurfaceObj = (tcSurfaceObject*)mpHookedGameObj; Index: tcGameObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcGameObject.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** tcGameObject.cpp 8 Aug 2004 00:31:35 -0000 1.19 --- tcGameObject.cpp 9 Aug 2004 02:35:16 -0000 1.20 *************** *** 502,506 **** mnID = NULL_INDEX; // remains NULL index for child model = obj->Get3DModel(); ! model->SetupUpdate(this); } --- 502,506 ---- mnID = NULL_INDEX; // remains NULL index for child model = obj->Get3DModel(); ! if (model) model->SetupUpdate(this); } Index: tcAirObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAirObject.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcAirObject.cpp 4 Jun 2004 21:39:23 -0000 1.10 --- tcAirObject.cpp 9 Aug 2004 02:35:16 -0000 1.11 *************** *** 1,5 **** ! /** @file tcAirObject.cpp ! ** ! ** Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,6 ---- ! /** ! ** @file tcAirObject.cpp ! */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcSimState.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSimState.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** tcSimState.cpp 5 Aug 2004 02:22:35 -0000 1.50 --- tcSimState.cpp 9 Aug 2004 02:35:16 -0000 1.51 *************** *** 41,44 **** --- 41,45 ---- #include "tcBallisticWeapon.h" #include "tcBallisticDBObject.h" + #include "tcHeloObject.h" #include "tcLauncher.h" *************** *** 1366,1374 **** /* these types are defined in tcDatabase.h */ if ((apDBObject->mnModelType == MTYPE_FIXEDWING)|| ! (apDBObject->mnModelType == MTYPE_AIR)|| ! (apDBObject->mnModelType == MTYPE_HELO)) { return new tcAirObject(pGenericData); } else if (apDBObject->mnModelType == MTYPE_CARRIER) { --- 1367,1378 ---- /* these types are defined in tcDatabase.h */ if ((apDBObject->mnModelType == MTYPE_FIXEDWING)|| ! (apDBObject->mnModelType == MTYPE_AIR)) { return new tcAirObject(pGenericData); } + else if (apDBObject->mnModelType == MTYPE_HELO) + { + return new tcHeloObject(pGenericData); + } else if (apDBObject->mnModelType == MTYPE_CARRIER) { *************** *** 1439,1450 **** mcSensorMap.Clear(); } ! /********************************************************************/ void tcSimState::RandInit() { int nPlatforms = 12; // number of platforms to add - Clear(); - mcSensorMap.CreateMapForAlliance(1); - mcSensorMap.CreateMapForAlliance(2); while (nPlatforms-- > 0) { --- 1443,1464 ---- mcSensorMap.Clear(); } ! /** ! * try, catch blocks added to help isolate crashes ! */ void tcSimState::RandInit() { int nPlatforms = 12; // number of platforms to add + + try + { + Clear(); + mcSensorMap.CreateMapForAlliance(1); + mcSensorMap.CreateMapForAlliance(2); + } + catch (...) + { + throw std::string("exception in clear or CreateMapForAlliance"); + } while (nPlatforms-- > 0) { *************** *** 1452,1463 **** } ! COleDateTime current; ! current = COleDateTime::GetCurrentTime(); ! tcString str = current.Format(_T("Randomly generated on %A, %B %d, %Y %H:%M:%S")); ! sprintf(msScenarioInfo.mzDescription,"%s",str.GetBuffer()); ! strcpy(msScenarioInfo.mzName,"RANDOM-TEST"); ! GenerateRandomGoals(); msScenarioInfo.mbLoaded = true; --- 1466,1507 ---- } ! try ! { ! COleDateTime current; ! current = COleDateTime::GetCurrentTime(); ! tcString str = current.Format(_T("Randomly generated on %A, %B %d, %Y %H:%M:%S")); ! sprintf(msScenarioInfo.mzDescription,"%s",str.GetBuffer()); ! strcpy(msScenarioInfo.mzName,"RANDOM-TEST"); ! } ! catch (...) ! { ! throw std::string("exception in GetCurrentTime section"); ! } ! try ! { ! GenerateRandomGoals(); ! } ! catch (...) ! { ! throw std::string("exception in GenerateRandomGoals"); ! } ! ! try ! { ! // set random date and time of day ! int year = 1990 + (rand() % 20); ! int month = 1 + (rand() % 12); // month = 0 will raise an exception ! int day = 1 + (rand() % 28); ! int hour = rand() % 24; ! ! SetDateTime(DateZulu(year, month, day, hour, 0, 0)); ! ! } ! catch (...) ! { ! throw std::string("exception in SetDateTime"); ! } msScenarioInfo.mbLoaded = true; *************** *** 1490,1493 **** --- 1534,1538 ---- UINT platform_type; + if (mpDatabase == NULL) {return;} CTime ctime = CTime::GetCurrentTime(); *************** *** 1509,1549 **** } ! pplat = CreateRandomPlatform(platform_type); if (pplat == NULL) return; pplat->mnAlliance = ((rand()%2)==0) ? 0x01 : 0x02; - if (pplat->mnAlliance == 0x01) - { - pplat->RandInitNear(-4.5,49.5); - pplat->mnAlliance = 0x01; - } - else - { - pplat->RandInitNear(-6,50); - pplat->mnAlliance = 0x02; - tcPlatformObject *pPlatformObj; - if (pPlatformObj = dynamic_cast<tcPlatformObject*>(pplat)) - { - tcOrder default_order; - default_order.mstrOrdername = "Patrol"; - default_order.msDestination.Set((float)pPlatformObj->mcKin.mfLon_rad, - (float)pPlatformObj->mcKin.mfLat_rad); - pPlatformObj->mcAI.AddOrder(default_order); - pPlatformObj->mcAI.mfNextUpdate = randf(4.0f); - } - } ! // set child alliance to match parent ! if (int nChildren = (int)pplat->children.size()) ! { ! for(int n=0;n<nChildren;n++) ! { ! tcGameObject *child = pplat->children[n]; ! child->mnAlliance = pplat->mnAlliance; ! } ! } ! pplat->mfStatusTime = mfLastSensorUpdate; // for lack of a better time ! AddPlatform(pplat); } --- 1554,1615 ---- } ! try ! { ! pplat = CreateRandomPlatform(platform_type); ! } ! catch (...) ! { ! wxString message = wxString::Format( ! "exception adding platform of type: %d", platform_type); ! throw std::string(message.GetData()); ! } ! if (pplat == NULL) return; pplat->mnAlliance = ((rand()%2)==0) ? 0x01 : 0x02; ! try ! { ! if (pplat->mnAlliance == 0x01) ! { ! pplat->RandInitNear(-4.5,49.5); ! pplat->mnAlliance = 0x01; ! } ! else ! { ! pplat->RandInitNear(-6,50); ! pplat->mnAlliance = 0x02; ! tcPlatformObject *pPlatformObj; ! if (pPlatformObj = dynamic_cast<tcPlatformObject*>(pplat)) ! { ! tcOrder default_order; ! default_order.mstrOrdername = "Patrol"; ! default_order.msDestination.Set((float)pPlatformObj->mcKin.mfLon_rad, ! (float)pPlatformObj->mcKin.mfLat_rad); ! pPlatformObj->mcAI.AddOrder(default_order); ! pPlatformObj->mcAI.mfNextUpdate = randf(4.0f); ! } ! } ! // set child alliance to match parent ! if (int nChildren = (int)pplat->children.size()) ! { ! for(int n=0;n<nChildren;n++) ! { ! tcGameObject *child = pplat->children[n]; ! child->mnAlliance = pplat->mnAlliance; ! } ! } ! ! pplat->mfStatusTime = mfLastSensorUpdate; // for lack of a better time ! AddPlatform(pplat); ! } ! catch (...) ! { ! wxString message = wxString::Format( ! "exception adding platform class: %s, unit: %s", ! pplat->mzClass.mz, pplat->mzUnit.mz); ! throw std::string(message.GetData()); ! } } *************** *** 2106,2110 **** multiplayerMode(MM_OFF), timeAcceleration(0) ! { mpCommandInterface = NULL; mpDatabase = NULL; --- 2172,2177 ---- multiplayerMode(MM_OFF), timeAcceleration(0) ! { ! mpCommandInterface = NULL; mpDatabase = NULL; Index: tcFlightOpsObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcFlightOpsObject.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcFlightOpsObject.cpp 18 Jul 2004 03:18:01 -0000 1.2 --- tcFlightOpsObject.cpp 9 Aug 2004 02:35:16 -0000 1.3 *************** *** 26,29 **** --- 26,30 ---- #include "tcAirObject.h" #include "tcAeroAirObject.h" + #include "tcHeloObject.h" #include "tcAirDBObject.h" #include "tcFlightportDBObject.h" *************** *** 93,96 **** --- 94,101 ---- child = new tcAirObject(genericDBObj); } + else if (genericDBObj->mnModelType == MTYPE_HELO) + { + child = new tcHeloObject(genericDBObj); + } else { *************** *** 128,136 **** { // add FW air child for test ! tcDatabaseObject *dbObj = database->GetRandomOfType(MTYPE_FIXEDWINGX); tcAirDBObject *airDBObj = dynamic_cast<tcAirDBObject*>(dbObj); tcAeroAirObject *child = NULL; if (airDBObj) child = new tcAeroAirObject(airDBObj); ! wxASSERT(child); if (child != NULL) { --- 133,145 ---- { // add FW air child for test ! tcDatabaseObject *dbObj = database->GetRandomOfType(MTYPE_FIXEDWINGX); tcAirDBObject *airDBObj = dynamic_cast<tcAirDBObject*>(dbObj); tcAeroAirObject *child = NULL; if (airDBObj) child = new tcAeroAirObject(airDBObj); ! ! /* This ASSERT can happen if bad model ids are in a database table (e.g. ! ** air object in generics database table ) */ ! wxASSERT(child); ! if (child != NULL) { Index: tcLauncherState.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcLauncherState.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tcLauncherState.cpp 5 Aug 2004 02:22:35 -0000 1.15 --- tcLauncherState.cpp 9 Aug 2004 02:35:16 -0000 1.16 *************** *** 74,81 **** { char zBuff[128]; ! strcpy(zBuff,"Error - tcLauncherState::AddFullLauncher - Child not found in db ("); ! strcat(zBuff,ldata->mzChildClass.mz); ! strcat(zBuff,")"); ! WTL(zBuff); return; } --- 74,82 ---- { char zBuff[128]; ! sprintf(zBuff, "Error - tcLauncherState::AddFullLauncher - " ! "Launcher child not found in database (%s)\n", ldata->mzChildClass.mz); ! ! fprintf(stderr, zBuff); ! wxMessageBox(zBuff, "Error", wxICON_ERROR); return; } Index: tcScenarioSelectView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcScenarioSelectView.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tcScenarioSelectView.cpp 8 Aug 2004 00:31:35 -0000 1.15 --- tcScenarioSelectView.cpp 9 Aug 2004 02:35:16 -0000 1.16 *************** *** 356,361 **** { wxString s = ! wxString::Format("Error in scenario %s. Check pyerr.txt for details.", ! path.c_str()); wxMessageBox(s.c_str(),"Error",wxICON_ERROR); } --- 356,362 ---- { wxString s = ! wxString::Format("Error in scenario %s. " ! "Check log/pyerr.txt for details.", ! path.c_str()); wxMessageBox(s.c_str(),"Error",wxICON_ERROR); } Index: tcMapView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcMapView.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** tcMapView.cpp 8 Aug 2004 00:31:35 -0000 1.29 --- tcMapView.cpp 9 Aug 2004 02:35:16 -0000 1.30 *************** *** 845,855 **** } ! void tcTacticalMapView::DrawNTDSAirRW(Graphics *apGraphics, teAffiliation affil) { ! float symbsize=15.0f; float x = 12.0f; float y = 12.0f; ! RectF rect(x-symbsize/2,y-symbsize/2,symbsize,symbsize); ! apGraphics->DrawArc(mpPen,rect,-10,-160); ! apGraphics->DrawLine(mpPen,x-1.0f,y-1.0f,x+1.0f,y-1.0f); } --- 845,858 ---- } ! void tcTacticalMapView::DrawNTDSAirRW(Graphics *apGraphics, teAffiliation affil) ! { ! float symbsize = 15.0f; float x = 12.0f; float y = 12.0f; ! ! DrawNTDSAirFW(apGraphics, affil); ! ! apGraphics->DrawLine(mpPen, x-0.5f*symbsize, y-0.5f*symbsize, ! x+0.5f*symbsize, y-0.5f*symbsize); } Index: tc3DViewer.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tc3DViewer.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** tc3DViewer.cpp 8 Aug 2004 00:31:35 -0000 1.33 --- tc3DViewer.cpp 9 Aug 2004 02:35:16 -0000 1.34 *************** *** 162,166 **** if (isMouseDown) { ! const float MAX_EL = 50.0f/180.0f*C_PI; // view problem at higher elevations float dAz = 0.02f*(float)(point.x - clickPoint.x); float dEl = 0.02f*(float)(point.y - clickPoint.y); --- 162,166 ---- if (isMouseDown) { ! const float MAX_EL = 65.0f/180.0f*C_PI; // view problem at higher elevations float dAz = 0.02f*(float)(point.x - clickPoint.x); float dEl = 0.02f*(float)(point.y - clickPoint.y); *************** *** 197,201 **** { cameraRange *= 0.9f; ! if (cameraRange < 5.0f) cameraRange = 5.0f; } else if (zDelta < 0) --- 197,201 ---- { cameraRange *= 0.9f; ! if (cameraRange < 3.0f) cameraRange = 3.0f; } else if (zDelta < 0) Index: Game.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** Game.cpp 5 Aug 2004 02:22:35 -0000 1.88 --- Game.cpp 9 Aug 2004 02:35:16 -0000 1.89 *************** *** 1,21 **** /** @file Game.cpp main application class ! ** ! ** Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ! ** 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. ! ** [...4489 lines suppressed...] ! } ! break; ! case PC_DELETE: ! WTL("tcGame::ProcessCommand PC_DELETE"); ! simState->DeletePlatform(tacticalMap->mnHookID); ! tacticalMap->mnHookID = NULL_INDEX; ! mcHook.SetHookID(NULL_INDEX); ! mcObjectControl.SetHookID(NULL_INDEX); ! break; ! */ default: ! WTL("tcGame::ProcessCommand unrecognized game command"); ! break; ! } ! sfData = afData; ! snData = anData; ! snData2 = anData2; } #endif \ No newline at end of file Index: tcAirfieldObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAirfieldObject.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcAirfieldObject.cpp 18 Jul 2004 03:18:01 -0000 1.1 --- tcAirfieldObject.cpp 9 Aug 2004 02:35:16 -0000 1.2 *************** *** 146,149 **** --- 146,150 ---- mpDBObject = obj; mcKin.mfSpeed_kts = 0; // make sure this doesn't move (shouldn't be necessary) + mnModelType = MTYPE_AIRFIELD; } |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:35:26
|
Update of /cvsroot/gcblue/gcb_wx/src/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/src/database Modified Files: tcAirDBObject.cpp tcDatabase.cpp tcDatabaseObject.cpp tcFlightportDBObject.cpp tcGenericDBObject.cpp tcLauncherDBObject.cpp tcMissileDBObject.cpp tcRadarDBObject.cpp tcSensorDBObject.cpp tcSqlReader.cpp tcWeaponDBObject.cpp Log Message: Index: tcSensorDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSensorDBObject.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcSensorDBObject.cpp 8 Aug 2004 00:31:33 -0000 1.6 --- tcSensorDBObject.cpp 9 Aug 2004 02:35:15 -0000 1.7 *************** *** 137,140 **** --- 137,145 ---- { tcDatabaseObject::ReadSql(entry); + + mfMaxRange_km = entry.GetDouble("MaxRange_km"); + mfRefRange_km = entry.GetDouble("RefRange_km"); + mfFieldOfView_deg = entry.GetDouble("FieldOfView_deg"); + mfScanPeriod_s = entry.GetDouble("ScanPeriod_s"); } Index: tcRadarDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcRadarDBObject.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcRadarDBObject.cpp 8 Aug 2004 00:31:33 -0000 1.11 --- tcRadarDBObject.cpp 9 Aug 2004 02:35:15 -0000 1.12 *************** *** 209,212 **** --- 209,223 ---- { tcSensorDBObject::ReadSql(entry); + + mfMinRange_km = entry.GetDouble("MinRange_km"); + mfERP_dBW = entry.GetDouble("ERP_dBW"); + mfMinRangeRate_mps = entry.GetDouble("MinRangeRate_mps"); + maxFireControlTracks = entry.GetInt("MaxFireControlTracks"); + isSemiactive = entry.GetInt("IsSemiactive") != 0; + isCommandReceiver = entry.GetInt("IsCommandReceiver") != 0; + mbDetectsSurface = entry.GetInt("DetectsSurface") != 0; + mbDetectsAir = entry.GetInt("DetectsAir") != 0; + mbDetectsGround = entry.GetInt("DetectsGround") != 0; + } Index: tcWeaponDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcWeaponDBObject.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcWeaponDBObject.cpp 8 Aug 2004 00:31:33 -0000 1.3 --- tcWeaponDBObject.cpp 9 Aug 2004 02:35:15 -0000 1.4 *************** *** 129,132 **** --- 129,136 ---- { tcDatabaseObject::ReadSql(entry); + + mfDamage = entry.GetDouble("Damage"); + launchSpeed_mps = entry.GetDouble("LaunchSpeed_mps"); + } Index: tcFlightportDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcFlightportDBObject.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcFlightportDBObject.cpp 8 Aug 2004 00:31:33 -0000 1.4 --- tcFlightportDBObject.cpp 9 Aug 2004 02:35:15 -0000 1.5 *************** *** 257,260 **** --- 257,285 ---- void tcFlightportDBObject::ReadSql(tcSqlReader& entry) { + tcDatabaseObject::ReadSql(entry); + + heloOnly = entry.GetInt("IsHeloOnly"); + hangarCapacity = entry.GetInt("HangarCapacity"); + + spotInfo.clear(); + int i; + for(i=0;i<MAX_DB_SPOTS;i++) + { + spotDBInfo info; + info.isLaunch = entry.GetInt("Sp%d_launch", i+1); + info.x = entry.GetDouble("Sp%d_x", i+1); + info.y = entry.GetDouble("Sp%d_y", i+1); + info.z = entry.GetDouble("Sp%d_z", i+1); + info.orientation_deg = entry.GetDouble("Sp%d_dir_deg", i+1); + info.length = entry.GetDouble("Sp%d_len", i+1); + + bool isValid = (info.x != 0)||(info.y !=0)||(info.z != 0); + if (isValid) + { + spotInfo.push_back(info); + } + } + + } Index: tcLauncherDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcLauncherDBObject.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcLauncherDBObject.cpp 8 Aug 2004 00:31:33 -0000 1.8 --- tcLauncherDBObject.cpp 9 Aug 2004 02:35:15 -0000 1.9 *************** *** 165,169 **** *csv << "Basic class"; *csv << "Fire control sensor class"; ! for(unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) { tcString s; --- 165,170 ---- *csv << "Basic class"; *csv << "Fire control sensor class"; ! ! for (unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) { tcString s; *************** *** 208,211 **** --- 209,236 ---- { tcDatabaseObject::ReadSql(entry); + + cycleTime = entry.GetDouble("CycleTime_s"); + mnCapacity = entry.GetInt("BasicCap"); + mzChildClass = entry.GetString("BasicClass").c_str(); + fireControlSensorClass = entry.GetString("FireControlSens"); + + + mnConfigurations = 0; + for (unsigned i=0;i<MAX_LAUNCHER_CONFIGURATIONS;i++) + { + tcString s; + + s.Format("Cap%d", i+1); + maCapacity[mnConfigurations] = entry.GetInt(s.GetBuffer()); + + s.Format("Class%d", i+1); + maChildClass[mnConfigurations] = entry.GetString(s.GetBuffer()).c_str(); + + if (maCapacity[mnConfigurations] && + (strlen(maChildClass[mnConfigurations].mz) > 0)) + { + mnConfigurations++; + } + } } Index: tcGenericDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcGenericDBObject.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcGenericDBObject.cpp 8 Aug 2004 00:31:33 -0000 1.11 --- tcGenericDBObject.cpp 9 Aug 2004 02:35:15 -0000 1.12 *************** *** 508,513 **** columnString += s.GetBuffer(); - //if (i < MAXLAUNCHERS - 1) columnString += ","; - } --- 508,511 ---- *************** *** 544,547 **** --- 542,636 ---- void tcGenericDBObject::ReadSql(tcSqlReader& entry) { + tcDatabaseObject::ReadSql(entry); + + mfRcs_dbsm = entry.GetDouble("Rcs_dbsm"); + mfMaxSpeed_kts = entry.GetDouble("MaxSpeed_kts"); + mfAccel_ktsps = entry.GetDouble("Accel_ktsps"); + mfTurnRate_degps = entry.GetDouble("TurnRate_degps"); + mfFuelCapacity_kg = entry.GetDouble("FuelCapacity_kg"); + mfFuelRate_kgps = entry.GetDouble("FuelRate_kgps"); + mfMaxAltitude_m = entry.GetDouble("MaxAltitude_m"); + mfMaxDepth_m = entry.GetDouble("MaxDepth_m"); + mfAltitudeRate_mps = entry.GetDouble("AltitudeRate_mps"); + mfToughness = entry.GetDouble("Toughness"); + mfDamage = entry.GetDouble("Damage"); + mfWeight_kg = entry.GetDouble("Weight_kg"); + mfMaxThrust_N = entry.GetDouble("MaxThrust_N"); + mfRange_km = entry.GetDouble("Range_km"); + flightportClass = entry.GetString("FlightportClass").c_str(); + + // read launchers + int i; + mnNumLaunchers = 0; + for(i=0;i<MAXLAUNCHERS;i++) + { + std::string launcherClass; + tcString s; + + s.Format("L%d_class",i+1); + launcherClass = entry.GetString(s.GetBuffer()); + + if (launcherClass.size() > 0) + { + maLauncherClass[mnNumLaunchers] = launcherClass.c_str(); + + s.Format("L%d_az",i+1); + launcherAz[mnNumLaunchers] = entry.GetDouble(s.GetBuffer()); + + s.Format("L%d_x",i+1); + launcherPosition[mnNumLaunchers].x = entry.GetDouble(s.GetBuffer()); + + s.Format("L%d_y",i+1); + launcherPosition[mnNumLaunchers].y = entry.GetDouble(s.GetBuffer()); + + s.Format("L%d_z",i+1); + launcherPosition[mnNumLaunchers].z = entry.GetDouble(s.GetBuffer()); + + mnNumLaunchers++; + } + } + + // read sensors + mnNumSensors = 0; + for(i=0;i<MAXSENSORS;i++) + { + std::string sensorClass; + tcString s; + + s.Format("S%d_class", i+1); + sensorClass = entry.GetString(s.GetBuffer()); + + if (sensorClass.size() > 0) + { + maSensorClass[mnNumSensors] = sensorClass.c_str(); + + s.Format("S%d_az", i+1); + sensorAz[mnNumSensors++] = entry.GetDouble(s.GetBuffer()); + } + + } + + // read animations + for(i=0;i<MAXANIMATIONS;i++) + { + tcString s; + animationDBInfo ai; + + s.Format("Anim%d_obj", i+1); + ai.objectName = entry.GetString(s.GetBuffer()); + + if (ai.objectName.size() > 0) + { + s.Format("Anim%d_type", i+1); + ai.animationType = entry.GetString(s.GetBuffer()); + + s.Format("Anim%d_param", i+1); + ai.param = entry.GetInt(s.GetBuffer()); + + animationInfo.push_back(ai); + } + } + Animate3DModel(); + } Index: tcDatabase.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabase.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcDatabase.cpp 8 Aug 2004 00:31:33 -0000 1.14 --- tcDatabase.cpp 9 Aug 2004 02:35:15 -0000 1.15 *************** *** 185,249 **** { std::string path(DATABASE_PATH); ! std::string fileName = path + string("database") + suffix + ".db"; sqlite::connection sqlConnection(fileName.c_str()); ! if (load) { } ! else { ! // tcGenericDBObject ! { ! tcDBObjSerializerSql<tcGenericDBObject> ! serializer(this, sqlConnection, "generics"); ! serializer.Save(); ! } ! // tcMissileDBObject ! { ! tcDBObjSerializerSql<tcMissileDBObject> ! serializer(this, sqlConnection, "missiles"); ! serializer.Save(); ! } ! // tcLauncherDBObject ! { ! tcDBObjSerializerSql<tcLauncherDBObject> ! serializer(this, sqlConnection, "launchers"); ! serializer.Save(); ! } ! // tcRadarDBObject ! { ! tcDBObjSerializerSql<tcRadarDBObject> ! serializer(this, sqlConnection, "radars"); ! serializer.Save(); ! } ! // tcESMDBObject ! { ! tcDBObjSerializerSql<tcESMDBObject> ! serializer(this, sqlConnection, "esm"); ! serializer.Save(); ! } ! // tcAirDBObject ! { ! tcDBObjSerializerSql<tcAirDBObject> ! serializer(this, sqlConnection, "air"); ! serializer.Save(); ! } ! // tcFlightportDBObject ! { ! tcDBObjSerializerSql<tcFlightportDBObject> ! serializer(this, sqlConnection, "flightports"); ! serializer.Save(); ! } ! // tcBallisticDBObject ! { ! tcDBObjSerializerSql<tcBallisticDBObject> ! serializer(this, sqlConnection, "ballistic"); ! serializer.Save(); ! } } } --- 185,252 ---- { std::string path(DATABASE_PATH); ! std::string fileName = path + string("database") + suffix + ".db"; sqlite::connection sqlConnection(fileName.c_str()); ! // tcGenericDBObject { + tcDBObjSerializerSql<tcGenericDBObject> + serializer(this, sqlConnection, "generics"); + if (load) serializer.Load(); + else serializer.Save(); } ! // tcMissileDBObject { ! tcDBObjSerializerSql<tcMissileDBObject> ! serializer(this, sqlConnection, "missiles"); ! if (load) serializer.Load(); ! else serializer.Save(); ! } ! // tcLauncherDBObject ! { ! tcDBObjSerializerSql<tcLauncherDBObject> ! serializer(this, sqlConnection, "launchers"); ! if (load) serializer.Load(); ! else serializer.Save(); ! } ! // tcRadarDBObject ! { ! tcDBObjSerializerSql<tcRadarDBObject> ! serializer(this, sqlConnection, "radars"); ! if (load) serializer.Load(); ! else serializer.Save(); ! } ! // tcESMDBObject ! { ! tcDBObjSerializerSql<tcESMDBObject> ! serializer(this, sqlConnection, "esm"); ! if (load) serializer.Load(); ! else serializer.Save(); ! } ! // tcAirDBObject ! { ! tcDBObjSerializerSql<tcAirDBObject> ! serializer(this, sqlConnection, "air"); ! if (load) serializer.Load(); ! else serializer.Save(); ! } ! // tcFlightportDBObject ! { ! tcDBObjSerializerSql<tcFlightportDBObject> ! serializer(this, sqlConnection, "flightports"); ! if (load) serializer.Load(); ! else serializer.Save(); ! } ! // tcBallisticDBObject ! { ! tcDBObjSerializerSql<tcBallisticDBObject> ! serializer(this, sqlConnection, "ballistic"); ! if (load) serializer.Load(); ! else serializer.Save(); } + } *************** *** 833,837 **** { int nResult = SerializeCSV(suffix, false); ! SerializeSql(suffix, false); if (nResult==false) { --- 836,840 ---- { int nResult = SerializeCSV(suffix, false); ! if (nResult==false) { Index: tcAirDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcAirDBObject.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcAirDBObject.cpp 8 Aug 2004 00:31:33 -0000 1.8 --- tcAirDBObject.cpp 9 Aug 2004 02:35:15 -0000 1.9 *************** *** 159,162 **** --- 159,179 ---- void tcAirDBObject::ReadSql(tcSqlReader& entry) { + tcGenericDBObject::ReadSql(entry); + + mfAltThrustDecay_pm = entry.GetDouble("ThrustDecay"); + mfAfterburnFuelRate_kgps = entry.GetDouble("ABFuelRate_kgps"); + mfAfterburnThrust_N = entry.GetDouble("ABThrust_N"); + mfDragArea_sm = entry.GetDouble("DragArea_sm"); + mfWingArea_sm = entry.GetDouble("WingArea_sm"); + mfCdpsub = entry.GetDouble("Cdpsub"); + mfCdptran = entry.GetDouble("Cdptran"); + mfCdpsup = entry.GetDouble("Cdpsup"); + mfMcm = entry.GetDouble("Mcm"); + mfMsupm = entry.GetDouble("Msupm"); + mfKdi = entry.GetDouble("Kdi"); + mfMaxAoa_rad = entry.GetDouble("MaxAoa_rad"); + mfMaxCl = entry.GetDouble("MaxCl"); + mfGmax = entry.GetDouble("Gmax"); + } Index: tcSqlReader.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcSqlReader.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcSqlReader.cpp 8 Aug 2004 00:31:33 -0000 1.1 --- tcSqlReader.cpp 9 Aug 2004 02:35:15 -0000 1.2 *************** *** 23,27 **** #include "tcSqlReader.h" #include "sqlite/sqlite_plus.h" ! namespace Database --- 23,27 ---- #include "tcSqlReader.h" #include "sqlite/sqlite_plus.h" ! #include <stdarg.h> namespace Database *************** *** 52,55 **** --- 52,71 ---- return data.getdouble((int)index); } + + /** + * Version that accepts format string with variable arguments + * to create field string. + */ + double tcSqlReader::GetDouble(const char* fmt, ...) + { + va_list argp; + + va_start(argp, fmt); + vsprintf(buffer, fmt, argp); + va_end(argp); + + return GetDouble(std::string(buffer)); + } + /** * throws exception if column <field> not found in map *************** *** 64,67 **** --- 80,98 ---- /** + * Version that accepts format string with variable arguments + * to create field string. + */ + int tcSqlReader::GetInt(const char* fmt, ...) + { + va_list argp; + + va_start(argp, fmt); + vsprintf(buffer, fmt, argp); + va_end(argp); + + return GetInt(std::string(buffer)); + } + + /** * throws exception if column <field> not found in map * @return data element from column name <field> as string *************** *** 74,77 **** --- 105,123 ---- } + /** + * Version that accepts format string with variable arguments + * to create field string. + */ + std::string tcSqlReader::GetString(const char* fmt, ...) + { + va_list argp; + + va_start(argp, fmt); + vsprintf(buffer, fmt, argp); + va_end(argp); + + return GetString(std::string(buffer)); + } + unsigned int tcSqlReader::LookupFieldIndex(std::string& field) Index: tcDatabaseObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcDatabaseObject.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcDatabaseObject.cpp 8 Aug 2004 00:31:33 -0000 1.10 --- tcDatabaseObject.cpp 9 Aug 2004 02:35:15 -0000 1.11 *************** *** 261,264 **** --- 261,275 ---- void tcDatabaseObject::ReadSql(tcSqlReader& entry) { + mzClass = entry.GetString("DatabaseClass").c_str(); + mnModelType = entry.GetInt("ModelClassId"); + + mnType = entry.GetInt("ClassificationId"); + mzImageFileName = entry.GetString("ImageFileName").c_str(); + mz3DModelFileName = entry.GetString("ModelFileName").c_str(); + + std::string desc = entry.GetString("Description"); + strncpy(mzDescription, desc.c_str(),DESCRIPTION_STRING_LENGTH-1); + + Load3DModel(); } Index: tcMissileDBObject.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/database/tcMissileDBObject.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcMissileDBObject.cpp 8 Aug 2004 00:31:33 -0000 1.9 --- tcMissileDBObject.cpp 9 Aug 2004 02:35:15 -0000 1.10 *************** *** 65,68 **** --- 65,69 ---- if (primarySeekerKey != NULL_INDEX) return primarySeekerKey; primarySeekerKey = database->GetKey(maSensorClass[0]); + if (primarySeekerKey == NULL_INDEX) { *************** *** 400,403 **** --- 401,450 ---- { tcWeaponDBObject::ReadSql(entry); + + mfMass_kg = entry.GetDouble("Mass_kg"); + mfDragArea_sm = entry.GetDouble("DragArea_sm"); + mfGmax = entry.GetDouble("Gmax"); + mfMaxTurnRate_degps = entry.GetDouble("MaxTurnRate_degps"); + mfCdpsub = entry.GetDouble("Cdpsub"); + mfCdptran = entry.GetDouble("Cdptran"); + mfCdpsup = entry.GetDouble("Cdpsup"); + mfMcm = entry.GetDouble("Mcm"); + mfMsupm = entry.GetDouble("Msupm"); + mfKdi = entry.GetDouble("Kdi"); + mfBoostThrust_N = entry.GetDouble("BoostThrust_N"); + mfBoostTime_s = entry.GetDouble("BoostTime_s"); + mfSustThrust_N = entry.GetDouble("SustThrust_N"); + mfSustTime_s = entry.GetDouble("SustTime_s"); + mfRcs_dbsm = entry.GetDouble("Rcs_dbsm"); + mfRange_km = entry.GetDouble("Range_km"); + mfShutdownSpeed_mps = entry.GetDouble("ShutdownSpeed_mps"); + maSensorClass[0] = entry.GetString("SensorClass1").c_str(); + maSensorClass[1] = entry.GetString("SensorClass2").c_str(); + + mnNumSegments = 0; + for (unsigned i=0;i<MAX_MISSILE_FLIGHT_SEGMENTS;i++) + { + float range, alt; + int altMode, guidanceMode; + + range = entry.GetDouble("Rng%d_km", i+1); + alt = entry.GetDouble("Alt%d_m", i+1); + altMode = entry.GetInt("AltMode%d", i+1); + guidanceMode = entry.GetInt("GuidMode%d", i+1); + + if ((range > 0)||(alt > 0)) + { + maFlightProfile[mnNumSegments].mfRange_km = range; + maFlightProfile[mnNumSegments].mfAltitude_m = alt; + maFlightProfile[mnNumSegments].meAltitudeMode = (teAltitudeMode)altMode; + maFlightProfile[mnNumSegments++].meGuidanceMode = (teGuidanceMode)guidanceMode; + } + + } + mnTargetFlags = entry.GetInt("TargetFlags"); + + // set other params that do not come from database file + primarySeekerKey = NULL_INDEX; // what IS this? + } |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:35:24
|
Update of /cvsroot/gcblue/gcb_wx/src/scriptinterface In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/src/scriptinterface Modified Files: tcPlatformInterfaceExtensionB.cpp Log Message: Index: tcPlatformInterfaceExtensionB.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterfaceExtensionB.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcPlatformInterfaceExtensionB.cpp 8 Aug 2004 00:31:34 -0000 1.13 --- tcPlatformInterfaceExtensionB.cpp 9 Aug 2004 02:35:16 -0000 1.14 *************** *** 74,80 **** .def("GetClass", &tcPlatformInterface::GetPlatformClass) .def("IsSurface",&tcPlatformInterface::IsSurface) ! .def("IsAir",&tcPlatformInterface::IsAir) ! .def("SetUpdate",&tcPlatformInterface::SetUpdateInterval) ! .def("SetActionText",&tcPlatformInterface::SetActionText) // weapons and targeting --- 74,81 ---- .def("GetClass", &tcPlatformInterface::GetPlatformClass) .def("IsSurface",&tcPlatformInterface::IsSurface) ! .def("IsAir", &tcPlatformInterface::IsAir) ! .def("IsHelo", &tcPlatformInterface::IsHelo) ! .def("SetUpdate", &tcPlatformInterface::SetUpdateInterval) ! .def("SetActionText", &tcPlatformInterface::SetActionText) // weapons and targeting |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:35:24
|
Update of /cvsroot/gcblue/gcb_wx/src/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/src/graphics Modified Files: tc3DModel.cpp Log Message: Index: tc3DModel.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tc3DModel.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tc3DModel.cpp 6 Aug 2004 02:47:51 -0000 1.11 --- tc3DModel.cpp 9 Aug 2004 02:35:15 -0000 1.12 *************** *** 122,125 **** --- 122,131 ---- ai.omega = 10.0f; } + else if (info.animationType == "rotor") + { + ai.axis = osg::Vec3(0,0,1.0f); + ai.animationType = 2; + ai.omega = 10.0f; + } else { *************** *** 347,354 **** tcAnimationInfo& info = animationInfo[n]; info.switchVariable = NULL; ! if (info.animationType == 0) // propeller { } ! else if (info.animationType == 1) // sensor { if (tcPlatformObject *plat = dynamic_cast<tcPlatformObject*>(obj)) --- 353,363 ---- tcAnimationInfo& info = animationInfo[n]; info.switchVariable = NULL; ! if (info.animationType == 0) // propeller, no switch var for now { } ! else if (info.animationType == 2) // rotor, no switch var for now ! { ! } ! else if (info.animationType == 1) // sensor, use switch var for sensor activity { if (tcPlatformObject *plat = dynamic_cast<tcPlatformObject*>(obj)) |
|
From: Dewitt C. <ddc...@us...> - 2004-08-09 02:35:24
|
Update of /cvsroot/gcblue/gcb_wx/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2303/scripts Modified Files: AI.py UnitCommands.py Log Message: Index: AI.py =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/scripts/AI.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AI.py 23 Jul 2004 00:45:47 -0000 1.11 --- AI.py 9 Aug 2004 02:35:14 -0000 1.12 *************** *** 20,23 **** --- 20,25 ---- elif (order_name == 'Land'): Land(UnitInfo, Order.data) + elif (order_name == 'LandHelo'): + LandHelo(UnitInfo, Order.data) elif (order_name == 'Nav'): lon = Order.dest.Lon *************** *** 205,208 **** --- 207,273 ---- else: UI.SetUpdate(10) + + + + # modified this to adjust altitude based on altitude of landing + # site + def LandHelo(UI,dest_id): + if (not UI.IsHelo()): + UI.DisplayMessage('LandHelo called with non-helo unit') + return + + # 0 - init, 1 - distant, 2 - init approach, 3 - final approach + land_state = UI.GetVar(0) + track_info = UI.GetTrackById(dest_id) + + alt_m = track_info.Alt + if (track_info.ID == -1): + UI.DisplayMessage('Bad track ID for landing') + UI.CompletedOrder() + return # invalid id + + landing_data = UI.GetLandingData(dest_id) + if (landing_data.ID == -1): + UI.DisplayMessage('Invalid landing platform') + UI.CompletedOrder() + return # invalid id + + track_info.Lat = landing_data.Lat + track_info.Lon = landing_data.Lon + track_info.Alt = landing_data.Alt + + # adjust track location based on approach state + if (land_state <= 1): + if (land_state == 0): + UI.DisplayMessage('Landing helo on platform %d' % track_info.ID) + + UI.SetAlt(300 + alt_m) + SetFractionalSpeed(UI, 0.7) + UI.SetVar(0, 1) + elif (land_state == 2): + UI.SetSpeed(track_info.Speed + 5) + elif (land_state >= 3): + #UI.DisplayMessage('Final descent, platform %d' % track_info.ID) + UI.SetAlt(6 + alt_m) + UI.SetSpeed(track_info.Speed + 3) + if(UI.GetLandingState()==0): + UI.SetLandingState(1) # gear down + + + TTI = UI.SetHeadingToInterceptTrack(track_info) + + if (TTI <= 10): + if (land_state == 1): + land_state = 2 + elif (land_state == 2) and (TTI <= 1): + land_state = 3 + UI.SetVar(0, land_state) + UI.SetUpdate(3) + elif (TTI <= 20): + UI.SetUpdate(3) + else: + UI.SetUpdate(10) + + Index: UnitCommands.py =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/scripts/UnitCommands.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** UnitCommands.py 23 Jul 2004 00:45:47 -0000 1.7 --- UnitCommands.py 9 Aug 2004 02:35:14 -0000 1.8 *************** *** 6,10 **** def AddLandingOrder(UI, dest_id): ! UI.AddOrder('Land', dest_id) def ClearOrders(UI): --- 6,14 ---- def AddLandingOrder(UI, dest_id): ! if (UI.IsHelo()): ! UI.AddOrder('LandHelo', dest_id) ! else: ! UI.AddOrder('Land', dest_id) ! def ClearOrders(UI): |
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21227/include/sim Modified Files: Game.h commandlist.h gcb.h tc3DViewer.h tcAIData.h tcAero.h tcAeroAirObject.h tcAirObject.h tcCarrierObject.h tcCreditView.h tcCustomControl.h tcDirector.h tcDirectorEvent.h tcEditControl.h tcEngagementData.h tcFlightPort.h tcGameObjIterator.h tcGameObject.h tcGameView.h tcGuidanceState.h tcHookInfo.h tcLaunchRequest.h tcMapView.h tcMenu.h tcMissileObject.h tcNetworkView.h tcOOBView.h tcObjectControl.h tcPanel.h tcPlatformObject.h tcPool.h tcPopupControl.h tcRadar.h tcScenarioSelectView.h tcSensorMap.h tcStartView.h tcSurfaceObject.h tcTerrainView.h tcTime.h tcUserInfo.h tcWeaponObject.h Log Message: Index: tcDirector.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirector.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcDirector.h 24 Jun 2004 21:35:40 -0000 1.6 --- tcDirector.h 8 Aug 2004 00:31:33 -0000 1.7 *************** *** 2,6 **** ** tcDirector.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcDirector.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcSensorMap.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorMap.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcSensorMap.h 8 May 2004 21:25:25 -0000 1.6 --- tcSensorMap.h 8 Aug 2004 00:31:33 -0000 1.7 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcOOBView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcOOBView.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcOOBView.h 29 Feb 2004 22:51:35 -0000 1.4 --- tcOOBView.h 8 Aug 2004 00:31:33 -0000 1.5 *************** *** 3,7 **** ** order of battle view window ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 3,7 ---- ** order of battle view window ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcCreditView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCreditView.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcCreditView.h 14 May 2004 23:37:07 -0000 1.8 --- tcCreditView.h 8 Aug 2004 00:31:33 -0000 1.9 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcCustomControl.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCustomControl.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcCustomControl.h 30 Nov 2003 17:23:52 -0000 1.3 --- tcCustomControl.h 8 Aug 2004 00:31:33 -0000 1.4 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: gcb.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/gcb.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gcb.h 30 Nov 2003 16:32:24 -0000 1.6 --- gcb.h 8 Aug 2004 00:31:33 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /* ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcScenarioSelectView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcScenarioSelectView.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcScenarioSelectView.h 20 Mar 2004 18:46:46 -0000 1.6 --- tcScenarioSelectView.h 8 Aug 2004 00:31:33 -0000 1.7 *************** *** 2,6 **** ** tcScenarioSelectView.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcScenarioSelectView.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcGameObjIterator.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObjIterator.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcGameObjIterator.h 7 Feb 2004 02:19:54 -0000 1.1 --- tcGameObjIterator.h 8 Aug 2004 00:31:33 -0000 1.2 *************** *** 1,5 **** /** @file tcGameObjIterator.h */ /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,5 ---- /** @file tcGameObjIterator.h */ /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcObjectControl.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcObjectControl.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcObjectControl.h 29 Feb 2004 22:51:35 -0000 1.5 --- tcObjectControl.h 8 Aug 2004 00:31:33 -0000 1.6 *************** *** 2,6 **** ** tcObjectControl.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcObjectControl.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcLaunchRequest.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLaunchRequest.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcLaunchRequest.h 4 Dec 2003 05:15:22 -0000 1.1 --- tcLaunchRequest.h 8 Aug 2004 00:31:33 -0000 1.2 *************** *** 1,4 **** /* ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /* ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcWeaponObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcWeaponObject.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcWeaponObject.h 27 Jul 2004 00:16:23 -0000 1.5 --- tcWeaponObject.h 8 Aug 2004 00:31:33 -0000 1.6 *************** *** 1,5 **** /** @file tcWeaponObject.h */ /* ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,5 ---- /** @file tcWeaponObject.h */ /* ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcGuidanceState.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGuidanceState.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcGuidanceState.h 13 Apr 2004 00:24:37 -0000 1.2 --- tcGuidanceState.h 8 Aug 2004 00:31:33 -0000 1.3 *************** *** 1,4 **** /* ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /* ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: commandlist.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/commandlist.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** commandlist.h 19 Oct 2003 17:46:01 -0000 1.3 --- commandlist.h 8 Aug 2004 00:31:33 -0000 1.4 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcRadar.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcRadar.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcRadar.h 24 May 2004 00:14:46 -0000 1.6 --- tcRadar.h 8 Aug 2004 00:31:33 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /* ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcPlatformObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** tcPlatformObject.h 19 Jul 2004 00:52:27 -0000 1.18 --- tcPlatformObject.h 8 Aug 2004 00:31:33 -0000 1.19 *************** *** 1,4 **** /** @file tcPlatformObject ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /** @file tcPlatformObject ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcPanel.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPanel.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcPanel.h 30 Nov 2003 17:23:52 -0000 1.4 --- tcPanel.h 8 Aug 2004 00:31:33 -0000 1.5 *************** *** 2,6 **** ** tcPanel.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcPanel.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcAero.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAero.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcAero.h 23 Apr 2004 00:14:56 -0000 1.4 --- tcAero.h 8 Aug 2004 00:31:33 -0000 1.5 *************** *** 4,8 **** */ /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 4,8 ---- */ /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcPool.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPool.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcPool.h 13 Apr 2004 21:37:40 -0000 1.6 --- tcPool.h 8 Aug 2004 00:31:33 -0000 1.7 *************** *** 2,6 **** ** tcPool.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcPool.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: Game.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Game.h 18 Jul 2004 03:18:00 -0000 1.42 --- Game.h 8 Aug 2004 00:31:33 -0000 1.43 *************** *** 1,4 **** /** ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /** ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcGameObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** tcGameObject.h 6 Aug 2004 02:47:51 -0000 1.23 --- tcGameObject.h 8 Aug 2004 00:31:33 -0000 1.24 *************** *** 1,4 **** /* ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /* ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcEngagementData.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcEngagementData.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcEngagementData.h 3 Dec 2003 05:53:02 -0000 1.1 --- tcEngagementData.h 8 Aug 2004 00:31:33 -0000 1.2 *************** *** 1,4 **** /** ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /** ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcHookInfo.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcHookInfo.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcHookInfo.h 15 Feb 2004 19:47:22 -0000 1.5 --- tcHookInfo.h 8 Aug 2004 00:31:33 -0000 1.6 *************** *** 2,6 **** ** tcHookInfo.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcHookInfo.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcAIData.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAIData.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcAIData.h 15 Feb 2004 19:47:21 -0000 1.6 --- tcAIData.h 8 Aug 2004 00:31:33 -0000 1.7 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcPopupControl.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPopupControl.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcPopupControl.h 30 Nov 2003 17:23:52 -0000 1.3 --- tcPopupControl.h 8 Aug 2004 00:31:33 -0000 1.4 *************** *** 2,6 **** ** tcPopupControl.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcPopupControl.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcAirObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirObject.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcAirObject.h 18 Jul 2004 03:18:00 -0000 1.9 --- tcAirObject.h 8 Aug 2004 00:31:33 -0000 1.10 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcAeroAirObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAeroAirObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcAeroAirObject.h 18 Jul 2004 03:18:00 -0000 1.4 --- tcAeroAirObject.h 8 Aug 2004 00:31:33 -0000 1.5 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcEditControl.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcEditControl.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcEditControl.h 14 May 2004 23:37:07 -0000 1.5 --- tcEditControl.h 8 Aug 2004 00:31:33 -0000 1.6 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcMapView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapView.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** tcMapView.h 19 Jul 2004 00:52:27 -0000 1.22 --- tcMapView.h 8 Aug 2004 00:31:33 -0000 1.23 *************** *** 2,6 **** ** tcMapView.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcMapView.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tc3DViewer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tc3DViewer.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** tc3DViewer.h 18 Jul 2004 03:18:00 -0000 1.24 --- tc3DViewer.h 8 Aug 2004 00:31:33 -0000 1.25 *************** *** 2,6 **** ** tc3DViewer.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tc3DViewer.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcFlightPort.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightPort.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcFlightPort.h 18 Jul 2004 03:18:00 -0000 1.5 --- tcFlightPort.h 8 Aug 2004 00:31:33 -0000 1.6 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcUserInfo.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcUserInfo.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcUserInfo.h 24 Jun 2004 01:43:43 -0000 1.4 --- tcUserInfo.h 8 Aug 2004 00:31:33 -0000 1.5 *************** *** 2,6 **** ** tcUserInfo.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcUserInfo.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcStartView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcStartView.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcStartView.h 29 Feb 2004 22:51:35 -0000 1.6 --- tcStartView.h 8 Aug 2004 00:31:33 -0000 1.7 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcMissileObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMissileObject.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcMissileObject.h 19 Jul 2004 00:52:27 -0000 1.10 --- tcMissileObject.h 8 Aug 2004 00:31:33 -0000 1.11 *************** *** 1,4 **** /* ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /* ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcMenu.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMenu.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcMenu.h 30 Nov 2003 17:23:52 -0000 1.4 --- tcMenu.h 8 Aug 2004 00:31:33 -0000 1.5 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcDirectorEvent.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirectorEvent.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcDirectorEvent.h 24 Jun 2004 21:35:40 -0000 1.7 --- tcDirectorEvent.h 8 Aug 2004 00:31:33 -0000 1.8 *************** *** 2,6 **** ** tcDirectorEvent.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcDirectorEvent.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcTime.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcTime.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcTime.h 14 May 2004 23:37:07 -0000 1.5 --- tcTime.h 8 Aug 2004 00:31:33 -0000 1.6 *************** *** 1,4 **** /* ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /* ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcGameView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameView.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcGameView.h 21 Jun 2004 22:21:59 -0000 1.7 --- tcGameView.h 8 Aug 2004 00:31:33 -0000 1.8 *************** *** 2,6 **** ** tcGameView.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcGameView.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcCarrierObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCarrierObject.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcCarrierObject.h 18 Jul 2004 03:18:00 -0000 1.8 --- tcCarrierObject.h 8 Aug 2004 00:31:33 -0000 1.9 *************** *** 1,4 **** /** ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /** ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcTerrainView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcTerrainView.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcTerrainView.h 24 Jun 2004 21:35:40 -0000 1.6 --- tcTerrainView.h 8 Aug 2004 00:31:33 -0000 1.7 *************** *** 2,6 **** ** tcTerrainView.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcTerrainView.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcNetworkView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcNetworkView.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcNetworkView.h 6 Mar 2004 20:52:29 -0000 1.5 --- tcNetworkView.h 8 Aug 2004 00:31:33 -0000 1.6 *************** *** 1,5 **** /** @file tcNetworkView.h */ /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,5 ---- /** @file tcNetworkView.h */ /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcSurfaceObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSurfaceObject.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcSurfaceObject.h 4 Jun 2004 21:39:22 -0000 1.7 --- tcSurfaceObject.h 8 Aug 2004 00:31:33 -0000 1.8 *************** *** 1,4 **** /** ! * Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,4 ---- /** ! * Copyright (C) 2003 Dewitt Colclough (de...@tw...) * All rights reserved. * |
Update of /cvsroot/gcblue/gcb_wx/include/database In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21227/include/database Modified Files: CsvTranslator.h tcAirDBObject.h tcBallisticDBObject.h tcDBObjSerializer.h tcDBString.h tcDatabase.h tcDatabaseObject.h tcESMDBObject.h tcFixedDBObject.h tcFlightportDBObject.h tcGenericDBObject.h tcLauncherDBObject.h tcMissileDBObject.h tcRadarDBObject.h tcSensorDBObject.h tcWeaponDBObject.h Added Files: tcDBObjSerializerSql.h tcSqlReader.h Log Message: Index: tcGenericDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcGenericDBObject.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcGenericDBObject.h 6 Aug 2004 02:47:50 -0000 1.9 --- tcGenericDBObject.h 8 Aug 2004 00:31:32 -0000 1.10 *************** *** 2,6 **** ** tcGenericDBObject.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcGenericDBObject.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 39,42 **** --- 39,43 ---- class tcFlightportDBObject; + class tcSqlReader; /** *************** *** 91,94 **** --- 92,100 ---- virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings + + static void AddSqlColumns(std::string& columnString); + void ReadSql(tcSqlReader& entry); + void WriteSql(std::string& valueString); + tcGenericDBObject(); tcGenericDBObject(tcGenericDBObject& obj); ///< copy constructor Index: tcRadarDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcRadarDBObject.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcRadarDBObject.h 19 Jul 2004 00:52:26 -0000 1.8 --- tcRadarDBObject.h 8 Aug 2004 00:31:32 -0000 1.9 *************** *** 2,6 **** ** tcRadarDBObject.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcRadarDBObject.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 33,36 **** --- 33,37 ---- namespace Database { + class tcSqlReader; class tcRadarDBObject : public tcSensorDBObject *************** *** 53,56 **** --- 54,62 ---- virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings + + static void AddSqlColumns(std::string& columnString); + void ReadSql(tcSqlReader& entry); + void WriteSql(std::string& valueString); + tcRadarDBObject(); tcRadarDBObject(tcRadarDBObject& obj); ///< copy constructor Index: tcSensorDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcSensorDBObject.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcSensorDBObject.h 27 Jul 2004 00:16:23 -0000 1.5 --- tcSensorDBObject.h 8 Aug 2004 00:31:32 -0000 1.6 *************** *** 2,6 **** ** tcSensorDBObject.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcSensorDBObject.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 33,56 **** namespace Database { ! class tcSensorDBObject : public tcDatabaseObject ! { ! public: ! float mfMaxRange_km; ///< [km] max range regardless of theoretical detectability ! float mfRefRange_km; ///< [km] range vs. 0 dBsm target or 0 dBW emitter ! float mfFieldOfView_deg; ///< [degrees] 360 is max ! 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 ! protected: ! tcSensorDBObject(); ! tcSensorDBObject(tcSensorDBObject& obj); ///< copy constructor ! virtual ~tcSensorDBObject(); ! }; } // namespace Database --- 33,63 ---- namespace Database { ! class tcSqlReader; ! class tcSensorDBObject : public tcDatabaseObject ! { ! public: ! float mfMaxRange_km; ///< [km] max range regardless of theoretical detectability ! float mfRefRange_km; ///< [km] range vs. 0 dBsm target or 0 dBW emitter ! float mfFieldOfView_deg; ///< [degrees] 360 is max ! 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 ! ! static void AddSqlColumns(std::string& columnString); ! void ReadSql(tcSqlReader& entry); ! void WriteSql(std::string& valueString); ! ! ! protected: ! tcSensorDBObject(); ! tcSensorDBObject(tcSensorDBObject& obj); ///< copy constructor ! virtual ~tcSensorDBObject(); ! }; } // namespace Database Index: tcFixedDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcFixedDBObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcFixedDBObject.h 28 Mar 2004 23:12:27 -0000 1.4 --- tcFixedDBObject.h 8 Aug 2004 00:31:32 -0000 1.5 *************** *** 2,6 **** ** tcFixedDBObject.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcFixedDBObject.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 33,36 **** --- 33,38 ---- namespace Database { + class tcSqlReader; + class tcFixedDBObject : public tcDatabaseObject { *************** *** 43,46 **** --- 45,52 ---- static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings + static void AddSqlColumns(std::string& columnString); + void ReadSql(tcSqlReader& entry); + void WriteSql(std::string& valueString); + tcFixedDBObject(); tcFixedDBObject(tcFixedDBObject& obj); ///< copy constructor Index: tcLauncherDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcLauncherDBObject.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcLauncherDBObject.h 5 Aug 2004 02:22:34 -0000 1.7 --- tcLauncherDBObject.h 8 Aug 2004 00:31:32 -0000 1.8 *************** *** 33,36 **** --- 33,38 ---- namespace Database { + class tcSqlReader; + #define MAX_LAUNCHER_CONFIGURATIONS 8 // number of weapon class/capacity options supported *************** *** 51,55 **** 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 tcLauncherDBObject(); --- 53,61 ---- 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 ! ! static void AddSqlColumns(std::string& columnString); ! void ReadSql(tcSqlReader& entry); ! void WriteSql(std::string& valueString); tcLauncherDBObject(); Index: tcWeaponDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcWeaponDBObject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcWeaponDBObject.h 27 Jul 2004 23:26:06 -0000 1.2 --- tcWeaponDBObject.h 8 Aug 2004 00:31:32 -0000 1.3 *************** *** 33,54 **** namespace Database { ! class tcWeaponDBObject : public tcDatabaseObject ! { ! public: ! float mfDamage; ///< damage value ! float launchSpeed_mps; ///< initial speed at launch, use zero to use plat speed ! 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 ! protected: ! tcWeaponDBObject(); ! tcWeaponDBObject(tcWeaponDBObject& obj); ///< copy constructor ! virtual ~tcWeaponDBObject(); ! }; } // namespace Database --- 33,60 ---- namespace Database { ! class tcSqlReader; ! class tcWeaponDBObject : public tcDatabaseObject ! { ! public: ! float mfDamage; ///< damage value ! float launchSpeed_mps; ///< initial speed at launch, use zero to use plat speed ! 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 ! ! static void AddSqlColumns(std::string& columnString); ! void ReadSql(tcSqlReader& entry); ! void WriteSql(std::string& valueString); ! ! protected: ! tcWeaponDBObject(); ! tcWeaponDBObject(tcWeaponDBObject& obj); ///< copy constructor ! virtual ~tcWeaponDBObject(); ! }; } // namespace Database Index: tcESMDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcESMDBObject.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcESMDBObject.h 28 Mar 2004 23:12:27 -0000 1.4 --- tcESMDBObject.h 8 Aug 2004 00:31:32 -0000 1.5 *************** *** 2,6 **** ** tcESMDBObject.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcESMDBObject.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 28,35 **** #include "tcSensorDBObject.h" namespace Database { ! class tcESMDBObject : public tcSensorDBObject --- 28,36 ---- #include "tcSensorDBObject.h" + #include "database/tcSqlReader.h" namespace Database { ! class tcSqlReader; class tcESMDBObject : public tcSensorDBObject *************** *** 45,48 **** --- 46,54 ---- tcESMDBObject(tcESMDBObject& obj); ///< copy constructor virtual ~tcESMDBObject(); + + static void AddSqlColumns(std::string& columnString); + void ReadSql(tcSqlReader& entry); + void WriteSql(std::string& valueString); + }; Index: tcAirDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcAirDBObject.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcAirDBObject.h 28 Mar 2004 23:12:27 -0000 1.7 --- tcAirDBObject.h 8 Aug 2004 00:31:32 -0000 1.8 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 33,36 **** --- 33,37 ---- #include "tcGenericDBObject.h" #include "tcFile.h" + #include "database/tcSqlReader.h" class TiXmlElement; *************** *** 39,42 **** --- 40,44 ---- { + /** * This class is used to support a more realistic aerodynamic model. Though *************** *** 70,73 **** --- 72,79 ---- static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings + static void AddSqlColumns(std::string& columnString); + void ReadSql(tcSqlReader& entry); + void WriteSql(std::string& valueString); + tcAirDBObject(); tcAirDBObject(tcAirDBObject& obj); ///< copy constructor Index: CsvTranslator.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/CsvTranslator.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CsvTranslator.h 28 Mar 2004 14:26:35 -0000 1.3 --- CsvTranslator.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 2,6 **** ** CsvTranslator.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** CsvTranslator.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcDatabaseObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseObject.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcDatabaseObject.h 29 Jul 2004 00:14:16 -0000 1.14 --- tcDatabaseObject.h 8 Aug 2004 00:31:32 -0000 1.15 *************** *** 1,6 **** ! /* ! ** tcDatabaseObject.h ! ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,6 ---- ! /** ! ** @file tcDatabaseObject.h ! */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 45,48 **** --- 45,49 ---- class tcDatabase; class CsvTranslator; + class tcSqlReader; /************** VERSION INFO ***************/ *************** *** 139,144 **** --- 140,153 ---- 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 void AddSqlColumns(std::string& columnString); + void ReadSql(tcSqlReader& entry); + void WriteSql(std::string& valueString); + + static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings + tcDatabaseObject(); tcDatabaseObject(tcDatabaseObject& obj); ///< copy constructor Index: tcDBString.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBString.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcDBString.h 13 Apr 2004 00:24:37 -0000 1.4 --- tcDBString.h 8 Aug 2004 00:31:32 -0000 1.5 *************** *** 2,6 **** ** tcDBString.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcDBString.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- NEW FILE: tcSqlReader.h --- /** ** @file tcSqlReader.h */ /* Copyright (C) 2004 Dewitt Colclough (de...@tw...) ** 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 */ #ifndef _TCSQLREADER_H_ #define _TCSQLREADER_H_ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 #include <string> #include <map> namespace sqlite { class reader; } /** * Saves/loads objects of class T from database. * Class T is any class derived from tcDatabaseObject. * Class T should be a leaf class for this to work properly. * * SQL version of serializer to work with sqlite3 and sqlite3_plus * C++ wrapper */ namespace Database { /** * Class to wrap SQL sqlite_plus::reader class for reading by * column name */ class tcSqlReader { public: double GetDouble(std::string& field); int GetInt(std::string& field); std::string GetString(std::string& field); bool Read(); tcSqlReader(sqlite::reader& tableInfo, sqlite::reader& _data); ~tcSqlReader(); private: std::map<std::string, unsigned int> columnLookup; sqlite::reader& data; void BuildColumnLookup(sqlite::reader& tableInfo); unsigned int LookupFieldIndex(std::string& field); }; } // namespace Database #endif Index: tcBallisticDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcBallisticDBObject.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcBallisticDBObject.h 5 Aug 2004 02:22:34 -0000 1.2 --- tcBallisticDBObject.h 8 Aug 2004 00:31:32 -0000 1.3 *************** *** 33,36 **** --- 33,38 ---- namespace Database { + class tcSqlReader; + class tcBallisticDBObject : public tcWeaponDBObject { *************** *** 46,49 **** --- 48,55 ---- static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings + static void AddSqlColumns(std::string& columnString); + void ReadSql(tcSqlReader& entry); + void WriteSql(std::string& valueString); + tcBallisticDBObject(tcBallisticDBObject& obj); ///< copy constructor tcBallisticDBObject(); Index: tcMissileDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcMissileDBObject.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcMissileDBObject.h 27 Jul 2004 00:16:23 -0000 1.10 --- tcMissileDBObject.h 8 Aug 2004 00:31:32 -0000 1.11 *************** *** 33,36 **** --- 33,38 ---- namespace Database { + class tcSqlReader; + /** * This isn't used currently. Notionally there will be different *************** *** 140,143 **** --- 142,150 ---- virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings + + static void AddSqlColumns(std::string& columnString); + void ReadSql(tcSqlReader& entry); + void WriteSql(std::string& valueString); + tcMissileDBObject(); tcMissileDBObject(tcMissileDBObject& obj); ///< copy constructor --- NEW FILE: tcDBObjSerializerSql.h --- /** ** @file tcDBObjSerializerSql.h */ /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** 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 */ #ifndef _DBOBJSERIALIZERSQL_H_ #define _DBOBJSERIALIZERSQL_H_ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 #include "tcDatabase.h" #include <iostream> #include <fstream> #include <string> #include "sqlite/sqlite_plus.h" #include <wx/wx.h> #ifdef WIN32 #include <wx/msw/private.h> // for MS Windows specific definitions #endif /** * Saves/loads objects of class T from database. * Class T is any class derived from tcDatabaseObject. * Class T should be a leaf class for this to work properly. * * SQL version of serializer to work with sqlite3 and sqlite3_plus * C++ wrapper */ namespace Database { template <class T> class tcDBObjSerializerSql { public: tcDBObjSerializerSql(tcDatabase* db, sqlite::connection& con, std::string s) : database(db), sqlConn(con), tableName(s) {} bool Load(); bool Save(); private: tcDatabase* database; std::string tableName; sqlite::connection& sqlConn; }; template <class T> bool tcDBObjSerializerSql<T>::Load() { // check if the table exists, abort if it doesn't string countStr = sqlConn.executescalar("select count(*) from sqlite_master where name='%s';", tableName.c_str()); if (countStr == "0") { fprintf(stderr, "tcDBObjSerializerSql<T>::Load() table (%s) not found\n", tableName.c_str()); return false; } return true; } /** * This version starts from a clean slate, first erasing the table * in the database if it exists. */ template <class T> bool tcDBObjSerializerSql<T>::Save() { try { // delete table if it exists string countStr = sqlConn.executescalar( "select count(*) from sqlite_master where name='%s';", tableName.c_str() ); if (countStr != "0") { sqlConn.executenonquery("drop table %s;", tableName.c_str()); } std::string columnString; T::AddSqlColumns(columnString); #ifdef _DEBUG fprintf(stdout, "column str: (%s)\n", columnString.c_str()); #endif sqlConn.executenonquery( "create table %s (%s);", tableName.c_str(), columnString.c_str()); } catch(exception &ex) { wxString message = wxString::Format("Database error in table %s: %s", tableName.c_str(), ex.what()); wxMessageBox(message.GetData(), "Error", wxICON_ERROR); } tnPoolIndex key; tnPoolIndex nEntries = database->mcObjectData.GetCount(); tnPoolIndex pos = database->mcObjectData.GetStartPosition(); tcDatabaseObject* dbObj; for (tnPoolIndex n=0;n<nEntries;n++) { database->mcObjectData.GetNextAssoc(pos, key, dbObj); if (T* obj = dynamic_cast<T*>(dbObj)) { try { std::string valueString; obj->WriteSql(valueString); #ifdef _DEBUG fprintf(stdout, "value str: (%s)\n", valueString.c_str()); #endif sqlConn.executenonquery( "insert into %s values (%s);", tableName.c_str(), valueString.c_str()); } catch(exception &ex) { wxString message = wxString::Format( "Error in table: %s, entry: %s, %s", tableName.c_str(), dbObj->mzClass.mz, ex.what()); wxMessageBox(message.GetData(), "Database Error", wxICON_ERROR); } } } return true; } } // namespace Database #endif Index: tcDBObjSerializer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDBObjSerializer.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcDBObjSerializer.h 28 Mar 2004 18:45:34 -0000 1.2 --- tcDBObjSerializer.h 8 Aug 2004 00:31:32 -0000 1.3 *************** *** 1,18 **** ! /* ! ** tcDBObjSerializer.h ! ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** 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 tcDBObjSerializer.h ! */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** 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 Index: tcDatabase.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabase.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcDatabase.h 18 Jul 2004 03:17:59 -0000 1.6 --- tcDatabase.h 8 Aug 2004 00:31:32 -0000 1.7 *************** *** 1,18 **** ! /* ! ** tcDatabase.h ! ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** 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 tcDatabase.h ! */ ! /* Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** 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 *************** *** 93,96 **** --- 93,97 ---- int Serialize(tcFile& file, bool mbLoad); int SerializeCSV(std::string suffix, bool mbLoad); + void SerializeSql(std::string suffix, bool mbLoad); void SerializeXml(std::string suffix, bool load); Index: tcFlightportDBObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcFlightportDBObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcFlightportDBObject.h 28 Mar 2004 23:12:27 -0000 1.3 --- tcFlightportDBObject.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 1,5 **** /** @file tcFlightportDBObject.h */ /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,5 ---- /** @file tcFlightportDBObject.h */ /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 33,36 **** --- 33,38 ---- namespace Database { + class tcSqlReader; + /** * Data for flightport model. *************** *** 62,65 **** --- 64,72 ---- virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings + + static void AddSqlColumns(std::string& columnString); + void ReadSql(tcSqlReader& entry); + void WriteSql(std::string& valueString); + tcFlightportDBObject(); tcFlightportDBObject(tcFlightportDBObject& obj); ///< copy constructor |
Update of /cvsroot/gcblue/gcb_wx/include/scriptinterface In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21227/include/scriptinterface Modified Files: tcFlightPortInterface.h tcPanelInterface.h tcPythonInterface.h tcScenarioInterface.h tcSimPythonInterface.h tcTrackInterface.h Log Message: Index: tcTrackInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcTrackInterface.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcTrackInterface.h 27 Apr 2004 22:03:01 -0000 1.3 --- tcTrackInterface.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcFlightPortInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcFlightPortInterface.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcFlightPortInterface.h 27 Apr 2004 22:03:01 -0000 1.5 --- tcFlightPortInterface.h 8 Aug 2004 00:31:32 -0000 1.6 *************** *** 2,6 **** ** tcFlightPortInterface.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcFlightPortInterface.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcScenarioInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcScenarioInterface.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tcScenarioInterface.h 24 Jun 2004 21:35:39 -0000 1.10 --- tcScenarioInterface.h 8 Aug 2004 00:31:32 -0000 1.11 *************** *** 2,6 **** ** tcScenarioInterface.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcScenarioInterface.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcPanelInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcPanelInterface.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcPanelInterface.h 27 Apr 2004 22:03:01 -0000 1.3 --- tcPanelInterface.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 2,6 **** ** tcPanelInterface.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcPanelInterface.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcPythonInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcPythonInterface.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcPythonInterface.h 27 Apr 2004 22:03:01 -0000 1.4 --- tcPythonInterface.h 8 Aug 2004 00:31:32 -0000 1.5 *************** *** 2,6 **** ** tcPythonInterface.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcPythonInterface.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcSimPythonInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcSimPythonInterface.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tcSimPythonInterface.h 27 Apr 2004 22:03:01 -0000 1.12 --- tcSimPythonInterface.h 8 Aug 2004 00:31:32 -0000 1.13 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. |
|
From: Dewitt C. <ddc...@us...> - 2004-08-08 00:32:12
|
Update of /cvsroot/gcblue/gcb_wx/include/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21227/include/common Modified Files: AError.h math_constants.h nsNav.h tcConsole.h tcFile.h tcOggStreamer.h tcSound.h tcSoundConsole.h tcString.h util.h wxcommands.h Log Message: Index: nsNav.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/nsNav.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** nsNav.h 28 Mar 2004 11:27:23 -0000 1.6 --- nsNav.h 8 Aug 2004 00:31:31 -0000 1.7 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: wxcommands.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/wxcommands.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxcommands.h 21 Jun 2004 22:21:42 -0000 1.16 --- wxcommands.h 8 Aug 2004 00:31:32 -0000 1.17 *************** *** 3,7 **** ** IDs for commands processed via wxWindows event handler. ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 3,7 ---- ** IDs for commands processed via wxWindows event handler. ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcSound.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcSound.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcSound.h 5 Aug 2004 02:22:34 -0000 1.13 --- tcSound.h 8 Aug 2004 00:31:32 -0000 1.14 *************** *** 2,6 **** ** tcSound.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcSound.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: math_constants.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/math_constants.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** math_constants.h 27 Jul 2004 23:26:06 -0000 1.6 --- math_constants.h 8 Aug 2004 00:31:31 -0000 1.7 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: AError.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/AError.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AError.h 19 Oct 2003 17:46:00 -0000 1.3 --- AError.h 8 Aug 2004 00:31:31 -0000 1.4 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcOggStreamer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcOggStreamer.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcOggStreamer.h 5 Aug 2004 02:22:34 -0000 1.5 --- tcOggStreamer.h 8 Aug 2004 00:31:32 -0000 1.6 *************** *** 2,6 **** ** tcOggStreamer.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcOggStreamer.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: util.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/util.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** util.h 28 Mar 2004 11:30:51 -0000 1.3 --- util.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 2,6 **** ** util.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** util.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcConsole.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcConsole.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcConsole.h 9 Apr 2004 13:49:40 -0000 1.8 --- tcConsole.h 8 Aug 2004 00:31:31 -0000 1.9 *************** *** 2,6 **** ** tcConsole.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcConsole.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcString.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcString.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcString.h 28 Mar 2004 11:32:52 -0000 1.3 --- tcString.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcSoundConsole.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcSoundConsole.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcSoundConsole.h 28 Mar 2004 11:30:14 -0000 1.7 --- tcSoundConsole.h 8 Aug 2004 00:31:32 -0000 1.8 *************** *** 2,6 **** ** tcSoundConsole.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcSoundConsole.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcFile.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/common/tcFile.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcFile.h 21 Jun 2004 22:21:42 -0000 1.6 --- tcFile.h 8 Aug 2004 00:31:32 -0000 1.7 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. |
Update of /cvsroot/gcblue/gcb_wx/include/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21227/include/network Modified Files: tcConnectionData.h tcControlMessageHandler.h tcMessage.h tcMessageHandler.h tcMultiplayerInterface.h tcNetworkInterface.h tcTextMessageHandler.h Log Message: Index: tcMessageHandler.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcMessageHandler.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcMessageHandler.h 27 Apr 2004 21:39:55 -0000 1.3 --- tcMessageHandler.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 1,5 **** /** @file tcMessageHandler.h * ! * Copyright (C) 2004 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,5 ---- /** @file tcMessageHandler.h * ! * Copyright (C) 2004 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcMultiplayerInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcMultiplayerInterface.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tcMultiplayerInterface.h 9 May 2004 20:40:21 -0000 1.15 --- tcMultiplayerInterface.h 8 Aug 2004 00:31:32 -0000 1.16 *************** *** 2,6 **** /* ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- /* ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcMessage.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcMessage.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcMessage.h 13 Apr 2004 00:24:37 -0000 1.5 --- tcMessage.h 8 Aug 2004 00:31:32 -0000 1.6 *************** *** 2,6 **** /* ** ! ** Copyright (C) 2003-2004 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- /* ** ! ** Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcControlMessageHandler.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcControlMessageHandler.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcControlMessageHandler.h 27 Apr 2004 21:39:55 -0000 1.4 --- tcControlMessageHandler.h 8 Aug 2004 00:31:32 -0000 1.5 *************** *** 1,5 **** /** @file tcControlMessageHandler.h * ! * Copyright (C) 2004 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,5 ---- /** @file tcControlMessageHandler.h * ! * Copyright (C) 2004 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcConnectionData.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcConnectionData.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcConnectionData.h 2 May 2004 16:22:44 -0000 1.5 --- tcConnectionData.h 8 Aug 2004 00:31:32 -0000 1.6 *************** *** 2,6 **** /* ** ! ** Copyright (C) 2003-2004 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- /* ** ! ** Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcTextMessageHandler.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcTextMessageHandler.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcTextMessageHandler.h 27 Apr 2004 21:39:55 -0000 1.2 --- tcTextMessageHandler.h 8 Aug 2004 00:31:32 -0000 1.3 *************** *** 1,5 **** /** @file tcTextMessageHandler.h * ! * Copyright (C) 2004 Dewitt "Cole" Colclough (de...@tw...) * All rights reserved. * --- 1,5 ---- /** @file tcTextMessageHandler.h * ! * Copyright (C) 2004 Dewitt Colclough (de...@tw...) * All rights reserved. * Index: tcNetworkInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/network/tcNetworkInterface.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcNetworkInterface.h 4 Apr 2004 20:56:36 -0000 1.7 --- tcNetworkInterface.h 8 Aug 2004 00:31:32 -0000 1.8 *************** *** 2,6 **** /* ** ! ** Copyright (C) 2003-2004 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- /* ** ! ** Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...) ** All rights reserved. |
|
From: Dewitt C. <ddc...@us...> - 2004-08-08 00:32:12
|
Update of /cvsroot/gcblue/gcb_wx/include/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21227/include/graphics Modified Files: tc2DGraphicsSurface.h tc3DModel.h tcButton.h tcButtonConsole.h tcEditBox.h tcFIFO.h tcGraphicsEngine.h tcMapObject.h tcRadioButton.h tcStandardWindow.h tcWindow.h Log Message: Index: tcWindow.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcWindow.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcWindow.h 24 Jun 2004 21:35:39 -0000 1.4 --- tcWindow.h 8 Aug 2004 00:31:32 -0000 1.5 *************** *** 2,6 **** ** tcWindow.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcWindow.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tc2DGraphicsSurface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc2DGraphicsSurface.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tc2DGraphicsSurface.h 11 Apr 2004 21:37:55 -0000 1.9 --- tc2DGraphicsSurface.h 8 Aug 2004 00:31:32 -0000 1.10 *************** *** 1,5 **** // tcGraphicsInterface.h: interface for the tcGraphicsInterface class. /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,5 ---- // tcGraphicsInterface.h: interface for the tcGraphicsInterface class. /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcButton.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcButton.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcButton.h 11 Apr 2004 21:17:27 -0000 1.7 --- tcButton.h 8 Aug 2004 00:31:32 -0000 1.8 *************** *** 2,6 **** ** tcButton.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcButton.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tc3DModel.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DModel.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tc3DModel.h 4 Jun 2004 21:39:22 -0000 1.6 --- tc3DModel.h 8 Aug 2004 00:31:32 -0000 1.7 *************** *** 1,5 **** /** @file tc3DModel.h */ /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,5 ---- /** @file tc3DModel.h */ /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcStandardWindow.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcStandardWindow.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tcStandardWindow.h 11 Apr 2004 21:22:50 -0000 1.8 --- tcStandardWindow.h 8 Aug 2004 00:31:32 -0000 1.9 *************** *** 1,5 **** /** @file tcStandardWindow.h */ /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,5 ---- /** @file tcStandardWindow.h */ /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcMapObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcMapObject.h 11 Apr 2004 21:10:57 -0000 1.3 --- tcMapObject.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 2,6 **** ** tcMapObject.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcMapObject.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcGraphicsEngine.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcGraphicsEngine.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcGraphicsEngine.h 11 Apr 2004 21:51:53 -0000 1.11 --- tcGraphicsEngine.h 8 Aug 2004 00:31:32 -0000 1.12 *************** *** 2,6 **** ** tcGraphicsEngine.h: interface for the tcGraphicsEngine class. ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcGraphicsEngine.h: interface for the tcGraphicsEngine class. ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcFIFO.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcFIFO.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcFIFO.h 11 Apr 2004 21:42:02 -0000 1.3 --- tcFIFO.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcRadioButton.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcRadioButton.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcRadioButton.h 11 Apr 2004 21:14:07 -0000 1.3 --- tcRadioButton.h 8 Aug 2004 00:31:32 -0000 1.4 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcButtonConsole.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcButtonConsole.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tcButtonConsole.h 11 Apr 2004 21:22:50 -0000 1.2 --- tcButtonConsole.h 8 Aug 2004 00:31:32 -0000 1.3 *************** *** 2,6 **** ** tcButtonConsole.h ** ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 2,6 ---- ** tcButtonConsole.h ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. Index: tcEditBox.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcEditBox.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcEditBox.h 11 Apr 2004 21:28:37 -0000 1.4 --- tcEditBox.h 8 Aug 2004 00:31:32 -0000 1.5 *************** *** 1,4 **** /* ! ** Copyright (C) 2003 Dewitt "Cole" Colclough (de...@tw...) ** All rights reserved. --- 1,4 ---- /* ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. |
|
From: Dewitt C. <ddc...@us...> - 2004-08-08 00:32:11
|
Update of /cvsroot/gcblue/gcb_wx/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21227/docs Modified Files: CHANGES.txt Log Message: Index: CHANGES.txt =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/docs/CHANGES.txt,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** CHANGES.txt 6 Aug 2004 02:47:50 -0000 1.31 --- CHANGES.txt 8 Aug 2004 00:31:31 -0000 1.32 *************** *** 3,6 **** --- 3,9 ---- 0.6 --------------------------------------------------------------------- + *** 2004-08-07 Dewitt Colclough *** + - Added write portion of SQL database upgrade using sqlite library. + *** 2004-08-05 Dewitt Colclough *** - Added launcher location field to database. Launched objects (e.g. |
|
From: Dewitt C. <ddc...@us...> - 2004-08-08 00:32:11
|
Update of /cvsroot/gcblue/gcb_wx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21227 Modified Files: GCblue.vcproj Log Message: Index: GCblue.vcproj =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/GCblue.vcproj,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** GCblue.vcproj 6 Aug 2004 02:47:50 -0000 1.61 --- GCblue.vcproj 8 Aug 2004 00:31:31 -0000 1.62 *************** *** 39,43 **** Name="VCLinkerTool" IgnoreImportLibrary="FALSE" ! AdditionalDependencies="python23.lib boost_python_debug.lib winmm.lib opengl32.lib glu32.lib Gdiplus.lib GLaux.lib OpenAL32d.lib ALutd.lib comctl32.lib rpcrt4.lib wsock32.lib wxmswd.lib zlibd.lib pngd.lib jpegd.lib tiffd.lib osgd.lib osgDBd.lib osgParticled.lib osgTextd.lib osgUtild.lib DemeterDebug.lib DemeterOSGDebug.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib" ShowProgress="0" OutputFile="$(ProjectDir)/bin/GCblueD.exe" --- 39,43 ---- Name="VCLinkerTool" IgnoreImportLibrary="FALSE" ! AdditionalDependencies="python23.lib boost_python_debug.lib winmm.lib opengl32.lib glu32.lib Gdiplus.lib GLaux.lib OpenAL32d.lib ALutd.lib comctl32.lib rpcrt4.lib wsock32.lib wxmswd.lib zlibd.lib pngd.lib jpegd.lib tiffd.lib osgd.lib osgDBd.lib osgParticled.lib osgTextd.lib osgUtild.lib DemeterDebug.lib DemeterOSGDebug.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib sqlite.lib" ShowProgress="0" OutputFile="$(ProjectDir)/bin/GCblueD.exe" *************** *** 105,109 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="boost_python.lib python23.lib winmm.LIB opengl32.lib glu32.lib Gdiplus.lib GLaux.lib OpenAL32.lib ALut.lib comctl32.lib rpcrt4.lib wsock32.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib osg.lib osgDB.lib osgParticle.lib osgUtil.lib osgText.lib Demeter.lib DemeterOSG.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib" OutputFile="$(ProjectDir)/bin/$(ProjectName).exe" LinkIncremental="1" --- 105,109 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="boost_python.lib python23.lib winmm.LIB opengl32.lib glu32.lib Gdiplus.lib GLaux.lib OpenAL32.lib ALut.lib comctl32.lib rpcrt4.lib wsock32.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib osg.lib osgDB.lib osgParticle.lib osgUtil.lib osgText.lib Demeter.lib DemeterOSG.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib sqlite.lib" OutputFile="$(ProjectDir)/bin/$(ProjectName).exe" LinkIncremental="1" *************** *** 531,534 **** --- 531,537 ---- </File> <File + RelativePath=".\src\database\tcSqlReader.cpp"> + </File> + <File RelativePath=".\src\database\tcWeaponDBObject.cpp"> </File> *************** *** 562,565 **** --- 565,981 ---- </File> </Filter> + <Filter + Name="sqlite" + Filter=""> + <File + RelativePath=".\src\sqlite\sqlite_connection.cpp"> + </File> + <File + RelativePath=".\src\sqlite\sqlite_internal.cpp"> + </File> + <File + RelativePath=".\src\sqlite\sqlite_reader.cpp"> + </File> + </Filter> + </Filter> + <Filter + Name="res" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + <File + RelativePath="res\wx\msw\blank.cur"> + </File> + <File + RelativePath="res\wx\msw\bullseye.cur"> + </File> + <File + RelativePath="res\wx\msw\cdrom.ico"> + </File> + <File + RelativePath="res\wx\msw\colours.bmp"> + </File> + <File + RelativePath="res\wx\msw\computer.ico"> + </File> + <File + RelativePath="res\wx\msw\csquery.bmp"> + </File> + <File + RelativePath="res\Default.wav"> + </File> + <File + RelativePath="res\wx\msw\disable.bmp"> + </File> + <File + RelativePath="res\wx\msw\drive.ico"> + </File> + <File + RelativePath="res\wx\msw\file1.ico"> + </File> + <File + RelativePath="res\wx\msw\floppy.ico"> + </File> + <File + RelativePath="res\wx\msw\folder1.ico"> + </File> + <File + RelativePath="res\wx\msw\folder2.ico"> + </File> + <File + RelativePath="res\GCblue.ico"> + </File> + <File + RelativePath="res\GCblue.rc"> + </File> + <File + RelativePath="res\wx\msw\hand.cur"> + </File> + <File + RelativePath="res\wx\msw\magnif1.cur"> + </File> + <File + RelativePath="res\wx\msw\noentry.cur"> + </File> + <File + RelativePath="res\wx\msw\pbrush.cur"> + </File> + <File + RelativePath="res\wx\msw\pencil.cur"> + </File> + <File + RelativePath="res\wx\msw\pntleft.cur"> + </File> + <File + RelativePath="res\wx\msw\pntright.cur"> + </File> + <File + RelativePath="res\wx\msw\query.cur"> + </File> + <File + RelativePath="res\wx\msw\removble.ico"> + </File> + <File + RelativePath="res\wx\msw\rightarr.cur"> + </File> + <File + RelativePath="res\wx\msw\roller.cur"> + </File> + <File + RelativePath="res\wx\msw\size.cur"> + </File> + <File + RelativePath="res\wx\msw\watch1.cur"> + </File> + </Filter> + <Filter + Name="wav" + Filter=""> + <File + RelativePath="wav\Beep2.wav"> + </File> + <File + RelativePath="wav\Bloop.wav"> + </File> + <File + RelativePath="wav\consolebeep.wav"> + </File> + <File + RelativePath="wav\Explosion.wav"> + </File> + <File + RelativePath="wav\Explosion2.wav"> + </File> + <File + RelativePath="wav\Implosion.wav"> + </File> + <File + RelativePath="wav\LightSaber.wav"> + </File> + <File + RelativePath="wav\LowBeep.wav"> + </File> + <File + RelativePath="wav\MissileLaunch.wav"> + </File> + <File + RelativePath="wav\MusicCut2.wav"> + </File> + <File + RelativePath="wav\NavyWhistle.wav"> + </File> + <File + RelativePath="wav\NoisyBeepLow.wav"> + </File> + <File + RelativePath="wav\Ping.wav"> + </File> + <File + RelativePath="wav\Ping2.wav"> + </File> + <File + RelativePath="wav\radarping.wav"> + </File> + <File + RelativePath="wav\RejectBeep.wav"> + </File> + <File + RelativePath="wav\SaberTail.wav"> + </File> + <File + RelativePath="wav\ShortBeep.wav"> + </File> + <File + RelativePath="wav\Thuck.wav"> + </File> + <File + RelativePath="wav\TwoBeeps.wav"> + </File> + </Filter> + <Filter + Name="texture" + Filter=""> + <File + RelativePath="texture\a4b_ar.bmp"> + </File> + <File + RelativePath="texture\fa1uk.bmp"> + </File> + <File + RelativePath="texture\gr3uk.bmp"> + </File> + <File + RelativePath="texture\grass20.bmp"> + </File> + <File + RelativePath="texture\gslogo.bmp"> + </File> + <File + RelativePath="texture\gslogo_bluer.gif"> + </File> + <File + RelativePath="texture\m50_cl.bmp"> + </File> + <File + RelativePath="texture\rock04.bmp"> + </File> + <File + RelativePath="texture\roland.bmp"> + </File> + <File + RelativePath="texture\sand12.bmp"> + </File> + <File + RelativePath="texture\sea1.bmp"> + </File> + <File + RelativePath="texture\sky8_256.bmp"> + </File> + <File + RelativePath="texture\t42b1.bmp"> + </File> + <File + RelativePath="texture\t42b1a.bmp"> + </File> + <File + RelativePath="texture\type45.bmp"> + </File> + <File + RelativePath="texture\water2_256.bmp"> + </File> + </Filter> + <Filter + Name="3d" + Filter=""> + <File + RelativePath="3d\a4b_ar.gc3"> + </File> + <File + RelativePath="3d\aim9b.gc3"> + </File> + <File + RelativePath="3d\aim9l.gc3"> + </File> + <File + RelativePath="3d\air_small.gc3"> + </File> + <File + RelativePath="3d\am39.gc3"> + </File> + <File + RelativePath="3d\bo105cb.gc3"> + </File> + <File + RelativePath="3d\fa1uk.gc3"> + </File> + <File + RelativePath="3d\gr3uk.gc3"> + </File> + <File + RelativePath="3d\m50_cl.gc3"> + </File> + <File + RelativePath="3d\mm38.gc3"> + </File> + <File + RelativePath="3d\rah66.gc3"> + </File> + <File + RelativePath="3d\roland_sam.gc3"> + </File> + <File + RelativePath="3d\surf_med.gc3"> + </File> + <File + RelativePath="3d\surf_small.gc3"> + </File> + <File + RelativePath="3d\t42b1.gc3"> + </File> + <File + RelativePath="3d\type45_lr.gc3"> + </File> + <File + RelativePath="3d\type45edit.gc3"> + </File> + <File + RelativePath="3d\typhoon.gc3"> + </File> + <File + RelativePath="3d\typhoonflip.gc3"> + </File> + </Filter> + <Filter + Name="images" + Filter=""> + <File + RelativePath="images\buttonbar_bk.jpg"> + </File> + <File + RelativePath="images\buttonbar_off.bmp"> + </File> + <File + RelativePath="images\buttonbar_on.bmp"> + </File> + <File + RelativePath="images\console_b.jpg"> + </File> + <File + RelativePath="images\e2piece.jpg"> + </File> + <File + RelativePath="images\options_bk.bmp"> + </File> + <File + RelativePath="images\options_bk.jpg"> + </File> + <File + RelativePath="images\options_boff.bmp"> + </File> + <File + RelativePath="images\options_bon.bmp"> + </File> + <File + RelativePath="images\start0_off.jpg"> + </File> + <File + RelativePath="images\start0_on.jpg"> + </File> + <File + RelativePath="images\start1_off.jpg"> + </File> + <File + RelativePath="images\start1_on.jpg"> + </File> + <File + RelativePath="images\start2_off.jpg"> + </File> + <File + RelativePath="images\start2_on.jpg"> + </File> + <File + RelativePath="images\start3_off.jpg"> + </File> + <File + RelativePath="images\start3_on.jpg"> + </File> + <File + RelativePath="images\start4_off.jpg"> + </File> + <File + RelativePath="images\start4_on.jpg"> + </File> + <File + RelativePath="images\start_background.jpg"> + </File> + <Filter + Name="symbols" + Filter=""> + <File + RelativePath="images\symbology\air.png"> + </File> + <File + RelativePath="images\symbology\air_fw_friendly.png"> + </File> + <File + RelativePath="images\symbology\air_fw_hostile.png"> + </File> + <File + RelativePath="images\symbology\air_fw_neutral.png"> + </File> + <File + RelativePath="images\symbology\air_fw_unknown.png"> + </File> + <File + RelativePath="images\symbology\base.png"> + </File> + <File + RelativePath="images\symbology\missile.png"> + </File> + <File + RelativePath="images\symbology\missile_friendly.png"> + </File> + <File + RelativePath="images\symbology\missile_hostile.png"> + </File> + <File + RelativePath="images\symbology\missile_neutral.png"> + </File> + <File + RelativePath="images\symbology\missile_unknown.png"> + </File> + <File + RelativePath="images\symbology\null.png"> + </File> + <File + RelativePath="images\symbology\seasurface_friendly.png"> + </File> + <File + RelativePath="images\symbology\seasurface_hostile.png"> + </File> + <File + RelativePath="images\symbology\seasurface_neutral.png"> + </File> + <File + RelativePath="images\symbology\seasurface_unknown.png"> + </File> + <File + RelativePath="images\symbology\surface.png"> + </File> + <File + RelativePath="images\symbology\symbol.png"> + </File> + <File + RelativePath="images\symbology\unknown.png"> + </File> + </Filter> + </Filter> + <Filter + Name="maps" + Filter=""> + <File + RelativePath="maps\defaultmap.dat"> + </File> + <File + RelativePath="maps\lowres02f2.dat"> + </File> </Filter> <Filter *************** *** 931,934 **** --- 1347,1353 ---- </File> <File + RelativePath=".\include\database\tcDBObjSerializerSql.h"> + </File> + <File RelativePath="include\database\tcDBString.h"> </File> *************** *** 958,961 **** --- 1377,1383 ---- </File> <File + RelativePath=".\include\database\tcSqlReader.h"> + </File> + <File RelativePath=".\include\database\tcWeaponDBObject.h"> </File> *************** *** 989,1393 **** </File> </Filter> - </Filter> - <Filter - Name="res" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> - <File - RelativePath="res\wx\msw\blank.cur"> - </File> - <File - RelativePath="res\wx\msw\bullseye.cur"> - </File> - <File - RelativePath="res\wx\msw\cdrom.ico"> - </File> - <File - RelativePath="res\wx\msw\colours.bmp"> - </File> - <File - RelativePath="res\wx\msw\computer.ico"> - </File> - <File - RelativePath="res\wx\msw\csquery.bmp"> - </File> - <File - RelativePath="res\Default.wav"> - </File> - <File - RelativePath="res\wx\msw\disable.bmp"> - </File> - <File - RelativePath="res\wx\msw\drive.ico"> - </File> - <File - RelativePath="res\wx\msw\file1.ico"> - </File> - <File - RelativePath="res\wx\msw\floppy.ico"> - </File> - <File - RelativePath="res\wx\msw\folder1.ico"> - </File> - <File - RelativePath="res\wx\msw\folder2.ico"> - </File> - <File - RelativePath="res\GCblue.ico"> - </File> - <File - RelativePath="res\GCblue.rc"> - </File> - <File - RelativePath="res\wx\msw\hand.cur"> - </File> - <File - RelativePath="res\wx\msw\magnif1.cur"> - </File> - <File - RelativePath="res\wx\msw\noentry.cur"> - </File> - <File - RelativePath="res\wx\msw\pbrush.cur"> - </File> - <File - RelativePath="res\wx\msw\pencil.cur"> - </File> - <File - RelativePath="res\wx\msw\pntleft.cur"> - </File> - <File - RelativePath="res\wx\msw\pntright.cur"> - </File> - <File - RelativePath="res\wx\msw\query.cur"> - </File> - <File - RelativePath="res\wx\msw\removble.ico"> - </File> - <File - RelativePath="res\wx\msw\rightarr.cur"> - </File> - <File - RelativePath="res\wx\msw\roller.cur"> - </File> - <File - RelativePath="res\wx\msw\size.cur"> - </File> - <File - RelativePath="res\wx\msw\watch1.cur"> - </File> - </Filter> - <Filter - Name="wav" - Filter=""> - <File - RelativePath="wav\Beep2.wav"> - </File> - <File - RelativePath="wav\Bloop.wav"> - </File> - <File - RelativePath="wav\consolebeep.wav"> - </File> - <File - RelativePath="wav\Explosion.wav"> - </File> - <File - RelativePath="wav\Explosion2.wav"> - </File> - <File - RelativePath="wav\Implosion.wav"> - </File> - <File - RelativePath="wav\LightSaber.wav"> - </File> - <File - RelativePath="wav\LowBeep.wav"> - </File> - <File - RelativePath="wav\MissileLaunch.wav"> - </File> - <File - RelativePath="wav\MusicCut2.wav"> - </File> - <File - RelativePath="wav\NavyWhistle.wav"> - </File> - <File - RelativePath="wav\NoisyBeepLow.wav"> - </File> - <File - RelativePath="wav\Ping.wav"> - </File> - <File - RelativePath="wav\Ping2.wav"> - </File> - <File - RelativePath="wav\radarping.wav"> - </File> - <File - RelativePath="wav\RejectBeep.wav"> - </File> - <File - RelativePath="wav\SaberTail.wav"> - </File> - <File - RelativePath="wav\ShortBeep.wav"> - </File> - <File - RelativePath="wav\Thuck.wav"> - </File> - <File - RelativePath="wav\TwoBeeps.wav"> - </File> - </Filter> - <Filter - Name="texture" - Filter=""> - <File - RelativePath="texture\a4b_ar.bmp"> - </File> - <File - RelativePath="texture\fa1uk.bmp"> - </File> - <File - RelativePath="texture\gr3uk.bmp"> - </File> - <File - RelativePath="texture\grass20.bmp"> - </File> - <File - RelativePath="texture\gslogo.bmp"> - </File> - <File - RelativePath="texture\gslogo_bluer.gif"> - </File> - <File - RelativePath="texture\m50_cl.bmp"> - </File> - <File - RelativePath="texture\rock04.bmp"> - </File> - <File - RelativePath="texture\roland.bmp"> - </File> - <File - RelativePath="texture\sand12.bmp"> - </File> - <File - RelativePath="texture\sea1.bmp"> - </File> - <File - RelativePath="texture\sky8_256.bmp"> - </File> - <File - RelativePath="texture\t42b1.bmp"> - </File> - <File - RelativePath="texture\t42b1a.bmp"> - </File> - <File - RelativePath="texture\type45.bmp"> - </File> - <File - RelativePath="texture\water2_256.bmp"> - </File> - </Filter> - <Filter - Name="3d" - Filter=""> - <File - RelativePath="3d\a4b_ar.gc3"> - </File> - <File - RelativePath="3d\aim9b.gc3"> - </File> - <File - RelativePath="3d\aim9l.gc3"> - </File> - <File - RelativePath="3d\air_small.gc3"> - </File> - <File - RelativePath="3d\am39.gc3"> - </File> - <File - RelativePath="3d\bo105cb.gc3"> - </File> - <File - RelativePath="3d\fa1uk.gc3"> - </File> - <File - RelativePath="3d\gr3uk.gc3"> - </File> - <File - RelativePath="3d\m50_cl.gc3"> - </File> - <File - RelativePath="3d\mm38.gc3"> - </File> - <File - RelativePath="3d\rah66.gc3"> - </File> - <File - RelativePath="3d\roland_sam.gc3"> - </File> - <File - RelativePath="3d\surf_med.gc3"> - </File> - <File - RelativePath="3d\surf_small.gc3"> - </File> - <File - RelativePath="3d\t42b1.gc3"> - </File> - <File - RelativePath="3d\type45_lr.gc3"> - </File> - <File - RelativePath="3d\type45edit.gc3"> - </File> - <File - RelativePath="3d\typhoon.gc3"> - </File> - <File - RelativePath="3d\typhoonflip.gc3"> - </File> - </Filter> - <Filter - Name="images" - Filter=""> - <File - RelativePath="images\buttonbar_bk.jpg"> - </File> - <File - RelativePath="images\buttonbar_off.bmp"> - </File> - <File - RelativePath="images\buttonbar_on.bmp"> - </File> - <File - RelativePath="images\console_b.jpg"> - </File> - <File - RelativePath="images\e2piece.jpg"> - </File> - <File - RelativePath="images\options_bk.bmp"> - </File> - <File - RelativePath="images\options_bk.jpg"> - </File> - <File - RelativePath="images\options_boff.bmp"> - </File> - <File - RelativePath="images\options_bon.bmp"> - </File> - <File - RelativePath="images\start0_off.jpg"> - </File> - <File - RelativePath="images\start0_on.jpg"> - </File> - <File - RelativePath="images\start1_off.jpg"> - </File> - <File - RelativePath="images\start1_on.jpg"> - </File> - <File - RelativePath="images\start2_off.jpg"> - </File> - <File - RelativePath="images\start2_on.jpg"> - </File> - <File - RelativePath="images\start3_off.jpg"> - </File> - <File - RelativePath="images\start3_on.jpg"> - </File> - <File - RelativePath="images\start4_off.jpg"> - </File> - <File - RelativePath="images\start4_on.jpg"> - </File> - <File - RelativePath="images\start_background.jpg"> - </File> <Filter ! Name="symbols" Filter=""> <File ! RelativePath="images\symbology\air.png"> ! </File> ! <File ! RelativePath="images\symbology\air_fw_friendly.png"> ! </File> ! <File ! RelativePath="images\symbology\air_fw_hostile.png"> ! </File> ! <File ! RelativePath="images\symbology\air_fw_neutral.png"> ! </File> ! <File ! RelativePath="images\symbology\air_fw_unknown.png"> ! </File> ! <File ! RelativePath="images\symbology\base.png"> ! </File> ! <File ! RelativePath="images\symbology\missile.png"> ! </File> ! <File ! RelativePath="images\symbology\missile_friendly.png"> ! </File> ! <File ! RelativePath="images\symbology\missile_hostile.png"> ! </File> ! <File ! RelativePath="images\symbology\missile_neutral.png"> ! </File> ! <File ! RelativePath="images\symbology\missile_unknown.png"> ! </File> ! <File ! RelativePath="images\symbology\null.png"> ! </File> ! <File ! RelativePath="images\symbology\seasurface_friendly.png"> ! </File> ! <File ! RelativePath="images\symbology\seasurface_hostile.png"> ! </File> ! <File ! RelativePath="images\symbology\seasurface_neutral.png"> ! </File> ! <File ! RelativePath="images\symbology\seasurface_unknown.png"> ! </File> ! <File ! RelativePath="images\symbology\surface.png"> ! </File> ! <File ! RelativePath="images\symbology\symbol.png"> </File> <File ! RelativePath="images\symbology\unknown.png"> </File> </Filter> </Filter> - <Filter - Name="maps" - Filter=""> - <File - RelativePath="maps\defaultmap.dat"> - </File> - <File - RelativePath="maps\lowres02f2.dat"> - </File> - </Filter> </Files> <Globals> --- 1411,1425 ---- </File> </Filter> <Filter ! Name="sqlite" Filter=""> <File ! RelativePath=".\include\sqlite\sqlite_internal.h"> </File> <File ! RelativePath=".\include\sqlite\sqlite_plus.h"> </File> </Filter> </Filter> </Files> <Globals> |
