[Gcblue-commits] gcb_wx/include/graphics tc3DTerrain.h,1.13,1.14 tcButton.h,1.12,1.13 tcLauncherPopu
Status: Alpha
Brought to you by:
ddcforge
Menu
▾
▴
[Gcblue-commits] gcb_wx/include/graphics tc3DTerrain.h,1.13,1.14 tcButton.h,1.12,1.13 tcLauncherPopup.h,1.6,1.7 tcMessageCenter.h,1.5,1.6 tcNetworkView.h,1.4,1.5 tcRadioButton.h,1.5,1.6 tcScenarioSelectView.h,1.4,1.5 tcXmlWindow.h,1.5,1.6
Update of /cvsroot/gcblue/gcb_wx/include/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1435/include/graphics Modified Files: tc3DTerrain.h tcButton.h tcLauncherPopup.h tcMessageCenter.h tcNetworkView.h tcRadioButton.h tcScenarioSelectView.h tcXmlWindow.h Log Message: GCB 0.8.0 release Index: tcXmlWindow.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcXmlWindow.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcXmlWindow.h 1 Jun 2005 00:13:27 -0000 1.5 --- tcXmlWindow.h 10 Sep 2005 21:48:06 -0000 1.6 *************** *** 41,45 **** { public: ! tcXmlWindow(wxWindow *parent, const wxPoint& pos, const wxSize& size, --- 41,48 ---- { public: ! /// find first button with matching command and change caption ! void SetButtonCaption(long command, const std::string& caption); ! void SetRadioButtonState(long radioCommand, long buttonCommand); ! tcXmlWindow(wxWindow *parent, const wxPoint& pos, const wxSize& size, Index: tcButton.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcButton.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** tcButton.h 27 Jan 2005 01:01:44 -0000 1.12 --- tcButton.h 10 Sep 2005 21:48:06 -0000 1.13 *************** *** 46,57 **** public: virtual void Draw(); ! std::string GetCaption() const {return caption;} long GetCommand() const {return command;} bool IsOn() {return isButtonOn;} ! void LoadImages(std::string offImageName, std::string onImageName, ! std::string overOffImageName, std::string overOnImageName); void SetBackgroundAlpha(float val); ! void SetCaption(std::string s) {caption = s;} void SetCommand(long cmd) {command = cmd;} void SetFillColors(const osg::Vec4& off_color, const osg::Vec4& over_color, --- 46,57 ---- public: virtual void Draw(); ! const std::string& GetCaption() const {return caption;} long GetCommand() const {return command;} bool IsOn() {return isButtonOn;} ! void LoadImages(const std::string& offImageName, const std::string& onImageName, ! const std::string& overOffImageName, const std::string& overOnImageName); void SetBackgroundAlpha(float val); ! void SetCaption(const std::string& s) {caption = s;} void SetCommand(long cmd) {command = cmd;} void SetFillColors(const osg::Vec4& off_color, const osg::Vec4& over_color, Index: tcMessageCenter.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMessageCenter.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcMessageCenter.h 26 Jul 2005 00:37:02 -0000 1.5 --- tcMessageCenter.h 10 Sep 2005 21:48:06 -0000 1.6 *************** *** 35,38 **** --- 35,39 ---- #include "tc3DWindow.h" + class tcButton; class tcMessageChannel; class tcSoundConsole; *************** *** 43,46 **** --- 44,48 ---- { public: + void ActivateChannel(const std::string& channelName); void AddMessage(const std::string& channelName, const std::string& msg); void ClearChannel(const std::string& channelName); *************** *** 72,75 **** --- 74,78 ---- tcSoundConsole* console; bool popupChatText; + tcButton* closeButton; ///< button to close this window tcMessageChannel* GetChannel(const std::string& channelName); Index: tc3DTerrain.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DTerrain.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tc3DTerrain.h 23 Nov 2004 23:30:34 -0000 1.13 --- tc3DTerrain.h 10 Sep 2005 21:48:06 -0000 1.14 *************** *** 65,69 **** ~tc3DTerrain(); private: ! tcMapData* mapData; ///< pointer to tcMapData object enum { --- 65,74 ---- ~tc3DTerrain(); private: ! struct WaterTileInfo ! { ! float half_width; ! float xc; ! float yc; ! }; enum { *************** *** 72,75 **** --- 77,81 ---- BASE_TEX_DIM = 515 }; + tcMapData* mapData; ///< pointer to tcMapData object float gridSpacing; ///< distance between neighbors in terrain grid [world coord units=m] float gridOffset; ///< offset for x and y for (0,0) grid element Index: tcScenarioSelectView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcScenarioSelectView.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcScenarioSelectView.h 22 Jun 2005 01:21:26 -0000 1.4 --- tcScenarioSelectView.h 10 Sep 2005 21:48:06 -0000 1.5 *************** *** 129,132 **** --- 129,133 ---- void DrawScenarioDirectory(std::vector<scenarioInfo>& info); wxArrayString GetListOfScenarioFiles(); + bool IsChildScenarioLoaded(const std::vector<scenarioInfo>& info) const; void LogScenarioInfo(std::vector<scenarioInfo>& info, int level); bool ProcessMouseClick(std::vector<scenarioInfo>& info, wxPoint pos); Index: tcRadioButton.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcRadioButton.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tcRadioButton.h 2 Oct 2004 22:41:32 -0000 1.5 --- tcRadioButton.h 10 Sep 2005 21:48:06 -0000 1.6 *************** *** 42,47 **** --- 42,49 ---- { public: + void ActivateButton(long buttonCommand); virtual void Draw(); std::string GetCaption() const {return caption;} + long GetCommand() const {return command;} void SetCaption(std::string s) {caption = s;} void SetCommand(long cmd) {command = cmd;} Index: tcLauncherPopup.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcLauncherPopup.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tcLauncherPopup.h 10 Jul 2005 20:32:01 -0000 1.6 --- tcLauncherPopup.h 10 Sep 2005 21:48:06 -0000 1.7 *************** *** 105,108 **** --- 105,109 ---- float runToEnable; + float runToEnable_prev; float depth; float speed; Index: tcNetworkView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcNetworkView.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tcNetworkView.h 16 Apr 2005 20:43:55 -0000 1.4 --- tcNetworkView.h 10 Sep 2005 21:48:06 -0000 1.5 *************** *** 48,52 **** MULTIPLAYER_OFF = 0, MULTIPLAYER_CLIENT = 1, ! MULTIPLAYER_SERVER = 2 }; void Draw(); --- 48,54 ---- MULTIPLAYER_OFF = 0, MULTIPLAYER_CLIENT = 1, ! MULTIPLAYER_SERVER = 2, ! ALLOW_ALL = 0, // allow any client to login, creating account if necessary ! ALLOW_REGISTERED = 1 // only allow clients registered in account database to login }; void Draw(); *************** *** 60,63 **** --- 62,67 ---- void SetChatProtocol(wxCommandEvent& event); void SetIPText(wxCommandEvent& event); + void SetLoginMode(wxCommandEvent& event); + void SetLoginMode(int mode); void SetNetworkMode(wxCommandEvent& event); void SetNetworkMode(int mode); |
