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

Improved handling of VolumeSettings

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14427 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-08-28 09:42:01 +00:00
parent 2f10db8f11
commit d97081fe7f
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2938,12 +2938,19 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
sp->addProperty(new osgVolume::MaximumIntensityProjectionProperty);
}
switch(volumeData.shadingModel)
if (volumeData.volumeSettings.valid())
{
case(osgVolume::VolumeSettings::Standard): sp->setActiveProperty(0); break;
case(osgVolume::VolumeSettings::Light): sp->setActiveProperty(1); break;
case(osgVolume::VolumeSettings::Isosurface): sp->setActiveProperty(2); break;
case(osgVolume::VolumeSettings::MaximumIntensityProjection): sp->setActiveProperty(3); break;
sp->setActiveProperty(volumeData.volumeSettings->getShadingModel());
}
else
{
switch(volumeData.shadingModel)
{
case(osgVolume::VolumeSettings::Standard): sp->setActiveProperty(0); break;
case(osgVolume::VolumeSettings::Light): sp->setActiveProperty(1); break;
case(osgVolume::VolumeSettings::Isosurface): sp->setActiveProperty(2); break;
case(osgVolume::VolumeSettings::MaximumIntensityProjection): sp->setActiveProperty(3); break;
}
}
#else
{