Update of /cvsroot/gcblue/gcb_wx/include/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11092/include/graphics
Modified Files:
tcNetworkView.h tcTerrainView.h
Log Message:
housekeeping, networking upgrades, fixed wrapping problems with world map
Index: tcTerrainView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcTerrainView.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcTerrainView.h 19 Mar 2005 15:31:08 -0000 1.3
--- tcTerrainView.h 16 Apr 2005 20:43:55 -0000 1.4
***************
*** 89,92 ****
--- 89,95 ----
tcGeoRect mrectMap; ///< current borders of loaded map
tcRect displayRegion; ///< normalized coords [0, 1] to display on textured quad
+ tcRect displayRegionWrapped; ///< wrapped section for wrapped view
+ float wrapWidth; ///< 0-1.0 fraction of view for wrapped portion of map
+ bool isWrapped; ///< true if wrapped
osg::ref_ptr<osg::Texture2D> mapImage;
bool redraw; ///< true to redraw
Index: tcNetworkView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcNetworkView.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcNetworkView.h 6 Apr 2005 02:19:48 -0000 1.3
--- tcNetworkView.h 16 Apr 2005 20:43:55 -0000 1.4
***************
*** 52,55 ****
--- 52,56 ----
void Draw();
void DrawStatusBox();
+ int GetNetworkMode() const;
void JoinGame(wxCommandEvent& event);
void OnConnect(wxCommandEvent& event);
***************
*** 60,63 ****
--- 61,67 ----
void SetIPText(wxCommandEvent& event);
void SetNetworkMode(wxCommandEvent& event);
+ void SetNetworkMode(int mode);
+ void SetUsername(wxCommandEvent& event);
+ void SetPassword(wxCommandEvent& event);
tcNetworkView(wxWindow *parent,
***************
*** 68,72 ****
std::string ipText;
int networkMode;
! tcEditBox *ipEdit;
tcConsoleBox *chatBox;
tcEditBox *chatEntry;
--- 72,78 ----
std::string ipText;
int networkMode;
! tcEditBox* ipEdit;
! tcEditBox* usernameEdit;
! tcEditBox* passwordEdit;
tcConsoleBox *chatBox;
tcEditBox *chatEntry;
|
