[Gcblue-commits] gcb_wx/include/scriptinterface tcScenarioInterface.h,1.15,1.16 tcSimPythonInterface.h,1.20,1.21

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

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

Modified Files:
	tcScenarioInterface.h tcSimPythonInterface.h 
Log Message:
Added map overlay, fixed smoke trail roll bug, improved FOV calc for autopoint launchers, database tweaks

Index: tcScenarioInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcScenarioInterface.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tcScenarioInterface.h	2 Mar 2005 22:28:39 -0000	1.15
--- tcScenarioInterface.h	31 Mar 2005 03:51:12 -0000	1.16
***************
*** 33,36 ****
--- 33,37 ----
  
  class tcMapData;
+ class tcMapOverlay;
  class tcSimState;
  class tcDirector;
***************
*** 124,128 ****
          // audio events
          void PauseAudio();
!         void PlayAudio(std::string audioName, double seekTime);
          void PlayEffect(const std::string& effectName); ///< may want to use string for this instead
          void SeekAudio(double seekTime);
--- 125,129 ----
          // audio events
          void PauseAudio();
!         void PlayAudio(const std::string& audioName, double seekTime);
          void PlayEffect(const std::string& effectName); ///< may want to use string for this instead
          void SeekAudio(double seekTime);
***************
*** 131,143 ****
  		void ChangeMapTheater(double lon_deg, double lat_deg);
          void ChangeMapView(double lon_deg, double lat_deg, double lonSpan_deg);
!         void ConsoleText(std::string text);
!         void MapText(std::string text, double lon_deg, double lat_deg, double duration, int effect);
  
          // camera and 3D events
!         void FlybyCamera(std::string unitName, double duration, float az1_deg, float az2_deg,
              float el1_deg, float el2_deg, float r1_m, float r2_m);
!         void TrackCamera(std::string unitName, double duration, float x1, float x2, 
              float y1, float y2, float z1, float z2);
!         void Text3D(std::string text, double duration, float x, float y, float size, int effect);
  
          // goal class creation methods (cannot find a way to do directly)
--- 132,147 ----
  		void ChangeMapTheater(double lon_deg, double lat_deg);
          void ChangeMapView(double lon_deg, double lat_deg, double lonSpan_deg);
!         void ConsoleText(const std::string& text);
!         void MapText(const std::string& text, double lon_deg, double lat_deg, double duration, int effect);
! 
!         // overlay graphics
!         void OverlayText(const std::string& text, double lon_deg, double lat_deg);
  
          // camera and 3D events
!         void FlybyCamera(const std::string& unitName, double duration, float az1_deg, float az2_deg,
              float el1_deg, float el2_deg, float r1_m, float r2_m);
!         void TrackCamera(const std::string& unitName, double duration, float x1, float x2, 
              float y1, float y2, float z1, float z2);
!         void Text3D(const std::string& text, double duration, float x, float y, float size, int effect);
  
          // goal class creation methods (cannot find a way to do directly)
***************
*** 153,156 ****
--- 157,161 ----
          static void AttachDirector(tcDirector *dir) {director = dir;}
          static void AttachMapData(tcMapData *md) {mapData = md;}
+         static void AttachMapOverlay(tcMapOverlay* mo) {overlay = mo;}
          static void AttachSimState(tcSimState *apSS) {simState = apSS;}
  
***************
*** 160,163 ****
--- 165,169 ----
          static tcMapData* mapData;
          static tcSimState* simState;
+         static tcMapOverlay* overlay;
      };
  

Index: tcSimPythonInterface.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/scriptinterface/tcSimPythonInterface.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcSimPythonInterface.h	16 Feb 2005 23:13:38 -0000	1.20
--- tcSimPythonInterface.h	31 Mar 2005 03:51:12 -0000	1.21
***************
*** 49,52 ****
--- 49,53 ----
  class tcSoundConsole;
  class tcCommandQueue;
+ class tcMapOverlay;
  
  using namespace Sensor;
***************
*** 97,113 ****
          void SetUnitInfo(tcPlatformObject *apObj);
          void Test();
          void AttachCommandQueue(tcCommandQueue *cq) {tcPlatformInterface::AttachCommandQueue(cq);}
          void AttachConsole(tcSoundConsole *apConsole);
          void AttachDirector(tcDirector *dir);
          void AttachMapData(tcMapData *md);
          void AttachMenu(tcMenu *apMenu) {tcMenuInterface::AttachMenu(apMenu);}
          void AttachPanel(tcPanel *apPanel) {tcPanelInterface::AttachPanel(apPanel);}
          void AttachSensorMap(tcAllianceSensorMap *apSM) {tcTrackInterface::AttachSensorMap(apSM);}
          void AttachSimState(tcSimState *apSimState);
  		void BuildGroupMenu(); ///< creates menu customized to group of units
          void BuildPlatformMenu(); ///< creates menu customized to unit 
          void BuildTrackMenu(); ///< creates menu for track commands
          void BuildFlightPortPanel();
!         void CallPython(const char *commandtext, const char *errortext);
          void CallPlatformScript(tcPlatformObject *apObj, const char* azCommand);
          void CallTaskScript(ScriptedTask* task, const char* azCommand);
--- 98,119 ----
          void SetUnitInfo(tcPlatformObject *apObj);
          void Test();
+ 
+         // must be better way vs. all of these Attach methods?
          void AttachCommandQueue(tcCommandQueue *cq) {tcPlatformInterface::AttachCommandQueue(cq);}
          void AttachConsole(tcSoundConsole *apConsole);
          void AttachDirector(tcDirector *dir);
          void AttachMapData(tcMapData *md);
+         void AttachMapOverlay(tcMapOverlay* mo);
          void AttachMenu(tcMenu *apMenu) {tcMenuInterface::AttachMenu(apMenu);}
          void AttachPanel(tcPanel *apPanel) {tcPanelInterface::AttachPanel(apPanel);}
          void AttachSensorMap(tcAllianceSensorMap *apSM) {tcTrackInterface::AttachSensorMap(apSM);}
          void AttachSimState(tcSimState *apSimState);
+ 
+ 
  		void BuildGroupMenu(); ///< creates menu customized to group of units
          void BuildPlatformMenu(); ///< creates menu customized to unit 
          void BuildTrackMenu(); ///< creates menu for track commands
          void BuildFlightPortPanel();
!         int CallPython(const char *commandtext, const char *errortext);
          void CallPlatformScript(tcPlatformObject *apObj, const char* azCommand);
          void CallTaskScript(ScriptedTask* task, const char* azCommand);
***************
*** 163,166 ****
--- 169,173 ----
          tcPlatformObject *mpHookedObj;
          tcSoundConsole *mpConsole;
+         tcMapOverlay* overlay;
  
          ScriptedTaskInterface* taskInterface;