[Gcblue-commits] gcb_wx/include/graphics tc3DModel.h,1.18,1.19 tcMapView.h,1.20,1.21

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

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

Modified Files:
	tc3DModel.h tcMapView.h 
Log Message:
- Added waypoint drag edit feature to gui. User can adjust waypoints on
  map screen by clicking and dragging
- Fixed sound disable to include music. Previously sound failure would disable
  sound effects, but then play music leading to a crash.
- Added random feature targeting to missiles. Missiles should now lock on
  to a random feature of the target instead of always hitting the center.

Index: tc3DModel.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DModel.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tc3DModel.h	19 Nov 2005 19:27:47 -0000	1.18
--- tc3DModel.h	27 Nov 2005 22:21:28 -0000	1.19
***************
*** 118,122 ****
      void GetLauncherInfo(unsigned int idx, osg::Vec3& pos, float& az);
  	void GetLocationParams(LocationParams& p);
!     osg::ref_ptr<osg::Node> GetNode(); 
      unsigned int GetNumParents();
  	float GetRadius();
--- 118,123 ----
      void GetLauncherInfo(unsigned int idx, osg::Vec3& pos, float& az);
  	void GetLocationParams(LocationParams& p);
! 	osg::Node* GetModelNode(); ///< model node in model frame, no transforms
!     osg::ref_ptr<osg::Node> GetNode(); ///< transformed to camera frame
      unsigned int GetNumParents();
  	float GetRadius();

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tcMapView.h	14 Jul 2005 23:41:50 -0000	1.20
--- tcMapView.h	27 Nov 2005 22:21:28 -0000	1.21
***************
*** 29,35 ****
  
  #include "wx/wx.h" 
! #ifdef WIN32
! #include "wx/msw/private.h" //for MS Windows specific definitions
! #endif
  #include "tc3DWindow.h"
  #include "simmath.h"
--- 29,33 ----
  
  #include "wx/wx.h" 
! 
  #include "tc3DWindow.h"
  #include "simmath.h"
***************
*** 347,350 ****
--- 345,350 ----
  	std::vector<GeoPoint> maNavPointGeo;
  	std::vector<tcPoint> maNavPointScreen;
+ 	int editPointIdx; ///< -1 if no point being edited, otherwise idx of edit point
+ 
  	osg::ref_ptr<osg::Geometry> maSymbolA[4][MAX_SYMBOL];
  	osg::ref_ptr<osg::Geometry> maSymbolB[4][MAX_SYMBOL];
***************
*** 363,366 ****
--- 363,367 ----
  	wxPoint buttonDownPoint; ///< start point for click-drag operations
  	float leftMargin; ///< screen position to use for info text and symbols
+ 
  	void Build2525();
  	void BuildNTDS();
***************
*** 374,377 ****
--- 375,379 ----
  		float xc, float yc, float width, float height, 
  		float startAngle, float stopAngle, unsigned int nPoints);
+ 	void CheckForNavPointEdit(const wxPoint& buttonDownPoint);
  	void CreateAlternateSymbols();
  	osg::Geometry* CreateSymbolGeometry();