[Gcblue-commits] gcb_wx/include/graphics tc3DWindow.h,1.7,1.8 tcGraphicsEngine.h,1.13,1.14 tcMapView.h,1.3,1.4 tcPopupControl.h,1.2,1.3

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

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

Modified Files:
	tc3DWindow.h tcGraphicsEngine.h tcMapView.h tcPopupControl.h 
Log Message:
A few more changes related to GDI+ replacement

Index: tcPopupControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcPopupControl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcPopupControl.h	29 Oct 2004 02:50:43 -0000	1.2
--- tcPopupControl.h	1 Nov 2004 03:17:16 -0000	1.3
***************
*** 64,67 ****
--- 64,68 ----
      void AttachCommandInterface(tcCommandQueue *apCommandInterface) {mpCommandInterface=apCommandInterface;}
      void AttachPythonInterface(tcSimPythonInterface *apIF) {mpPythonInterface = apIF;}
+ 	virtual void SetBaseRenderBin(int n);
      void SetMenu(teMenuMode mode);
      void SetMenu(); ///< this shouldn't be an override?

Index: tc3DWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DWindow.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tc3DWindow.h	29 Oct 2004 02:50:42 -0000	1.7
--- tc3DWindow.h	1 Nov 2004 03:17:16 -0000	1.8
***************
*** 170,174 ****
      bool GetBlend();
      void SetBlend(bool blendingOn);
! 	void SetBaseRenderBin(int n);
  	void SetName(const char* s);
      void SetOpaque();
--- 170,174 ----
      bool GetBlend();
      void SetBlend(bool blendingOn);
! 	virtual void SetBaseRenderBin(int n);
  	void SetName(const char* s);
      void SetOpaque();
***************
*** 262,266 ****
  	osg::ref_ptr<osg::Geode> textRoot; ///< root node for text graphics
  	osg::ref_ptr<osg::Geode> backgroundRoot; ///< root node for background graphics
! 
  
  	osg::ref_ptr<osgText::Text> referenceText; ///< text to make size measurements with
--- 262,266 ----
  	osg::ref_ptr<osg::Geode> textRoot; ///< root node for text graphics
  	osg::ref_ptr<osg::Geode> backgroundRoot; ///< root node for background graphics
! 	osg::ref_ptr<osg::Geode> lineRoot; ///< root node for lines and rectangle graphics
  
  	osg::ref_ptr<osgText::Text> referenceText; ///< text to make size measurements with

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcMapView.h	21 Oct 2004 04:10:58 -0000	1.3
--- tcMapView.h	1 Nov 2004 03:17:16 -0000	1.4
***************
*** 113,116 ****
--- 113,117 ----
          UCHAR mbExists;
          unsigned int mnColor; 
+ 		teAffiliation meAffiliation;
          float mfLon,mfLat;
          unsigned long mnID;
***************
*** 188,192 ****
          tcPoint GeoToScreen(float afLon, float afLat);
          float GeoExtentToScreen(float afExtent_rad);
! 
  		/*
          Gdiplus::Pen* GetPen() {return mpPen;} 
--- 189,193 ----
          tcPoint GeoToScreen(float afLon, float afLat);
          float GeoExtentToScreen(float afExtent_rad);
! 		osg::Vec4 GetAffiliationColor(teAffiliation a);
  		/*
          Gdiplus::Pen* GetPen() {return mpPen;} 
***************
*** 341,345 ****
          void BuildNTDS();
  
- 		osg::Vec4 GetAffiliationColor(teAffiliation a);
          osg::Geometry* GetSymbol(teAffiliation aeAffiliation, teSymbol aeSymbol);
          osg::Image* LoadSymbolImage(const char *azSymbolName);
--- 342,345 ----
***************
*** 365,368 ****
--- 365,371 ----
      };
  
+ 	/**
+ 	* TODO move this class to separate file
+ 	*/
      class tcWorldMapView : public tcMapView 
      {

Index: tcGraphicsEngine.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcGraphicsEngine.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcGraphicsEngine.h	14 Sep 2004 02:01:45 -0000	1.13
--- tcGraphicsEngine.h	1 Nov 2004 03:17:16 -0000	1.14
***************
*** 147,153 ****
      } meGraphicsMode;
  
!     void CheckGLError();
!     void ConfigureFor2D(void);
!     void ConfigureForTexture2D(void);
  
      AUX_RGBImageRec* LoadBmp(char *szFileName);
--- 147,153 ----
      } meGraphicsMode;
  
!     void CheckGLError(const char* location = 0);
!     void ConfigureFor2D();
!     void ConfigureForTexture2D();
  
      AUX_RGBImageRec* LoadBmp(char *szFileName);