[Gcblue-commits] gcb_wx/include/graphics tc3DModel.h,1.19,1.20 tc3DWindow.h,1.20,1.21 tcContainerGui.h,1.1,1.2 tcFlightportGui.h,1.2,1.3 tcMapView.h,1.23,1.24

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

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

Modified Files:
	tc3DModel.h tc3DWindow.h tcContainerGui.h tcFlightportGui.h 
	tcMapView.h 
Log Message:
mission editor mode changes

Index: tc3DModel.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DModel.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tc3DModel.h	27 Nov 2005 22:21:28 -0000	1.19
--- tc3DModel.h	18 Dec 2005 18:48:15 -0000	1.20
***************
*** 116,120 ****
  
      tcGameObject* GetGameObj() const {return gameObj;}
!     void GetLauncherInfo(unsigned int idx, osg::Vec3& pos, float& az);
  	void GetLocationParams(LocationParams& p);
  	osg::Node* GetModelNode(); ///< model node in model frame, no transforms
--- 116,120 ----
  
      tcGameObject* GetGameObj() const {return gameObj;}
!     void GetLauncherInfo(unsigned int idx, osg::Vec3& pos, float& az, float& el) const;
  	void GetLocationParams(LocationParams& p);
  	osg::Node* GetModelNode(); ///< model node in model frame, no transforms
***************
*** 150,153 ****
--- 150,154 ----
          osg::Vec3 position; ///< start pos for launched item in body coords, default (0,0,0)
          float pointingAzimuth; ///< start rel az of launched item rel to nose, default 0
+ 		float pointingElevation; ///< relative elevation, default 0
      };
      tcSmoker smokeTrails;

Index: tcFlightportGui.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcFlightportGui.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcFlightportGui.h	22 Jun 2005 01:21:26 -0000	1.2
--- tcFlightportGui.h	18 Dec 2005 18:48:16 -0000	1.3
***************
*** 70,73 ****
--- 70,74 ----
      //virtual void OnLeaveWindow(wxMouseEvent& event);
  	//virtual void OnMouseMove(wxMouseEvent& event);
+ 	virtual void OnLButtonDClick(wxMouseEvent& event);
      virtual void OnRButtonDown(wxMouseEvent& event);
  

Index: tc3DWindow.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tc3DWindow.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** tc3DWindow.h	12 Dec 2005 02:37:01 -0000	1.20
--- tc3DWindow.h	18 Dec 2005 18:48:16 -0000	1.21
***************
*** 269,272 ****
--- 269,273 ----
      virtual void OnKillFocus(wxFocusEvent& event);
      virtual void OnLButtonDown(wxMouseEvent& event);
+ 	virtual void OnLButtonDClick(wxMouseEvent& event);
      virtual void OnLButtonUp(wxMouseEvent& event);
      virtual void OnLeaveWindow(wxMouseEvent& event);

Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** tcMapView.h	18 Dec 2005 04:10:32 -0000	1.23
--- tcMapView.h	18 Dec 2005 18:48:16 -0000	1.24
***************
*** 291,295 ****
  	void ScrollMap(float afDirection_deg);
  	void ClearMapCmd() {meMapCmd = MC_NONE;}
! 
  	void Draw();
  	void DrawGrid();
--- 291,295 ----
  	void ScrollMap(float afDirection_deg);
  	void ClearMapCmd() {meMapCmd = MC_NONE;}
! 	void ClearHook();
  	void Draw();
  	void DrawGrid();
***************
*** 315,318 ****
--- 315,319 ----
  	void OnLeaveWindow(wxMouseEvent& event);
  	void OnLButtonDown(wxMouseEvent& event);
+ 	void OnLButtonDClick(wxMouseEvent& event);
  	void OnLButtonUp(wxMouseEvent& event);
  	void OnLButtonDownMapCmd(wxPoint point);

Index: tcContainerGui.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcContainerGui.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcContainerGui.h	11 Jun 2005 21:01:43 -0000	1.1
--- tcContainerGui.h	18 Dec 2005 18:48:16 -0000	1.2
***************
*** 77,80 ****
--- 77,81 ----
      //virtual void OnEnterWindow(wxMouseEvent& event);
      virtual void OnLButtonDown(wxMouseEvent& event);
+ 	virtual void OnLButtonDClick(wxMouseEvent& event);
      virtual void OnLButtonUp(wxMouseEvent& event);
      virtual void OnLeaveWindow(wxMouseEvent& event);
***************
*** 100,107 ****
  	bool dragIsArmed; ///< true to start drag when mouse is moved
      size_t dragSlotIdx; ///< slot idx to drag if armed     
!     
      bool FinishDestroy();
      virtual void HandleDrop(size_t slotIdx, tcContainerItem* item);
!         
  private:
  	bool destroy; ///< workaround to delay destruction of window to safe time
--- 101,113 ----
  	bool dragIsArmed; ///< true to start drag when mouse is moved
      size_t dragSlotIdx; ///< slot idx to drag if armed     
! 	// params for window drag (move this function to base class?)
!     bool isLButtonDown;
!     bool windowDragOn;
! 	wxPoint windowDragPoint;
! 
      bool FinishDestroy();
      virtual void HandleDrop(size_t slotIdx, tcContainerItem* item);
!     void UpdateWindowDrag(const wxPoint& pos);
! 
  private:
  	bool destroy; ///< workaround to delay destruction of window to safe time