FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Stephan Huber, removed now redundent setEventQueue method

Browse Source
This commit is contained in:
Robert Osfield 2008-10-03 09:19:53 +00:00
parent fb9181ff17
commit 4bde492d8c
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/osgViewer/CompositeViewer
View File

@ -66,10 +66,6 @@ class OSGVIEWER_EXPORT CompositeViewer : public ViewerBase, public virtual osg::
virtual osg::FrameStamp* getViewerFrameStamp() { return getFrameStamp(); } 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. /** Execute a main frame loop.
* Equivalent to while (!viewer.done()) viewer.frame(); * Equivalent to while (!viewer.done()) viewer.frame();
* Also calls realize() if the viewer is not already realized, * 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<osg::Camera> _cameraWithFocus; osg::observer_ptr<osg::Camera> _cameraWithFocus;
osg::observer_ptr<osgViewer::View> _viewWithFocus; osg::observer_ptr<osgViewer::View> _viewWithFocus;
osg::ref_ptr<osgGA::EventQueue> _eventQueue;
}; };

11
src/osgViewer/CompositeViewer.cpp
View File

@ -795,17 +795,6 @@ void CompositeViewer::eventTraversal()
view->getEventQueue()->takeEvents(viewEventsMap[view]); 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 "<<events.size()<<std::endl; // osg::notify(osg::NOTICE)<<"Events "<<events.size()<<std::endl;