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

Changed the osgUI behaviour so that events are set to be handled by Widgets that have focus even if they don't directly use them.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14425 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-08-27 15:08:48 +00:00
parent 77c0f5f675
commit 2f10db8f11
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPresentation/deprecated/SlideShowConstructor.cpp
View File

@@ -3092,16 +3092,11 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
}
ModelData modelData;
addModel(model.get(), positionData, modelData, scriptData);
#if 1
osgUI::Widget* widget = vs.valid() ? osgDB::readFile<osgUI::Widget>("ui/VolumeSettings.lua") : 0;
if (widget)
{
OSG_NOTICE<<"Addig widget"<<std::endl;
OSG_NOTICE<<"Adding widget"<<std::endl;
widget->setVisible(false);
vs->setName("VolumeSettings");
@@ -3129,6 +3124,10 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
#endif
}
#endif
ModelData modelData;
addModel(model.get(), positionData, modelData, scriptData);
}
bool SlideShowConstructor::attachTexMat(osg::StateSet* stateset, const ImageData& imageData, float s, float t, bool textureRectangle)