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

Updated VolumeSettings.lua reference to use ui prefix to work with the new OpenSceneGraph-Data/ui/VolumeSettings.lua file.

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

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

@@ -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);