[Gcblue-commits] gcb_wx/include/graphics tcMapView.h,1.17,1.18 tcMessageCenter.h,1.3,1.4 tcMessageIn
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2005-05-06 23:57:26
|
Update of /cvsroot/gcblue/gcb_wx/include/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11073/include/graphics Modified Files: tcMapView.h tcMessageCenter.h tcMessageInterface.h Log Message: added player name to connection status, update rates are slower for non-controlled objects, non-controlled objects now display as green, added chat text popup Index: tcMessageCenter.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMessageCenter.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcMessageCenter.h 29 Mar 2005 00:12:23 -0000 1.3 --- tcMessageCenter.h 6 May 2005 23:57:15 -0000 1.4 *************** *** 46,49 **** --- 46,56 ---- void ConsoleMessage(const std::string& msg); void PopupMessage(const std::string& msg); + + /// chat text messages to popup (if enabled) + void PostChatText(const std::string& msg); + + bool GetPopupChatText() const; + void SetPopupChatText(bool state); + void Clear(); virtual void Draw(); *************** *** 63,66 **** --- 70,74 ---- unsigned int popupCount; tcSoundConsole* console; + bool popupChatText; tcMessageChannel* GetChannel(const std::string& channelName); Index: tcMapView.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** tcMapView.h 31 Mar 2005 03:51:11 -0000 1.17 --- tcMapView.h 6 May 2005 23:57:15 -0000 1.18 *************** *** 104,108 **** bool isStaleTrack; ///< true for stale track bool isDestroyed; ///< true for destroyed track ! UINT8 mnFlags; void Clear() { --- 104,109 ---- bool isStaleTrack; ///< true for stale track bool isDestroyed; ///< true for destroyed track ! bool useAltered; ///< use altered symbol (e.g. for objects not controlled by player in multiplayer mode) ! UINT8 mnFlags; void Clear() { *************** *** 111,116 **** mbExists=0;mbFocus=0;mnColor=0;mfHeading=0;mfLon=0;mfLat=0;mnID=0; mnFlags = 0; ! isStaleTrack = 0; ! isDestroyed = 0; } }; --- 112,118 ---- mbExists=0;mbFocus=0;mnColor=0;mfHeading=0;mfLon=0;mfLat=0;mnID=0; mnFlags = 0; ! isStaleTrack = false; ! isDestroyed = false; ! useAltered = false; } }; *************** *** 353,360 **** --- 355,366 ---- osg::ref_ptr<osg::Geometry> maSymbolA[4][MAX_SYMBOL]; osg::ref_ptr<osg::Geometry> maSymbolB[4][MAX_SYMBOL]; + /// faded versions for stale tracks osg::ref_ptr<osg::Geometry> maSymbolA_fade[4][MAX_SYMBOL]; osg::ref_ptr<osg::Geometry> maSymbolB_fade[4][MAX_SYMBOL]; + /// altered versions of symbols (e.g. objects not under control of player) + osg::ref_ptr<osg::Geometry> maSymbolA_alt[4][MAX_SYMBOL]; + osg::ref_ptr<osg::Geometry> maSymbolB_alt[4][MAX_SYMBOL]; teSymbology meSymbology; *************** *** 367,370 **** --- 373,377 ---- osg::Geometry* GetSymbol(teAffiliation aeAffiliation, teSymbol aeSymbol); + osg::Geometry* GetSymbolAltered(teAffiliation aeAffiliation, teSymbol aeSymbol); osg::Geometry* GetSymbolFaded(teAffiliation aeAffiliation, teSymbol aeSymbol); osg::Image* LoadSymbolImage(const char *azSymbolName); *************** *** 373,377 **** float xc, float yc, float width, float height, float startAngle, float stopAngle, unsigned int nPoints); ! void CreateFadedSymbols(); osg::Geometry* CreateSymbolGeometry(); osg::Geometry* CreateTexturedSymbol(const char* symbolName); --- 380,384 ---- float xc, float yc, float width, float height, float startAngle, float stopAngle, unsigned int nPoints); ! void CreateAlternateSymbols(); osg::Geometry* CreateSymbolGeometry(); osg::Geometry* CreateTexturedSymbol(const char* symbolName); Index: tcMessageInterface.h =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMessageInterface.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcMessageInterface.h 29 Mar 2005 00:12:23 -0000 1.3 --- tcMessageInterface.h 6 May 2005 23:57:15 -0000 1.4 *************** *** 42,46 **** --- 42,48 ---- void ChannelMessage(const std::string& channelName, const std::string& msg); void ConsoleMessage(const std::string& msg); + void PostChatText(const std::string& msg); void PopupMessage(const std::string& msg); + void SetPopupChatText(bool state); static tcMessageInterface* Get(); ///< singleton accessor |