[Gcblue-commits] gcb_wx/include/sim tcAeroAirObject.h,1.9,1.10 tcAirObject.h,1.13,1.14 tcCommandObje
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/include/sim tcAeroAirObject.h,1.9,1.10 tcAirObject.h,1.13,1.14 tcCommandObject.h,1.1,1.2 tcGameObject.h,1.35,1.36 tcLauncherState.h,1.14,1.15 tcPlatformObject.h,1.25,1.26 tcSensorPlatform.h,1.1,1.2 tcSubObject.h,1.3,1.4
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14250/include/sim Modified Files: tcAeroAirObject.h tcAirObject.h tcCommandObject.h tcGameObject.h tcLauncherState.h tcPlatformObject.h tcSensorPlatform.h tcSubObject.h Log Message: fixed problem writing to account database, added command state update as part of create update for new objects at client, removed application-level command ack Index: tcGameObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameObject.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** tcGameObject.h 29 Mar 2005 00:12:24 -0000 1.35 --- tcGameObject.h 17 Apr 2005 22:35:00 -0000 1.36 *************** *** 138,142 **** virtual void ClearNewCommand(); virtual bool HasNewCommand() const; ! virtual bool HasUnacknowledgedCommand() const; virtual bool IsDestroyed(); --- 138,142 ---- virtual void ClearNewCommand(); virtual bool HasNewCommand() const; ! virtual bool IsDestroyed(); Index: tcSubObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSubObject.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcSubObject.h 8 Mar 2005 00:41:47 -0000 1.3 --- tcSubObject.h 17 Apr 2005 22:35:00 -0000 1.4 *************** *** 70,74 **** virtual void ClearNewCommand(); virtual bool HasNewCommand() const; - virtual bool HasUnacknowledgedCommand() const; tcSubObject(); --- 70,73 ---- Index: tcAeroAirObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAeroAirObject.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcAeroAirObject.h 11 Mar 2005 02:46:46 -0000 1.9 --- tcAeroAirObject.h 17 Apr 2005 22:35:00 -0000 1.10 *************** *** 32,35 **** --- 32,37 ---- } + class tcCommandStream; + /** * Aerodynamic air object model. *************** *** 48,56 **** void PrintToFile(tcFile& file); void SaveToFile(tcFile& file); float GetThrottleFraction() {return throttleFraction;} ! void SetThrottleFraction(float fract) {throttleFraction = fract;} void LoadFromFile(tcFile& file); virtual void Serialize(tcFile& file, bool mbLoad); tcAeroAirObject(); tcAeroAirObject(tcAeroAirObject&); --- 50,66 ---- void PrintToFile(tcFile& file); void SaveToFile(tcFile& file); + float GetThrottleFraction() {return throttleFraction;} ! void SetThrottleFraction(float fract); ! void LoadFromFile(tcFile& file); virtual void Serialize(tcFile& file, bool mbLoad); + virtual tcCommandStream& operator<<(tcCommandStream& stream); + virtual tcCommandStream& operator>>(tcCommandStream& stream); + + virtual void ClearNewCommand(); + virtual bool HasNewCommand() const; + tcAeroAirObject(); tcAeroAirObject(tcAeroAirObject&); *************** *** 64,70 **** --- 74,87 ---- virtual void UpdateSpeed(float dt_s); private: + enum + { + THROTTLE_CMD = 0x0001 + }; + tcCommandObject commandObj; float throttleFraction; ///< throttle setting from 0 to 1 military, greater than 1 to use afterburners float angleOfAttack; ///< angle of attack in radians, solved assuming level flight const float liftCoeffToAoa; ///< factor to convert Cl to AOA + + float GetParasiticDragCoefficient(float vmach); float UpdateThrust(float dt_s); Index: tcAirObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcAirObject.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcAirObject.h 8 Mar 2005 00:41:47 -0000 1.13 --- tcAirObject.h 17 Apr 2005 22:35:00 -0000 1.14 *************** *** 72,76 **** virtual void ClearNewCommand(); virtual bool HasNewCommand() const; - virtual bool HasUnacknowledgedCommand() const; tcAirObject(); --- 72,75 ---- Index: tcCommandObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcCommandObject.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcCommandObject.h 24 May 2004 00:14:46 -0000 1.1 --- tcCommandObject.h 17 Apr 2005 22:35:00 -0000 1.2 *************** *** 38,42 **** void ClearNewCommand(); bool HasNewCommand() const; ! bool HasUnacknowledgedCommand() const; /// implements rules for updating command params over multiplayer connection void LoadCommandParam(tcCommandStream& stream, float& param, int flag); --- 38,42 ---- void ClearNewCommand(); bool HasNewCommand() const; ! /// implements rules for updating command params over multiplayer connection void LoadCommandParam(tcCommandStream& stream, float& param, int flag); *************** *** 52,58 **** private: - /// flag to indicate new obj command since last update - bool newCommand; - /** * bitfield to manage acknowledgement for command updates. --- 52,55 ---- Index: tcLauncherState.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncherState.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcLauncherState.h 29 Mar 2005 00:12:24 -0000 1.14 --- tcLauncherState.h 17 Apr 2005 22:35:00 -0000 1.15 *************** *** 88,92 **** void ClearNewCommand(); bool HasNewCommand() const; - bool HasUnacknowledgedCommand() const; void Serialize(tcFile& file, bool abLoad); --- 88,91 ---- Index: tcPlatformObject.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcPlatformObject.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** tcPlatformObject.h 29 Mar 2005 00:12:24 -0000 1.25 --- tcPlatformObject.h 17 Apr 2005 22:35:00 -0000 1.26 *************** *** 138,142 **** virtual void ClearNewCommand(); virtual bool HasNewCommand() const; - virtual bool HasUnacknowledgedCommand() const; tcPlatformObject(); --- 138,141 ---- Index: tcSensorPlatform.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSensorPlatform.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tcSensorPlatform.h 4 Mar 2005 00:46:15 -0000 1.1 --- tcSensorPlatform.h 17 Apr 2005 22:35:00 -0000 1.2 *************** *** 88,92 **** void ClearNewCommand(); bool HasNewCommand() const; - bool HasUnacknowledgedCommand() const; tcSensorPlatform(); --- 88,91 ---- |
