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

Improved the setting of sample density/ratio so that they are consistent

Browse Source
This commit is contained in:
Robert Osfield
2014-04-01 18:56:57 +00:00
parent e5fe59799d
commit d773d358c4
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgVolume/Property.cpp
View File

@@ -452,7 +452,8 @@ bool PropertyAdjustmentCallback::handle(const osgGA::GUIEventAdapter& ea,osgGA::
if (ea.getMouseYOrientation()==osgGA::GUIEventAdapter::Y_INCREASING_DOWNWARDS) v = 1.0f-v;
float v2 = v*v;
float v4 = v2*v2;
float sampleRatio = powf((1.0f-v)*2.0f,3.0f);
float sampleDensity = (1.0/sampleRatio)/512.0f;
if (_updateAlphaCutOff && cpv._isoProperty.valid())
{
@@ -480,26 +481,23 @@ bool PropertyAdjustmentCallback::handle(const osgGA::GUIEventAdapter& ea,osgGA::
if (_updateSampleDensity && cpv._sampleDensityProperty.valid())
{
OSG_NOTICE<<"Setting sample density to "<<v4<<std::endl;
cpv._sampleDensityProperty->setValue(v4);
OSG_NOTICE<<"Setting sample density to "<<sampleDensity<<std::endl;
cpv._sampleDensityProperty->setValue(sampleDensity);
}
if (_updateSampleDensity && cpv._sampleDensityWhenMovingProperty.valid())
{
OSG_INFO<<"Setting sample density when moving to "<<v4<<std::endl;
cpv._sampleDensityWhenMovingProperty->setValue(v4);
OSG_INFO<<"Setting sample density when moving to "<<sampleDensity<<std::endl;
cpv._sampleDensityWhenMovingProperty->setValue(sampleDensity);
}
if (_updateSampleDensity && cpv._sampleRatioProperty.valid())
{
float sampleDensity = v4;
float sampleRatio = 1.0/(512*sampleDensity);
OSG_NOTICE<<"Setting sample ratio to "<<sampleRatio<<std::endl;
cpv._sampleRatioProperty->setValue(sampleRatio);
}
if (_updateSampleDensity && cpv._sampleRatioWhenMovingProperty.valid())
{
float sampleRatio = (1.0-v2)*20.0;
OSG_NOTICE<<"Setting sample ratio to "<<sampleRatio<<std::endl;
cpv._sampleRatioWhenMovingProperty->setValue(sampleRatio);
}