[Gcblue-commits] gcb_wx/include/sim tcLauncher.h,1.19,1.20 tcObjectControl.h,1.16,1.17 tcSubObject.h,1.4,1.5

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

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

Modified Files:
	tcLauncher.h tcObjectControl.h tcSubObject.h 
Log Message:


Index: tcSubObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcSubObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tcSubObject.h	17 Apr 2005 22:35:00 -0000	1.4
--- tcSubObject.h	25 Jun 2005 22:09:47 -0000	1.5
***************
*** 81,84 ****
--- 81,85 ----
      bool periscopeRaised;
      float periscopeDepth_m; ///< periscope depth (positive number)
+     float invPeriscopeDepth; ///< 1/periscopeDepth_m
      float lastDepth_m; ///< for depth notification messages
      bool doneSinking;

Index: tcObjectControl.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcObjectControl.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tcObjectControl.h	1 Jun 2005 00:13:28 -0000	1.16
--- tcObjectControl.h	25 Jun 2005 22:09:47 -0000	1.17
***************
*** 139,160 ****
  
  
! 
! #define MAX_OCSYMBOLS 8 ///< symbols to be drawn on map, move this feature out of tcObjectControl eventually
! 
! struct tsOCSymbolList
  {
!     struct 
!     {
!         float mfLat_rad;
!         float mfLon_rad;
!         float mfLatExtent_rad;
!         float mfLonExtent_rad;
!         float mfArcCenter_deg;
!         float mfArcLength_deg;
!         UINT32 mnColor;
!     } maSymbol[MAX_OCSYMBOLS];
!     unsigned mnSymbols;
  };
  
  /**
  * Old code, needs refactoring
--- 139,157 ----
  
  
! /**
! * For drawing range circles for weapons and sensors on map
! */
! struct MapSymbolInfo
  {
! 	float mfLat_rad;
! 	float mfLon_rad;
! 	float mfLatExtent_rad;
! 	float mfLonExtent_rad;
! 	float mfArcCenter_deg;
! 	float mfArcLength_deg;
! 	UINT32 mnColor;
  };
  
+ 
  /**
  * Old code, needs refactoring
***************
*** 167,171 ****
      void AttachUserInfo(tcUserInfo *apUserInfo) {mpUserInfo=apUserInfo;}
      bool ButtonContainingPoint(wxPoint point, int& rnRow, int& rnColumn);
!     void GetSymbols(tsOCSymbolList*& rpOCSymbolList) {rpOCSymbolList=&msOCSymbolList;}
      void SetHookID(tnPoolIndex anID) {mnHookID=anID;}
      void OnLButtonDown(wxMouseEvent& event);
--- 164,168 ----
      void AttachUserInfo(tcUserInfo *apUserInfo) {mpUserInfo=apUserInfo;}
      bool ButtonContainingPoint(wxPoint point, int& rnRow, int& rnColumn);
! 	const std::vector<MapSymbolInfo>& GetMapSymbols() const;
      void SetHookID(tnPoolIndex anID) {mnHookID=anID;}
      void OnLButtonDown(wxMouseEvent& event);
***************
*** 195,199 ****
      int mnLaunchers;
      int mnSensors;
!     tsOCSymbolList msOCSymbolList;
      osg::ref_ptr<osg::Geometry> headingCircle;
      osg::ref_ptr<osg::Geometry> headingCircleLight;
--- 192,196 ----
      int mnLaunchers;
      int mnSensors;
! 	std::vector<MapSymbolInfo> symbolList;
      osg::ref_ptr<osg::Geometry> headingCircle;
      osg::ref_ptr<osg::Geometry> headingCircleLight;

Index: tcLauncher.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcLauncher.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tcLauncher.h	22 Jun 2005 01:21:27 -0000	1.19
--- tcLauncher.h	25 Jun 2005 22:09:47 -0000	1.20
***************
*** 1,5 ****
! /** @file tcLauncher.h
! ** 
! **  Copyright (C) 2003-2004 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
--- 1,6 ----
! /** 
! **  @file tcLauncher.h
! */
! /*  Copyright (C) 2003-2005 Dewitt Colclough (de...@tw...)
  **  All rights reserved.
  **
***************
*** 119,122 ****
--- 120,124 ----
      const std::string& GetChildClassName() const;
      tcDatabaseObject* GetChildDatabaseObject() const;
+     
      const std::string& GetLauncherName() const;
  	float GetCycleTime() const;
***************
*** 138,142 ****
      void SetParent(tcGameObject *obj);
      /// @return max quantity of item that launcher can hold, 0 if not compatible
!     unsigned int GetCapacityForItem(const std::string& item) const;
      unsigned int GetCompatibleCount() const;
      const std::string& GetCompatibleName(unsigned int idx) const;
--- 140,144 ----
      void SetParent(tcGameObject *obj);
      /// @return max quantity of item that launcher can hold, 0 if not compatible
!     unsigned short GetCapacityForItem(const std::string& item) const;
      unsigned int GetCompatibleCount() const;
      const std::string& GetCompatibleName(unsigned int idx) const;
***************
*** 162,164 ****
  
  };
! #endif
\ No newline at end of file
--- 164,166 ----
  
  };
! #endif