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

Added support for new SampleDensityWhenMovingProperty into .p3d format, with it default to 0.02.

Browse Source 
One can override this value via the sampleDensityWhenMoving="value" property in the volume tag, i.e.

         <volume sampleDensityWhenMoving="0.01">CardiacCT</volume>

To switch the feature off set the value to 0, i.e.

         <volume sampleDensityWhenMoving="0">CardiacCT</volume>
This commit is contained in:
Robert Osfield
2011-03-17 17:33:02 +00:00
parent 89eadcfe82
commit 6b67320190
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osgPresentation/SlideShowConstructor
View File

@@ -267,7 +267,8 @@ public:
region_in_pixel_coords(false),
alphaValue(1.0),
cutoffValue(0.1),
sampleDensityValue(0.005)
sampleDensityValue(0.005),
sampleDensityWhenMovingValue(0.02)
{
region[0] = region[1] = region[2] = 0.0f;
region[3] = region[4] = region[5] = 1.0f;
@@ -282,6 +283,7 @@ public:
float alphaValue;
float cutoffValue;
float sampleDensityValue;
float sampleDensityWhenMovingValue;
};

1
src/osgPlugins/p3d/ReaderWriterP3D.cpp
View File

@@ -1004,6 +1004,7 @@ void ReaderWriterP3DXML::parseVolume(osgPresentation::SlideShowConstructor& cons
if (getProperty(cur, "cutoff", volumeData.cutoffValue)) {}
if (getProperty(cur, "region", 6, volumeData.region)) {}
if (getProperty(cur, "sampleDensity", volumeData.sampleDensityValue)) {}
if (getProperty(cur, "sampleDensityWhenMoving", volumeData.sampleDensityWhenMovingValue)) {}
// check for any transfer function required
std::string transferFunctionFile;

2
src/osgPresentation/SlideShowConstructor.cpp
View File

@@ -1811,6 +1811,7 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
osgVolume::AlphaFuncProperty* ap = new osgVolume::AlphaFuncProperty(volumeData.cutoffValue);
osgVolume::TransparencyProperty* tp = new osgVolume::TransparencyProperty(volumeData.alphaValue);
osgVolume::SampleDensityProperty* sd = new osgVolume::SampleDensityProperty(volumeData.sampleDensityValue);
osgVolume::SampleDensityWhenMovingProperty* sdm = (volumeData.sampleDensityWhenMovingValue > 0.0f) ? (new osgVolume::SampleDensityWhenMovingProperty(volumeData.sampleDensityWhenMovingValue)) : 0;
osgVolume::TransferFunctionProperty* tfp = volumeData.transferFunction.valid() ? new osgVolume::TransferFunctionProperty(volumeData.transferFunction.get()) : 0;
{
@@ -1819,6 +1820,7 @@ void SlideShowConstructor::addVolume(const std::string& filename, const Position
cp->addProperty(ap);
cp->addProperty(sd);
cp->addProperty(tp);
if (sdm) cp->addProperty(sdm);
if (tfp) cp->addProperty(tfp);
sp->addProperty(cp);