[Gcblue-commits] gcb_wx/include/sim Game.h,1.40,1.41 tcGameView.h,1.6,1.7 tcMapData.h,1.5,1.6 tcMapView.h,1.19,1.20

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

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

Modified Files:
	Game.h tcGameView.h tcMapData.h tcMapView.h 
Log Message:


Index: tcGameView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcGameView.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcGameView.h	7 Feb 2004 02:19:54 -0000	1.6
--- tcGameView.h	21 Jun 2004 22:21:59 -0000	1.7
***************
*** 61,65 ****
  * functionality is commented out for now. Some of it needs to be incorporated
  * into the ported version of the game with OSG e.g. displaying unknown objects.
! * 
  */
  class tcGameView  
--- 61,65 ----
  * functionality is commented out for now. Some of it needs to be incorporated
  * into the ported version of the game with OSG e.g. displaying unknown objects.
! * Class has lots of old code that likely needs refactoring.
  */
  class tcGameView  

Index: Game.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/Game.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Game.h	19 Jun 2004 22:00:27 -0000	1.40
--- Game.h	21 Jun 2004 22:21:43 -0000	1.41
***************
*** 244,247 ****
--- 244,249 ----
      void SetPauseMode(wxCommandEvent& event);
      void SetTacticalMapSize(teTacticalMapSize mapSize);
+ 	void SetTheater(wxCommandEvent& event); 
+ 	void SetTheater(int lat_deg, int lon_deg); ///< sets theater view center
      void SetTimeAccel(wxCommandEvent& event);
      void ShiftTime(float delta_s); ///< shifts time for sky/environment updates

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapView.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tcMapView.h	3 Apr 2004 20:24:33 -0000	1.19
--- tcMapView.h	21 Jun 2004 22:21:59 -0000	1.20
***************
*** 190,194 ****
          tcPoint ScreenToGeo(wxPoint pscreen);
          tcPoint ScreenToGeo(float x, float y);
!         void SetActive(bool abActive); ///< overrides base class
          void SetSize(const wxRect& rect);
          void SetView(tcPoint center, float afLonSpan);
--- 190,194 ----
          tcPoint ScreenToGeo(wxPoint pscreen);
          tcPoint ScreenToGeo(float x, float y);
!         virtual void SetActive(bool abActive); ///< overrides base class
          void SetSize(const wxRect& rect);
          void SetView(tcPoint center, float afLonSpan);
***************
*** 298,301 ****
--- 298,302 ----
          void OnMouseWheel(wxMouseEvent& event);
          void OnRButtonDown(wxMouseEvent& event);
+ 		void Refresh();
          void ActivateCmd(teMapCmdType aeCmd) {mbMapCmdActive=true; meMapCmd=aeCmd;}
          void DeactivateCmd() {mbMapCmdActive=false; meMapCmd=MC_NONE;}
***************
*** 359,362 ****
--- 360,364 ----
          void ClearMapObjects(void);
          void Init(void);
+         virtual void SetActive(bool abActive); 
          void SetTheater(tcGeoRect r) {mrectTheater = r;}
          tcWorldMapView(wxWindow *parent, 

Index: tcMapData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapData.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcMapData.h	20 Jun 2004 14:59:52 -0000	1.5
--- tcMapData.h	21 Jun 2004 22:21:59 -0000	1.6
***************
*** 91,94 ****
--- 91,101 ----
  #define DEFAULT_TILE_NAME "defaulttile.dat"
  
+ /**
+ * This class interfaces to 30 arc-sec DEM map data.
+ * A cache of 0.5 x 0.5 deg tiles is used. Methods are provided
+ * to create images for map terrain view display. Several different
+ * generations of code are jumbled together here. This sorely
+ * needs refactoring.
+ */
  class tcMapData  
  {
***************
*** 146,154 ****
      unsigned short mnReturnIndex; ///<  maAvailableTiles index for deallocation
      tsTileData* GetTile(unsigned mtile, unsigned ntile, double afStatusTime);
      tsTileData* LoadTile(unsigned mtile, unsigned ntile);
  	tsTileData* LoadTileB(unsigned mtile, unsigned ntile);
  
!     void CreatePalettes(void);
!     void LabelLowRes(void);
      int ReadHighResData(int M, int N, int mstart, int nstart,
          tcFile *pMain, tcFile *pEast, tcFile *pSouth, tcFile *pSouthEast);
--- 153,163 ----
      unsigned short mnReturnIndex; ///<  maAvailableTiles index for deallocation
      tsTileData* GetTile(unsigned mtile, unsigned ntile, double afStatusTime);
+ 	void LoadDemTile(tcFile& tileFile, int lat_deg, int lon_deg);
      tsTileData* LoadTile(unsigned mtile, unsigned ntile);
  	tsTileData* LoadTileB(unsigned mtile, unsigned ntile);
  
!     void CreatePalettes();
! 	void GetTileName(wxString& nameString, int lat_deg, int lon_deg);
!     void LabelLowRes();
      int ReadHighResData(int M, int N, int mstart, int nstart,
          tcFile *pMain, tcFile *pEast, tcFile *pSouth, tcFile *pSouthEast);
***************
*** 157,162 ****
      int ReadHighResDataDefault(int M, int N, int mstart, int nstart,tcFile *pMain);
      void ReportMapDataError(UINT32 anError);
!     void SetDemInfo(void);
!     void InitTiles(void);
  };
  
--- 166,171 ----
      int ReadHighResDataDefault(int M, int N, int mstart, int nstart,tcFile *pMain);
      void ReportMapDataError(UINT32 anError);
!     void SetDemInfo();
!     void InitTiles();
  };