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

Added toggling on/off of the VolumeSettings ui via the 'E' key.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14416 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-08-19 16:58:02 +00:00
parent e3c445a52f
commit a53e73ba10
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3093,18 +3093,17 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
model->addEventCallback(new VolumeSettingsCallback());
ModelData modelData;
addModel(model.get(), positionData, modelData, scriptData);
#if 0
#if 1
osgUI::Widget* widget = vs.valid() ? osgDB::readFile<osgUI::Widget>("ui/VolumeSettings.lua") : 0;
if (widget)
{
OSG_NOTICE<<"Addig widget"<<std::endl;
widget->setVisible(true);
widget->setVisible(false);
vs->setName("VolumeSettings");
widget->getOrCreateUserDataContainer()->addUserObject(vs.get());
@@ -3118,6 +3117,8 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
transform->setMatrix(osg::Matrix::rotate(osg::inDegrees(90.0f),osg::Vec3(1.0f,0.0f,0.0f)) * osg::Matrix::scale(slide_scale,slide_scale,slide_scale)*osg::Matrix::translate(pos));
transform->addChild(widget);
transform->addEventCallback(new VolumeSettingsCallback());
#if 0
HUDTransform* hudTransform = new HUDTransform(_hudSettings.get());
hudTransform->addChild(transform);