[Gcblue-commits] gcb_wx/include/graphics tc3DViewer.h, 1.16, 1.17 tcConsoleBox.h, 1.9, 1.10 tcMapOverlay.h, 1.4, 1.5 tcMapView.h, 1.33, 1.34 tcScrollBar.h, 1.1, 1.2

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

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

Modified Files:
	tc3DViewer.h tcConsoleBox.h tcMapOverlay.h tcMapView.h 
	tcScrollBar.h 
Log Message:


Index: tcScrollBar.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcScrollBar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcScrollBar.h	17 Aug 2006 01:27:10 -0000	1.1
--- tcScrollBar.h	24 Oct 2006 01:33:57 -0000	1.2
***************
*** 47,52 ****
--- 47,55 ----
      virtual void Draw();
  
+ 	virtual void SetActive(bool abActive);
      void SetBackgroundAlpha(float val);
  	void SetBarFraction(float val);
+ 	void SetScrollFromBottom(bool state);
+ 	void SetSendRedraw(bool state);
  
      tcScrollBar(tc3DWindow *parent, const wxPoint& pos, const wxSize& size,
***************
*** 75,80 ****
      float autoScrollIncrement; ///< set to 0 when left button is not down over up/down arrow
  	unsigned int buttonDownTime;
!     
! 
      float backgroundAlpha;  ///< transparency value for solid color background
      
--- 78,83 ----
      float autoScrollIncrement; ///< set to 0 when left button is not down over up/down arrow
  	unsigned int buttonDownTime;
!     bool sendRedraw; ///< true to send redraw messages to parent
! 	bool scrollFromBottom; ///< true to scroll from bottom (console mode)
      float backgroundAlpha;  ///< transparency value for solid color background
      
***************
*** 98,101 ****
--- 101,105 ----
  	void LoadImages();
  	void SendScrollbarUpdated();
+ 	void SendRedrawMessage();
  	void UpdateAutoScroll();
  	void UpdateYbar(float ynew);

Index: tcConsoleBox.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcConsoleBox.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tcConsoleBox.h	22 Mar 2006 01:23:28 -0000	1.9
--- tcConsoleBox.h	24 Oct 2006 01:33:57 -0000	1.10
***************
*** 38,41 ****
--- 38,44 ----
  class TiXmlNode;
  
+ 
+ class tcScrollBar;
+ 
  /**
  * Class based on tcConsole modified to use 3D window graphics
***************
*** 74,77 ****
--- 77,81 ----
  	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 SetLineOffset(unsigned int offset);
***************
*** 93,97 ****
--- 97,110 ----
  	osg::Vec4 fontColor;
  
+ 	tcScrollBar* scrollBar;
+ 	float yOffset; ///< offset for scrolling
+ 	float yCurrent; ///< used to track how much space the text needs for scrolling
+ 
+ 
      void InitFromXml(TiXmlNode* config);
+ 	void OnChildRedraw(wxCommandEvent& event);
+ 	void OnScrollbarUpdated(wxCommandEvent& event);
+ 
+     DECLARE_EVENT_TABLE()
  };
  

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** tcMapView.h	1 Oct 2006 21:07:40 -0000	1.33
--- tcMapView.h	24 Oct 2006 01:33:57 -0000	1.34
***************
*** 84,88 ****
  	NTDS = 0,
  	M2525 = 1,
- 	NTDS_IMAGE = 2
  };
  
--- 84,87 ----
***************
*** 357,371 ****
  	osg::ref_ptr<osg::Geometry> maSymbolA[4][MAX_SYMBOL];
  	osg::ref_ptr<osg::Geometry> maSymbolB[4][MAX_SYMBOL];
- 	osg::ref_ptr<osg::Geometry> maSymbolC[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];
- 	osg::ref_ptr<osg::Geometry> maSymbolC_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];
- 	osg::ref_ptr<osg::Geometry> maSymbolC_alt[4][MAX_SYMBOL];
  
  	teSymbology meSymbology;
--- 356,367 ----

Index: tc3DViewer.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DViewer.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tc3DViewer.h	24 Sep 2006 19:50:19 -0000	1.16
--- tc3DViewer.h	24 Oct 2006 01:33:57 -0000	1.17
***************
*** 36,39 ****
--- 36,40 ----
  #include <osgText/Text>
  #include <osgParticle/ParticleSystemUpdater>
+ #include <osgEphemeris/EphemerisModel>
  #include "cspDate.h"
  
***************
*** 95,98 ****
--- 96,101 ----
      osg::ref_ptr<Sky> sky;
  	osg::ref_ptr<osg::Group> skyLights;
+ 	osg::ref_ptr<osg::Group> waterLights;
+ 	osg::ref_ptr<osgEphemeris::EphemerisModel> sky2;
  
      // these methods are copied from tcWindow
***************
*** 243,246 ****
--- 246,255 ----
  	tc3DModel* defaultSensorModel; ///< default sensor model for non-ID'd tracks
  
+ 	// fog colors
+ 	osg::Vec4 airFog;
+     osg::Vec4 waterFog;
+ 	int fogMode;
+ 
+ 
  
      void InitLight();

Index: tcMapOverlay.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapOverlay.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcMapOverlay.h	17 Aug 2006 01:27:10 -0000	1.4
--- tcMapOverlay.h	24 Oct 2006 01:33:57 -0000	1.5
***************
*** 29,35 ****
  
  #include "wx/wx.h" 
- #ifdef WIN32
- #include "wx/msw/private.h" //for MS Windows specific definitions
- #endif
  
  #include "tc3DWindow.h"
--- 29,32 ----