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

Added reset of the event windowSize

Browse Source
This commit is contained in:
Robert Osfield
2006-07-19 14:04:16 +00:00
parent b03a772846
commit 11e22579d6
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgProducer/KeyboardMouseCallback.cpp
View File

@@ -157,6 +157,9 @@ void KeyboardMouseCallback::updateWindowSize()
maxY = osg::maximum(maxY,ir.bottom());
maxY = osg::maximum(maxY,ir.bottom()+ir.height());
}
// osg::notify(osg::NOTICE)<<"IA ea->setWindowSize("<<minX<<","<<minY<<","<<maxX<<","<<maxY<<")"<<std::endl;
ea->setWindowSize(minX,minY,maxX,maxY);
}
else if (rs)
@@ -170,6 +173,8 @@ void KeyboardMouseCallback::updateWindowSize()
float minY = osg::minimum(ir.bottom(),ir.bottom()+ir.height());
float maxY = osg::maximum(ir.bottom(),ir.bottom()+ir.height());
// osg::notify(osg::NOTICE)<<"RS ea->setWindowSize("<<minX<<","<<minY<<","<<maxX<<","<<maxY<<")"<<std::endl;
ea->setWindowSize(minX,minY,maxX,maxY);
}
}

17
src/osgProducer/Viewer.cpp
View File

@@ -531,8 +531,17 @@ bool Viewer::realize()
if (_kbm.valid() && !_kbm->isRunning())
{
_kbm->startThread();
while (!_kbm->isRunning())
{
// osg::notify(osg::NOTICE)<<"Waiting"<<std::endl;
OpenThreads::Thread::YieldCurrentThread();
}
}
#endif
if (_kbmcb.valid()) _kbmcb->updateWindowSize();
// by default set up the DatabasePager.
{
osgDB::DatabasePager* databasePager = osgDB::Registry::instance()->getOrCreateDatabasePager();
@@ -560,14 +569,12 @@ bool Viewer::realize()
}
if (_keyswitchManipulator.valid() && _keyswitchManipulator->getCurrentMatrixManipulator())
if (_keyswitchManipulator.valid() && _keyswitchManipulator->getCurrentMatrixManipulator() && _eventQueue.valid())
{
_keyswitchManipulator->setCoordinateFrameCallback(new ViewerCoordinateFrameCallback(this));
osg::ref_ptr<osgGA::GUIEventAdapter> init_event = new osgGA::GUIEventAdapter;
init_event->setEventType(osgGA::GUIEventAdapter::FRAME);
init_event->setTime(0.0);
osg::ref_ptr<osgGA::GUIEventAdapter> init_event = _eventQueue->createEvent();
_keyswitchManipulator->setNode(getTopMostSceneData());
_keyswitchManipulator->home(*init_event,*this);
}