Changeset 9909

Timestamp:

03/11/09 15:18:30 (4 years ago)

Author:

robert

Message:

Added View::removeEventHandler(..) method and added check into addEventHandler() to prevent handlers being added twice.

Location:

OpenSceneGraph/trunk

Files:

• include/osgViewer/View (modified) (1 diff)
• src/osgViewer/View.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgViewer/View

@@ -114 +114 @@
 
         typedef std::list< osg::ref_ptr<osgGA::GUIEventHandler> > EventHandlers;
-        
+     
         /** Add an EventHandler that adds handling of events to the View.*/
         void addEventHandler(osgGA::GUIEventHandler* eventHandler);
+
+        /** Remove an EventHandler from View.*/
+        void removeEventHandler(osgGA::GUIEventHandler* eventHandler);
 
         /** Get the View's list of EventHandlers.*/

OpenSceneGraph/trunk/src/osgViewer/View.cpp

@@ -358 +358 @@
 void View::addEventHandler(osgGA::GUIEventHandler* eventHandler)
 { 
-    _eventHandlers.push_back(eventHandler);
+    EventHandlers::iterator itr = std::find(_eventHandlers.begin(), _eventHandlers.end(), eventHandler);
+    if (itr == _eventHandlers.end())
+    {
+        _eventHandlers.push_back(eventHandler);
+    }
+}
+
+void View::removeEventHandler(osgGA::GUIEventHandler* eventHandler)
+{
+    EventHandlers::iterator itr = std::find(_eventHandlers.begin(), _eventHandlers.end(), eventHandler);
+    if (itr != _eventHandlers.end())
+    {
+        _eventHandlers.erase(itr);
+    }
 }