[Gcblue-commits] gcb_wx/include/graphics tcConsoleBox.h,1.6,1.7 tcMapView.h,1.12,1.13 extgl.h,1.1,NONE

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15614/include/graphics

Modified Files:
	tcConsoleBox.h tcMapView.h 
Removed Files:
	extgl.h 
Log Message:
Better sensor ageout behavior, more ai work, misc cleanup

Index: tcConsoleBox.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcConsoleBox.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcConsoleBox.h	7 Oct 2004 22:01:12 -0000	1.6
--- tcConsoleBox.h	2 Mar 2005 22:28:37 -0000	1.7
***************
*** 65,72 ****
      virtual void Draw();
  
!     void ForceRedraw() {mbForceRedraw = true;}
      bool IsCurrentLineEmpty();
  	virtual void OnSize(wxSizeEvent& event);
!     bool Redraw() const {return mbRedraw != 0;} ///< @return true if console will be updated
      void SetDelayedTextEffect(bool effectOn) {useDelayedTextEffect = effectOn;}
      void SetLineSpacing(int anSpacing) {nlinespace = anSpacing;}
--- 65,72 ----
      virtual void Draw();
  
!     void ForceRedraw() {forceRedraw = true;}
      bool IsCurrentLineEmpty();
  	virtual void OnSize(wxSizeEvent& event);
!     bool Redraw() const {return redraw != 0;} ///< @return true if console will be updated
      void SetDelayedTextEffect(bool effectOn) {useDelayedTextEffect = effectOn;}
      void SetLineSpacing(int anSpacing) {nlinespace = anSpacing;}
***************
*** 78,83 ****
  protected:
      int useDelayedTextEffect;
!     int mbRedraw; ///< redraw based on cursor update state
!     bool mbForceRedraw; ///< a workaround to force redraw when button state changes
      bool isMouseOver;
      bool isFocused;
--- 78,83 ----
  protected:
      int useDelayedTextEffect;
!     int redraw; ///< redraw based on cursor update state
!     bool forceRedraw; ///< a workaround to force redraw when button state changes
      bool isMouseOver;
      bool isFocused;

--- extgl.h DELETED ---

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcMapView.h	20 Feb 2005 21:54:32 -0000	1.12
--- tcMapView.h	2 Mar 2005 22:28:37 -0000	1.13
***************
*** 100,103 ****
--- 100,105 ----
          float mfLonExtent; ///< for pie
          float mfLatExtent; ///< for pie
+         bool isStaleTrack; ///< true for stale track
+         bool isDestroyed; ///< true for destroyed track
          UINT8 mnFlags;
          void Clear() 
***************
*** 107,110 ****
--- 109,114 ----
              mbExists=0;mbFocus=0;mnColor=0;mfHeading=0;mfLon=0;mfLat=0;mnID=0;
              mnFlags = 0;
+             isStaleTrack = 0;
+             isDestroyed = 0;
          }
      };
***************
*** 277,281 ****
  
  
!         void UpdateNavPoints(std::vector<tcPoint> *mpPoints);
         
  		/// returns id of closest unit to <pscreen> within fixed dist or -1 if none
--- 281,285 ----
  
  
!         void UpdateNavPoints(std::vector<GeoPoint> *mpPoints);
         
  		/// returns id of closest unit to <pscreen> within fixed dist or -1 if none
***************
*** 337,344 ****
          std::string dateTime; ///< string with complete date/time
          WCHAR mzwchar[255]; 
!         std::vector<tcPoint> maNavPointGeo;
          std::vector<tcPoint> maNavPointScreen;
          osg::ref_ptr<osg::Geometry> maSymbolA[4][MAX_SYMBOL];
          osg::ref_ptr<osg::Geometry> maSymbolB[4][MAX_SYMBOL];
          teSymbology meSymbology;
          float mfSymbolXOffset, mfSymbolYOffset;
--- 341,352 ----
          std::string dateTime; ///< string with complete date/time
          WCHAR mzwchar[255]; 
!         std::vector<GeoPoint> maNavPointGeo;
          std::vector<tcPoint> maNavPointScreen;
          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];
+ 
          teSymbology meSymbology;
          float mfSymbolXOffset, mfSymbolYOffset;
***************
*** 350,353 ****
--- 358,362 ----
  
          osg::Geometry* GetSymbol(teAffiliation aeAffiliation, teSymbol aeSymbol);
+         osg::Geometry* GetSymbolFaded(teAffiliation aeAffiliation, teSymbol aeSymbol);
          osg::Image* LoadSymbolImage(const char *azSymbolName);
  
***************
*** 355,358 ****
--- 364,368 ----
  										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);