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

Cleaned up CompositeViewer interface and added event traversal of views

Browse Source
This commit is contained in:
Robert Osfield
2007-01-16 19:18:32 +00:00
parent b71f613b77
commit 6cf85cb953
3 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/osgViewer/CompositeViewer.cpp
View File

@@ -39,7 +39,6 @@ CompositeViewer::CompositeViewer():
setEventQueue(new osgGA::EventQueue);
_eventVisitor = new osgGA::EventVisitor;
_eventVisitor->setActionAdapter(this);
}
CompositeViewer::~CompositeViewer()
@@ -962,6 +961,8 @@ void CompositeViewer::eventTraversal()
++veitr)
{
View* view = veitr->first;
_eventVisitor->setActionAdapter(view);
for(osgGA::EventQueue::Events::iterator itr = veitr->second.begin();
itr != veitr->second.end();
++itr)
@@ -984,30 +985,33 @@ void CompositeViewer::eventTraversal()
}
}
#if 0
if (_eventVisitor.valid() && _scene.valid())
if (_eventVisitor.valid())
{
_eventVisitor->setFrameStamp(getFrameStamp());
_eventVisitor->setTraversalNumber(getFrameStamp()->getFrameNumber());
for(osgGA::EventQueue::Events::iterator itr = events.begin();
itr != events.end();
++itr)
for(ViewEventsMap::iterator veitr = viewEventsMap.begin();
veitr != viewEventsMap.end();
++veitr)
{
osgGA::GUIEventAdapter* event = itr->get();
View* view = veitr->first;
for(osgGA::EventQueue::Events::iterator itr = veitr->second.begin();
itr != veitr->second.end();
++itr)
{
osgGA::GUIEventAdapter* event = itr->get();
bool handled = false;
bool handled = false;
_eventVisitor->reset();
_eventVisitor->addEvent( event );
_eventVisitor->reset();
_eventVisitor->addEvent( event );
getSceneData()->accept(*_eventVisitor);
view->getSceneData()->accept(*_eventVisitor);
if (_eventVisitor->getEventHandled()) handled = true;
if (_eventVisitor->getEventHandled()) handled = true;
}
}
}
#endif
}
void CompositeViewer::updateTraversal()
@@ -1112,16 +1116,3 @@ void CompositeViewer::renderingTraversals()
}
}
}
void CompositeViewer::requestRedraw()
{
}
void CompositeViewer::requestContinuousUpdate(bool)
{
}
void CompositeViewer::requestWarpPointer(float x,float y)
{
osg::notify(osg::NOTICE)<<"CompositeViewer::requestWarpPointer("<<x<<","<<y<<")"<<std::endl;
}