Permalink
Browse files

Updated VolumeSettings.lua reference to use ui prefix to work with th…

…e new OpenSceneGraph-Data/ui/VolumeSettings.lua file.

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14415 16af8721-9629-0410-8352-f15c8da7e697
  • Loading branch information...
1 parent e873bd2 commit 84b00dbf1134451e5de0f2f56fa872f56851ddb9 @osg-training-guest osg-training-guest committed Aug 19, 2014
Showing with 2 additions and 2 deletions.
  1. +2 −2 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<osgUI::Widget>("VolumeSettings.lua") : 0;
+ osgUI::Widget* widget = vs.valid() ? osgDB::readFile<osgUI::Widget>("ui/VolumeSettings.lua") : 0;
if (widget)
{
OSG_NOTICE<<"Addig widget"<<std::endl;
@@ -3118,7 +3118,7 @@ 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);
-#if 1
+#if 0
HUDTransform* hudTransform = new HUDTransform(_hudSettings.get());
hudTransform->addChild(transform);

0 comments on commit 84b00db

Please sign in to comment.