[Gcblue-commits] gcb_wx/include/sim tcDirector.h,1.5,1.6 tcDirectorEvent.h,1.6,1.7 tcMapData.h,1.7,1.8 tcMapView.h,1.20,1.21 tcTerrainView.h,1.5,1.6

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

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

Modified Files:
	tcDirector.h tcDirectorEvent.h tcMapData.h tcMapView.h 
	tcTerrainView.h 
Log Message:


Index: tcDirector.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirector.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcDirector.h	29 Feb 2004 22:51:35 -0000	1.5
--- tcDirector.h	24 Jun 2004 21:35:40 -0000	1.6
***************
*** 34,43 ****
  class tc3DViewer;
  
  namespace MapView
  {
!     class tcMapView;
  }
  
! using MapView::tcMapView;
  
  /**
--- 34,47 ----
  class tc3DViewer;
  
+ 
  namespace MapView
  {
!     class tcTacticalMapView;
! 	class tcWorldMapView;
  }
  
! using MapView::tcTacticalMapView;
! using MapView::tcWorldMapView;
! 
  
  /**
***************
*** 57,69 ****
      void ClearEvents();
      void InitTest(); ///< initializes director with a series of hard-coded events to help test
!     tcMapView* GetMapView() {return mapView;}
!     void SetMapView(tcMapView *mv) {mapView = mv;}
      void SetStartTime(double t) {startTime = t;} ///< Sets reference time for events
      void Update(double t);
  
!     tcDirector(tc3DViewer *view3D, tcMapView *mv, tcConsole *console, wxWindow *win);
      ~tcDirector();
  private:
!     tcMapView *mapView; ///< tcMapView object for map events (only one supported currently)
      tc3DViewer *viewer; ////< tc3DViewer object for camera events
  };
--- 61,75 ----
      void ClearEvents();
      void InitTest(); ///< initializes director with a series of hard-coded events to help test
!     //tcMapView* GetMapView() {return mapView;}
!     //void SetMapView(tcMapView *mv) {mapView = mv;}
      void SetStartTime(double t) {startTime = t;} ///< Sets reference time for events
      void Update(double t);
  
! 	static void AttachMapViews(tcTacticalMapView* tmv, tcWorldMapView* wmv);
! 
!     tcDirector(tc3DViewer *view3D, tcConsole *console, wxWindow *win);
      ~tcDirector();
  private:
!     //tcMapView *mapView; ///< tcMapView object for map events (only one supported currently)
      tc3DViewer *viewer; ////< tc3DViewer object for camera events
  };

Index: tcDirectorEvent.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcDirectorEvent.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcDirectorEvent.h	29 Feb 2004 22:51:35 -0000	1.6
--- tcDirectorEvent.h	24 Jun 2004 21:35:40 -0000	1.7
***************
*** 36,40 ****
  namespace MapView
  {
!     class tcMapView;
  }
  
--- 36,41 ----
  namespace MapView
  {
! 	class tcTacticalMapView;
! 	class tcWorldMapView;
  }
  
***************
*** 52,56 ****
  }
  
! using MapView::tcMapView;
  /**
  * Base class for time-tagged camera or game events to support cut scenes and
--- 53,59 ----
  }
  
! using MapView::tcTacticalMapView;
! using MapView::tcWorldMapView;
! 
  /**
  * Base class for time-tagged camera or game events to support cut scenes and
***************
*** 83,92 ****
  {
  public:
!     tcMapEvent(tcMapView *map, tcMapObject *obj);
      virtual ~tcMapEvent();
  protected:
      bool addedToMap; ///< true if mapObject has been added to map
      tcMapObject *mapObject;
!     tcMapView* const mapView;
  };
  
--- 86,99 ----
  {
  public:
! 	static void AttachMapViews(tcTacticalMapView* tmv, tcWorldMapView* wmv);
! 
!     tcMapEvent(tcMapObject *obj);
      virtual ~tcMapEvent();
  protected:
      bool addedToMap; ///< true if mapObject has been added to map
      tcMapObject *mapObject;
! 
! 	static tcTacticalMapView* tacticalMapView;
! 	static tcWorldMapView* worldMapView;
  };
  
***************
*** 102,106 ****
      virtual void Update(double t);
  
!     tcMapTextEvent(tcMapView *map, std::string text, double startTime, double endTime, 
          double lon_deg, double lat_deg, int effect);
      virtual ~tcMapTextEvent();
--- 109,113 ----
      virtual void Update(double t);
  
!     tcMapTextEvent(std::string text, double startTime, double endTime, 
          double lon_deg, double lat_deg, int effect);
      virtual ~tcMapTextEvent();
***************
*** 119,124 ****
      virtual void Update(double t);
  
!     tcMapViewEvent(tcMapView *map, double t, 
!         double lon_deg, double lat_deg, double lonSpan_deg);
      virtual ~tcMapViewEvent();
  };
--- 126,130 ----
      virtual void Update(double t);
  
!     tcMapViewEvent(double t, double lon_deg, double lat_deg, double lonSpan_deg);
      virtual ~tcMapViewEvent();
  };

Index: tcTerrainView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcTerrainView.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcTerrainView.h	20 Mar 2004 18:46:46 -0000	1.5
--- tcTerrainView.h	24 Jun 2004 21:35:40 -0000	1.6
***************
*** 57,62 ****
--- 57,64 ----
        int LoadHighResSurface();
        int LoadLowResSurface();
+ 	  void Minimize();
        int RefreshSurfaces(); ///< reloads terrain data to map view
        int CreateSurfaces(tcGraphicsEngine* apGraphicsEngine);
+ 	  void SetActive(bool abActive);
        void SetView(tcGeoRect r); 
  

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapView.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcMapView.h	21 Jun 2004 22:21:59 -0000	1.20
--- tcMapView.h	24 Jun 2004 21:35:40 -0000	1.21
***************
*** 351,365 ****
          int mnCounter;
  
          int CreateSurfaces(tcGraphicsEngine* apGraphicsEngine);
!         int Draw(void);
!         void DrawGrid(Gdiplus::Graphics *apGraphics);
          void DrawTheaterBox(Gdiplus::Graphics *apGraphics);
          void OnLButtonDown(wxMouseEvent& event);
          void OnMouseMove(wxMouseEvent& event);
          void OnRButtonDown(wxMouseEvent& event);
!         void ClearMapObjects(void);
!         void Init(void);
          virtual void SetActive(bool abActive); 
          void SetTheater(tcGeoRect r) {mrectTheater = r;}
          tcWorldMapView(wxWindow *parent, 
              const wxPoint& pos, const wxSize& size, 
--- 351,369 ----
          int mnCounter;
  
+ 		void ChangeTheater(float lon_deg, float lat_deg);
          int CreateSurfaces(tcGraphicsEngine* apGraphicsEngine);
!         int Draw();
!         void DrawGrid(Gdiplus::Graphics* apGraphics);
! 		void DrawIcon(Gdiplus::Graphics* graphics);
          void DrawTheaterBox(Gdiplus::Graphics *apGraphics);
          void OnLButtonDown(wxMouseEvent& event);
          void OnMouseMove(wxMouseEvent& event);
          void OnRButtonDown(wxMouseEvent& event);
!         void ClearMapObjects();
!         void Init();
          virtual void SetActive(bool abActive); 
          void SetTheater(tcGeoRect r) {mrectTheater = r;}
+ 		void ToggleMapSize();
+ 
          tcWorldMapView(wxWindow *parent, 
              const wxPoint& pos, const wxSize& size, 

Index: tcMapData.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapData.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcMapData.h	24 Jun 2004 01:43:43 -0000	1.7
--- tcMapData.h	24 Jun 2004 21:35:40 -0000	1.8
***************
*** 3,6 ****
--- 3,8 ----
  **
  **  Header for the tcMapData class.
+ **  Documentation http://www.ngdc.noaa.gov/seg/topo/report/
+ **  Georeferencing info: http://www.ngdc.noaa.gov/seg/topo/report/s5/s5Biii.html 
  **
  **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
***************
*** 117,120 ****
--- 119,123 ----
          float minAlt = -16000.0f, float maxAlt = 16000.0f);
      float GetTerrainHeight(float afLon_deg, float afLat_deg, double afStatusTime);
+ 	float GetTerrainHeightHighRes(float afLon_deg, float afLat_deg); 
      float GetTerrainHeightLowRes(float afLon_deg, float afLat_deg);
      void GetTheaterArea(tcGeoRect& r) {r = mrTheaterView;}
***************
*** 146,149 ****
--- 149,153 ----
      short maTheater[M_HIGHRES][N_HIGHRES];
      tcGeoRect mrTheaterView;  ///< geo bounds of loaded theater (high res) map
+ 	tcRect theaterViewDeg; ///< theater boundaries in degrees
      tcGeoRect mrWorldView; ///<  bounds of loaded world (low res) map
      HPEN mhPenBox;