Skip to content

Commit

Permalink
Added toggling on/off of the VolumeSettings ui via the 'E' key.
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14416 16af8721-9629-0410-8352-f15c8da7e697
  • Loading branch information
robertosfield committed Aug 19, 2014
1 parent 84b00db commit a50eab3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/osgPresentation/deprecated/SlideShowConstructor.cpp
Expand Up @@ -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());

Expand All @@ -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);
Expand Down

0 comments on commit a50eab3

Please sign in to comment.