From 4bde492d8c7a11efcaa65e76af7091ba32b02d9a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 3 Oct 2008 09:19:53 +0000 Subject: [PATCH] From Stephan Huber, removed now redundent setEventQueue method --- include/osgViewer/CompositeViewer | 5 ----- src/osgViewer/CompositeViewer.cpp | 11 ----------- 2 files changed, 16 deletions(-) diff --git a/include/osgViewer/CompositeViewer b/include/osgViewer/CompositeViewer index 7023fae10..f4371958d 100644 --- a/include/osgViewer/CompositeViewer +++ b/include/osgViewer/CompositeViewer @@ -66,10 +66,6 @@ class OSGVIEWER_EXPORT CompositeViewer : public ViewerBase, public virtual osg:: virtual osg::FrameStamp* getViewerFrameStamp() { return getFrameStamp(); } - void setEventQueue(osgGA::EventQueue* eventQueue) { _eventQueue = eventQueue; } - osgGA::EventQueue* getEventQueue() { return _eventQueue.get(); } - const osgGA::EventQueue* getEventQueue() const { return _eventQueue.get(); } - /** Execute a main frame loop. * Equivalent to while (!viewer.done()) viewer.frame(); * Also calls realize() if the viewer is not already realized, @@ -124,7 +120,6 @@ class OSGVIEWER_EXPORT CompositeViewer : public ViewerBase, public virtual osg:: osg::observer_ptr _cameraWithFocus; osg::observer_ptr _viewWithFocus; - osg::ref_ptr _eventQueue; }; diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp index b1692a089..bcdc51d81 100644 --- a/src/osgViewer/CompositeViewer.cpp +++ b/src/osgViewer/CompositeViewer.cpp @@ -795,17 +795,6 @@ void CompositeViewer::eventTraversal() view->getEventQueue()->takeEvents(viewEventsMap[view]); } -#if 0 - _eventQueue->getCurrentEventState()->setInputRange(eventState->getXmin(), eventState->getYmin(), eventState->getXmax(), eventState->getYmax()); - _eventQueue->getCurrentEventState()->setX(eventState->getX()); - _eventQueue->getCurrentEventState()->setY(eventState->getY()); - _eventQueue->getCurrentEventState()->setButtonMask(eventState->getButtonMask()); - _eventQueue->getCurrentEventState()->setMouseYOrientation(eventState->getMouseYOrientation()); - - _eventQueue->frame( getFrameStamp()->getReferenceTime() ); - _eventQueue->takeEvents(events); -#endif - // osg::notify(osg::NOTICE)<<"Events "<