[Gcblue-commits] gcb_wx/include/graphics tc3DViewer.h,1.6,1.7 tcMapView.h,1.14,1.15

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

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

Modified Files:
	tc3DViewer.h tcMapView.h 
Log Message:
Added sonobuoy model. 2525 view now uses small symbol for ballistic and sonobuoy instead of unknown symbol

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tcMapView.h	4 Mar 2005 00:46:15 -0000	1.14
--- tcMapView.h	5 Mar 2005 22:37:51 -0000	1.15
***************
*** 73,79 ****
          SYMBOL_TORPEDO = 10,
          SYMBOL_FIXED = 11,
!         SYMBOL_SENSOR = 12,
!         SYMBOL_TARGET = 13,
!         SYMBOL_PIE = 14
      };
  
--- 73,80 ----
          SYMBOL_TORPEDO = 10,
          SYMBOL_FIXED = 11,
!         SYMBOL_MARK = 12,
!         SYMBOL_SENSOR = 13,
!         SYMBOL_TARGET = 14,
!         SYMBOL_PIE = 15
      };
  
***************
*** 367,370 ****
--- 368,373 ----
  		osg::Geometry* CreateSymbolGeometry();
  		osg::Geometry* CreateTexturedSymbol(const char* symbolName);
+ 
+         osg::Geometry* DrawDefaultMark(teAffiliation affil);
  		osg::Geometry* DrawNTDSSurface(teAffiliation affil);
          osg::Geometry* DrawNTDSGround(teAffiliation affil);
***************
*** 376,379 ****
--- 379,383 ----
          osg::Geometry* DrawNTDSUnknown(teAffiliation affil);
  
+ 
          void DrawSymbol2(tcMapObj* pMO);
  

Index: tc3DViewer.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DViewer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tc3DViewer.h	23 Nov 2004 23:30:35 -0000	1.6
--- tc3DViewer.h	5 Mar 2005 22:37:51 -0000	1.7
***************
*** 178,181 ****
--- 178,182 ----
      bool viewWireframe;
      bool useRelativeChildPos;  ///< true to add children as children of parent transform group
+     bool shakeAirCamera; ///< true to shake camera for air objects to simulate turbulence
      tcSimState *simState;
      int mnWidth;
***************
*** 204,207 ****
--- 205,211 ----
      osg::Vec3 cameraTarget; ///< point camera is looking at for lookAt modes
  	osg::Vec3 cameraTargetOffset; ///< offset for lookAt modes
+     osg::Vec3 cameraWalkOffset; ///< offset for simulated turbulence with camera motion
+     osg::Vec3 lastWalkOffset;
+ 
      float cameraAz; ///< camera azimuth relative to target for moveWith modes
      float cameraEl; ///< camera elevation relative to target for moveWith modes