Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1:/tmp/cvs-serv548/include/sim
Modified Files:
Game.h tc3DViewer.h tcMapView.h
Log Message:
briefing camera features
Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Game.h 29 Dec 2003 01:10:25 -0000 1.20
--- Game.h 3 Jan 2004 00:45:12 -0000 1.21
***************
*** 28,31 ****
--- 28,32 ----
#include "tcMapView.h"
#include "tcSoundConsole.h"
+ #include "tcButtonConsole.h"
#include "commandlist.h"
#include "tcDatabase.h"
***************
*** 112,115 ****
--- 113,117 ----
public:
double gameTime;
+ double directorTime; // kind of a hack to keep director going during pause
DateZulu gameDateZulu; ///< object combining date and time
wxDateTime startTime;
***************
*** 138,142 ****
int mnBottomMargin; // height of bottom aux windows
tcSoundConsole *infoConsole; ///< console object for info messages
! tcSoundConsole *briefingConsoleLeft; ///< console object for briefing text
tcSoundConsole *briefingConsoleBottom; ///< to fill space at bottom for now
tcTacticalMapView *tacticalMap; ///< tactical map object
--- 140,144 ----
int mnBottomMargin; // height of bottom aux windows
tcSoundConsole *infoConsole; ///< console object for info messages
! tcButtonConsole *briefingConsoleLeft; ///< console object for briefing text
tcSoundConsole *briefingConsoleBottom; ///< to fill space at bottom for now
tcTacticalMapView *tacticalMap; ///< tactical map object
***************
*** 228,231 ****
--- 230,234 ----
void SetTacticalMapSize(teTacticalMapSize mapSize);
void ShiftTime(float delta_s); ///< shifts time for sky/environment updates
+ void SkipBriefing(wxCommandEvent& event);
void StartGame(wxCommandEvent& event);
void SwitchToCredit(wxCommandEvent& event);
Index: tc3DViewer.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tc3DViewer.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tc3DViewer.h 1 Jan 2004 23:44:46 -0000 1.17
--- tc3DViewer.h 3 Jan 2004 00:45:12 -0000 1.18
***************
*** 105,108 ****
--- 105,109 ----
void DirtyAll();
void Frame();
+ void Freeze();
Producer::Vec3 GetCameraPosition();
Producer::Vec3 GetObjectPosition(tcGameObject *obj);
***************
*** 133,136 ****
--- 134,138 ----
private:
+ bool isFrozen; ///< set true if window has been frozen
bool isActive;
bool viewWireframe;
Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapView.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tcMapView.h 22 Dec 2003 02:32:37 -0000 1.10
--- tcMapView.h 3 Jan 2004 00:45:12 -0000 1.11
***************
*** 177,180 ****
--- 177,181 ----
void CalcViewParameters(void);
virtual int CreateSurfaces(tcGraphicsEngine* apGraphicsEngine);
+ virtual void Freeze();
tcPoint GeoToScreen(tcPoint pgeo);
tcPoint GeoToScreen(float afLon, float afLat);
***************
*** 200,203 ****
--- 201,205 ----
terrainView->SetYMirror(y);
}
+ virtual void Thaw();
tcMapView(wxWindow *parent,
|
