From a53e73ba109375cdcc88421e49abe43117e4e9e2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 19 Aug 2014 16:58:02 +0000 Subject: [PATCH] Added toggling on/off of the VolumeSettings ui via the 'E' key. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14416 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgPresentation/deprecated/SlideShowConstructor.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/osgPresentation/deprecated/SlideShowConstructor.cpp b/src/osgPresentation/deprecated/SlideShowConstructor.cpp index 0214a1c93..ea668a145 100644 --- a/src/osgPresentation/deprecated/SlideShowConstructor.cpp +++ b/src/osgPresentation/deprecated/SlideShowConstructor.cpp @@ -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("ui/VolumeSettings.lua") : 0; if (widget) { OSG_NOTICE<<"Addig 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);