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

Updated volume setup code to use the new ImageDetails structure.

Browse Source
This commit is contained in:
Robert Osfield
2009-09-07 10:54:08 +00:00
parent 0b3284072d
commit 7201ce1960
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPresentation/SlideShowConstructor.cpp
View File

@@ -1537,6 +1537,8 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
if (!image) return;
osg::ref_ptr<osgVolume::ImageDetails> details = dynamic_cast<osgVolume::ImageDetails*>(image->getUserData());
osg::ref_ptr<osg::RefMatrix> matrix = details ? details->getMatrix() : dynamic_cast<osg::RefMatrix*>(image->getUserData());
osg::ref_ptr<osgVolume::Volume> volume = new osgVolume::Volume;
osg::ref_ptr<osgVolume::VolumeTile> tile = new osgVolume::VolumeTile;
@@ -1544,9 +1546,13 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
osg::ref_ptr<osgVolume::ImageLayer> layer = new osgVolume::ImageLayer(image.get());
layer->rescaleToZeroToOneRange();
if (details)
{
layer->setTexelOffset(details->getTexelOffset());
layer->setTexelScale(details->getTexelScale());
}
osg::RefMatrix* matrix = dynamic_cast<osg::RefMatrix*>(image->getUserData());
if (matrix)
if (matrix.valid())
{
layer->setLocator(new osgVolume::Locator(*matrix));
osg::Matrix tm = osg::Matrix::scale(volumeData.region[3]-volumeData.region[0], volumeData.region[4]-volumeData.region[1], volumeData.region[5]-volumeData.region[2]) *
@@ -1554,6 +1560,7 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
tile->setLocator(new osgVolume::Locator(tm * (*matrix)));
}
tile->setLayer(layer.get());
osgVolume::SwitchProperty* sp = new osgVolume::SwitchProperty;