From e3c445a52fa8b8bee2ece2111b3bc80d76716ef7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 19 Aug 2014 16:37:20 +0000 Subject: [PATCH] Updated VolumeSettings.lua reference to use ui prefix to work with the new OpenSceneGraph-Data/ui/VolumeSettings.lua file. git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14415 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgPresentation/deprecated/SlideShowConstructor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgPresentation/deprecated/SlideShowConstructor.cpp b/src/osgPresentation/deprecated/SlideShowConstructor.cpp index d00cf6fe1..0214a1c93 100644 --- a/src/osgPresentation/deprecated/SlideShowConstructor.cpp +++ b/src/osgPresentation/deprecated/SlideShowConstructor.cpp @@ -3099,7 +3099,7 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position addModel(model.get(), positionData, modelData, scriptData); #if 0 - osgUI::Widget* widget = vs.valid() ? osgDB::readFile("VolumeSettings.lua") : 0; + osgUI::Widget* widget = vs.valid() ? osgDB::readFile("ui/VolumeSettings.lua") : 0; if (widget) { OSG_NOTICE<<"Addig widget"<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); -#if 1 +#if 0 HUDTransform* hudTransform = new HUDTransform(_hudSettings.get()); hudTransform->addChild(transform);