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

Various tweaks to keep in sync with new changes to osg::Timer and osgGA::EventQueue

Browse Source
This commit is contained in:
Robert Osfield
2006-12-26 17:38:47 +00:00
parent 84d22f9999
commit 6a74240d22
7 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/osgViewer/Viewer.cpp
View File

@@ -163,7 +163,7 @@ void Viewer::realize()
getContexts(contexts);
bool multiThreaded = getNumSlaves() > 1;
if (multiThreaded)
{
_startRenderingBarrier = new osg::BarrierOperation(contexts.size()+1, osg::BarrierOperation::NO_OPERATION);
@@ -202,10 +202,9 @@ void Viewer::realize()
++citr)
{
(*citr)->realize();
OpenThreads::Thread::YieldCurrentThread();
}
OpenThreads::Thread::YieldCurrentThread();
bool grabFocus = true;
if (grabFocus)
{
@@ -221,6 +220,9 @@ void Viewer::realize()
}
}
// initialize the global timer to be relative to the current time.
osg::Timer::instance()->setStartTick();
if (multiThreaded)
{
@@ -232,6 +234,7 @@ void Viewer::realize()
if (!gc->getGraphicsThread()->isRunning())
{
gc->getGraphicsThread()->startThread();
OpenThreads::Thread::YieldCurrentThread();
}
}
}
@@ -288,10 +291,6 @@ void Viewer::frameEventTraversal()
}
}
_eventQueue->frame( _scene->getFrameStamp()->getReferenceTime() );
_eventQueue->takeEvents(events);
osgGA::GUIEventAdapter* eventState = getEventQueue()->getCurrentEventState();
for(osgGA::EventQueue::Events::iterator itr = events.begin();
itr != events.end();
@@ -299,8 +298,27 @@ void Viewer::frameEventTraversal()
{
osgGA::GUIEventAdapter* event = itr->get();
event->setInputRange(eventState->getXmin(), eventState->getYmin(), eventState->getXmax(), eventState->getYmax());
switch(event->getEventType())
{
case(osgGA::GUIEventAdapter::PUSH):
case(osgGA::GUIEventAdapter::RELEASE):
case(osgGA::GUIEventAdapter::DRAG):
case(osgGA::GUIEventAdapter::MOVE):
eventState->setX(event->getX());
eventState->setY(event->getY());
eventState->setButtonMask(event->getButtonMask());
break;
default:
break;
}
}
_eventQueue->frame( _scene->getFrameStamp()->getReferenceTime() );
_eventQueue->takeEvents(events);
#if 0
// osg::notify(osg::NOTICE)<<"Events "<<events.size()<<std::endl;
for(osgGA::EventQueue::Events::iterator itr = events.begin();