[Gcblue-commits] gcb_wx/include/sim Game.h,1.45,1.46 tc3DViewer.h,1.27,1.28 tcDirectorEvent.h,1.9,1.
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-09-14 02:02:32
|
Update of /cvsroot/gcblue/gcb_wx/include/sim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14891/include/sim Modified Files: Game.h tc3DViewer.h tcDirectorEvent.h tcFlightPort.h Log Message: Index: tcFlightPort.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcFlightPort.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tcFlightPort.h 9 Aug 2004 02:35:14 -0000 1.7 --- tcFlightPort.h 14 Sep 2004 02:01:45 -0000 1.8 *************** *** 112,115 **** --- 112,116 ---- void InitFromDatabase(Database::tcFlightportDBObject *dbObj); void InitRelPos(tcAirState *airstate); + bool IsHeloOnly() const; int Launch(int runway); // order unit on runway to take off int LaunchID(long id); // order unit with id to take off (if on runway) Index: tc3DViewer.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tc3DViewer.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** tc3DViewer.h 6 Sep 2004 01:08:03 -0000 1.27 --- tc3DViewer.h 14 Sep 2004 02:01:45 -0000 1.28 *************** *** 1,6 **** ! /* ! ** tc3DViewer.h ! ** ! ** Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. --- 1,6 ---- ! /** ! ** @file tc3DViewer.h ! */ ! /* Copyright (C) 2003 Dewitt Colclough (de...@tw...) ** All rights reserved. *************** *** 106,109 **** --- 106,110 ---- void UpdateTextObject(int key, const std::string& text); + osg::Projection* CreateDrawProjection(); void CreateScene(); void CreateSky(); *************** *** 115,118 **** --- 116,120 ---- float GetCameraRange() {return cameraRange;} osg::Vec3 GetCameraPosition(); + osg::MatrixTransform* GetDrawMatrixTransform(); double GetGameTime() const {return gameTime;} osg::Vec3 GetObjectPosition(tcGameObject *obj); Index: Game.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Game.h 6 Sep 2004 01:08:03 -0000 1.45 --- Game.h 14 Sep 2004 02:01:45 -0000 1.46 *************** *** 63,67 **** class tcDisplaySettingsView; class tcChatBox; ! using namespace ScriptInterface; --- 63,67 ---- class tcDisplaySettingsView; class tcChatBox; ! class tc3DWindow; using namespace ScriptInterface; *************** *** 175,178 **** --- 175,180 ---- tcScenarioSelectView* scenarioSelectView; + tc3DWindow* test3DWindow; + bool mbSaveScenario; char mzFileName[128]; *************** *** 247,250 **** --- 249,253 ---- void Set3D(wxCommandEvent& event); void SetBriefingMode(wxCommandEvent& event); + void SetBriefingMode(long state); void SetMultiplayerMode(wxCommandEvent& event); void SetPauseMode(wxCommandEvent& event); Index: tcDirectorEvent.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirectorEvent.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tcDirectorEvent.h 17 Aug 2004 02:22:56 -0000 1.9 --- tcDirectorEvent.h 14 Sep 2004 02:01:45 -0000 1.10 *************** *** 107,110 **** --- 107,111 ---- { public: + enum {FADE_MASK = 0x01, RELATIVE_COORD_MASK = 0x02, MARKER_DISABLE_MASK = 0x04}; int effectCode; |