gcblue-commits

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

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

Modified Files:
	tcMapObject.h tcMapOverlay.h 
Log Message:


Index: tcMapOverlay.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapOverlay.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcMapOverlay.h	24 Oct 2006 01:33:57 -0000	1.5
--- tcMapOverlay.h	11 Dec 2006 01:20:41 -0000	1.6
***************
*** 64,67 ****
--- 64,74 ----
  	void SetColor(osg::Vec4& color);
  
+     bool IsInteracting() const;
+ 
+     void OnLButtonDown(wxMouseEvent& event);
+ 	void OnLButtonUp(wxMouseEvent& event);
+ 	void OnMouseMove(wxMouseEvent& event);
+ 
+ 
      virtual tcUpdateStream& operator<<(tcUpdateStream& stream);
      virtual tcUpdateStream& operator>>(tcUpdateStream& stream);
***************
*** 76,80 ****
      std::vector<tcMapObject*> overlayObjects; // objects to draw
      /// used to redraw (create and add objects to scenegraph) only when necessary
!     bool redraw; 
  };
  
--- 83,92 ----
      std::vector<tcMapObject*> overlayObjects; // objects to draw
      /// used to redraw (create and add objects to scenegraph) only when necessary
!     bool redraw;
!     bool isInteracting;
!     size_t hookedIdx;
! 
!     void ClearInteraction();
!     void HookObject(size_t idx);
  };
  

Index: tcMapObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapObject.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcMapObject.h	17 Aug 2006 01:27:10 -0000	1.12
--- tcMapObject.h	11 Dec 2006 01:20:41 -0000	1.13
***************
*** 68,73 ****
      void SetActive(bool active) {isActive = active;}
  	void SetColor(osg::Vec4 c) {color = c;}
  	void SetMarkerActive(bool active) {markerEnabled = active;}
! 	void SetUseScreenCoords(bool active) {useRelativeCoords = active;}
      static void SetMapView(tcMapView *mv); 
  
--- 68,83 ----
      void SetActive(bool active) {isActive = active;}
  	void SetColor(osg::Vec4 c) {color = c;}
+ 
  	void SetMarkerActive(bool active) {markerEnabled = active;}
! 	void SetUseScreenCoords(bool active) {useRelativeCoords = active;}   
!     
!     bool IsInteractive() const;
!     void SetInteractive(bool state);
! 
!     float GetScreenDistanceFrom(const wxPoint& pos);
!     void SetIsHooked(bool state);
! 
!     void MoveToScreenPoint(const wxPoint& pos);
! 
      static void SetMapView(tcMapView *mv); 
  
***************
*** 82,85 ****
--- 92,97 ----
  protected:
  	bool markerEnabled; ///< true to draw X marker with text
+     bool isInteractive; ///< true if object can be hooked on map
+     bool isHooked; /// true if obj is hooked
  
      tcPoint GetScreenPoint() const;