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

Introduced SampleRatioValueProperty for more intuitive control of how many samples to take when volume rendering

Browse Source
This commit is contained in:
Robert Osfield
2013-12-10 10:43:48 +00:00
parent 499adba97f
commit bc95ea97fb
4 changed files with 73 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgVolume/MultipassTechnique.cpp
View File

@@ -185,10 +185,10 @@ void MultipassTechnique::init()
alphaFuncValue = cpv._isoProperty->getValue();
}
if (cpv._sampleDensityProperty.valid())
stateset->addUniform(cpv._sampleDensityProperty->getUniform());
if (cpv._sampleRatioProperty.valid())
stateset->addUniform(cpv._sampleRatioProperty->getUniform());
else
stateset->addUniform(new osg::Uniform("SampleDensityValue",0.0005f));
stateset->addUniform(new osg::Uniform("SampleRatioValue",1.0f));
if (cpv._transparencyProperty.valid())
@@ -265,6 +265,8 @@ void MultipassTechnique::init()
osg::ref_ptr<osg::Uniform> volumeCellSize = new osg::Uniform("volumeCellSize", osg::Vec3(1.0f/static_cast<float>(image_3d->s()),1.0f/static_cast<float>(image_3d->t()),1.0f/static_cast<float>(image_3d->r())));
stateset->addUniform(volumeCellSize.get());
OSG_NOTICE<<"Texture Dimensions "<<image_3d->s()<<", "<<image_3d->t()<<", "<<image_3d->r()<<std::endl;
}

31
src/osgVolume/Property.cpp
View File

@@ -193,6 +193,21 @@ SampleDensityWhenMovingProperty::SampleDensityWhenMovingProperty(const SampleDen
{
}
/////////////////////////////////////////////////////////////////////////////
//
// SampleRatioProperty
//
SampleRatioProperty::SampleRatioProperty(float value):
ScalarProperty("SampleRatioValue",value)
{
}
SampleRatioProperty::SampleRatioProperty(const SampleRatioProperty& srp,const osg::CopyOp& copyop):
ScalarProperty(srp, copyop)
{
}
/////////////////////////////////////////////////////////////////////////////
//
@@ -262,6 +277,7 @@ void CollectPropertiesVisitor::apply(MaximumIntensityProjectionProperty& mip) {
void CollectPropertiesVisitor::apply(LightingProperty& lp) { _lightingProperty = &lp; }
void CollectPropertiesVisitor::apply(SampleDensityProperty& sdp) { _sampleDensityProperty = &sdp; }
void CollectPropertiesVisitor::apply(SampleDensityWhenMovingProperty& sdp) { _sampleDensityWhenMovingProperty = &sdp; }
void CollectPropertiesVisitor::apply(SampleRatioProperty& srp) { _sampleRatioProperty = &srp; }
void CollectPropertiesVisitor::apply(TransparencyProperty& tp) { _transparencyProperty = &tp; }
@@ -400,25 +416,25 @@ bool PropertyAdjustmentCallback::handle(const osgGA::GUIEventAdapter& ea,osgGA::
if (_updateAlphaCutOff && cpv._isoProperty.valid())
{
OSG_INFO<<"Setting isoProperty to "<<v<<std::endl;
OSG_NOTICE<<"Setting isoProperty to "<<v<<std::endl;
cpv._isoProperty->setValue(v);
}
if (_updateAlphaCutOff && cpv._afProperty.valid())
{
OSG_INFO<<"Setting afProperty to "<<v2<<std::endl;
OSG_NOTICE<<"Setting afProperty to "<<v2<<std::endl;
cpv._afProperty->setValue(v2);
}
if (_updateTransparency && cpv._transparencyProperty.valid())
{
OSG_INFO<<"Setting transparency to "<<v2<<std::endl;
OSG_NOTICE<<"Setting transparency to "<<v2<<std::endl;
cpv._transparencyProperty->setValue(1.0f-v2);
}
if (_updateSampleDensity && cpv._sampleDensityProperty.valid())
{
OSG_INFO<<"Setting sample density to "<<v4<<std::endl;
OSG_NOTICE<<"Setting sample density to "<<v4<<std::endl;
cpv._sampleDensityProperty->setValue(v4);
}
if (_updateSampleDensity && cpv._sampleDensityWhenMovingProperty.valid())
@@ -426,6 +442,13 @@ bool PropertyAdjustmentCallback::handle(const osgGA::GUIEventAdapter& ea,osgGA::
OSG_INFO<<"Setting sample density when moving to "<<v4<<std::endl;
cpv._sampleDensityWhenMovingProperty->setValue(v4);
}
if (_updateSampleDensity && cpv._sampleRatioProperty.valid())
{
float sampleRatio = v2*4;
OSG_NOTICE<<"Setting sample ratio to "<<sampleRatio<<std::endl;
cpv._sampleRatioProperty->setValue(sampleRatio);
}
}