Skip to content

GitLab

Commit d311711d authored by Mario Hlawitschka's avatar Mario Hlawitschka
Browse files

[FIX] made transfer function update again.

parent 75943aad
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 56 deletions
src/modules/directVolumeRendering/WMDirectVolumeRendering.cpp
View file @ d311711d
......@@ -249,6 +249,7 @@ void WMDirectVolumeRendering::moduleMain()
// reset module in case of invalid data. This accounts only for the scalar field input
if( !dataValid )
{
cube.release();
debugLog() << "Resetting.";
rootNode->clear();
continue;
......@@ -273,7 +274,7 @@ void WMDirectVolumeRendering::moduleMain()
// use the OSG Shapes, create unit cube
WBoundingBox bb( WPosition( 0.0, 0.0, 0.0 ),
WPosition( grid->getNbCoordsX() - 1, grid->getNbCoordsY() - 1, grid->getNbCoordsZ() - 1 ) );
osg::ref_ptr< osg::Node > cube = wge::generateSolidBoundingBoxNode( bb, WColor( 1.0, 1.0, 1.0, 1.0 ) );
cube = wge::generateSolidBoundingBoxNode( bb, WColor( 1.0, 1.0, 1.0, 1.0 ) );
cube->asTransform()->getChild( 0 )->setName( "_DVR Proxy Cube" ); // Be aware that this name is used in the pick handler.
// because of the underscore in front it won't be picked
// we also set the grid's transformation here
......@@ -312,61 +313,6 @@ void WMDirectVolumeRendering::moduleMain()
gradTexEnableDefine->setActive( false ); // disable gradient texture
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// load transfer function
////////////////////////////////////////////////////////////////////////////////////////////////////
if( ( propUpdated || m_transferFunction->updated() ) && dataValid )
{
debugLog() << "updated transfer function";
boost::shared_ptr< WDataSetSingle > dataSet = m_transferFunction->getData();
if ( !dataSet )
{
debugLog() << "no data set?";
}
else
{
WAssert( dataSet, "data set" );
boost::shared_ptr< WValueSetBase > valueSet = dataSet->getValueSet();
WAssert( valueSet, "value set" );
boost::shared_ptr< WValueSet< unsigned char > > cvalueSet( boost::shared_dynamic_cast<WValueSet< unsigned char> >( valueSet ) );
if ( !cvalueSet )
{
debugLog() << "invalid type";
}
else
{
//debugLog() << "creating transfer function texture";
size_t tfsize = cvalueSet->rawSize();
//debugLog() << "Texture raw size" << tfsize;
const unsigned char* orig = cvalueSet->rawData();
unsigned char* data = new unsigned char[ tfsize ];
std::copy( orig, &orig[ tfsize ], data );
// for ( size_t i = 0; i< 30 && i < tfsize/4; ++i )
// {
// debugLog() << i << ":" << ( int )data[ 4*i ] << ' ' << ( int )data[ 4*i+1 ] << ' '<< ( int )data[ 4*i+2 ]
// << ' '<< ( int ) data[ 4*i+3 ];
// }
osg::ref_ptr< osg::Image > tfImg( new osg::Image() );
//debugLog() << "set image";
tfImg->setImage( tfsize/4, 1, 1, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE,
data, osg::Image::USE_NEW_DELETE ); // FIXME: check allocation mode
//debugLog() << "activate";
tfTexEnableDefine->setActive( false );
osg::ref_ptr< osg::Texture1D > tfTexture = new osg::Texture1D();
tfTexture->setImage( tfImg );
wge::bindTexture( cube, tfTexture, 2, "u_transferFunction" );
tfTexEnableDefine->setActive( true );
//debugLog() << "done creating transfer function texture";
}
}
debugLog() << "end updated transfer function";
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// stochastic jittering texture
////////////////////////////////////////////////////////////////////////////////////////////////////
......@@ -447,6 +393,61 @@ void WMDirectVolumeRendering::moduleMain()
WKernel::getRunningKernel()->getGraphicsEngine()->getScene()->insert( rootNode );
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
// load transfer function
////////////////////////////////////////////////////////////////////////////////////////////////////
if( ( propUpdated || m_transferFunction->updated() ) && dataValid && cube )
{
debugLog() << "updated transfer function";
boost::shared_ptr< WDataSetSingle > dataSet = m_transferFunction->getData();
if ( !dataSet )
{
debugLog() << "no data set?";
}
else
{
WAssert( dataSet, "data set" );
boost::shared_ptr< WValueSetBase > valueSet = dataSet->getValueSet();
WAssert( valueSet, "value set" );
boost::shared_ptr< WValueSet< unsigned char > > cvalueSet( boost::shared_dynamic_cast<WValueSet< unsigned char> >( valueSet ) );
if ( !cvalueSet )
{
debugLog() << "invalid type";
}
else
{
//debugLog() << "creating transfer function texture";
size_t tfsize = cvalueSet->rawSize();
//debugLog() << "Texture raw size" << tfsize;
const unsigned char* orig = cvalueSet->rawData();
unsigned char* data = new unsigned char[ tfsize ];
std::copy( orig, &orig[ tfsize ], data );
// for ( size_t i = 0; i< 30 && i < tfsize/4; ++i )
// {
// debugLog() << i << ":" << ( int )data[ 4*i ] << ' ' << ( int )data[ 4*i+1 ] << ' '<< ( int )data[ 4*i+2 ]
// << ' '<< ( int ) data[ 4*i+3 ];
// }
osg::ref_ptr< osg::Image > tfImg( new osg::Image() );
//debugLog() << "set image";
tfImg->setImage( tfsize/4, 1, 1, GL_RGBA, GL_RGBA, GL_UNSIGNED_BYTE,
data, osg::Image::USE_NEW_DELETE ); // FIXME: check allocation mode
//debugLog() << "activate";
tfTexEnableDefine->setActive( false );
osg::ref_ptr< osg::Texture1D > tfTexture = new osg::Texture1D();
tfTexture->setImage( tfImg );
wge::bindTexture( cube, tfTexture, 2, "u_transferFunction" );
tfTexEnableDefine->setActive( true );
//debugLog() << "done creating transfer function texture";
}
}
debugLog() << "end updated transfer function";
}
}
// At this point, the container managing this module signalled to shutdown. The main loop has ended and you should clean up. Always remove
......
src/modules/directVolumeRendering/WMDirectVolumeRendering.h
View file @ d311711d
......@@ -176,6 +176,11 @@ private:
* the DVR shader.
*/
osg::ref_ptr< WGEShader > m_shader;
/**
* the main geometry node
*/
osg::ref_ptr< osg::Node > cube;
};
#endif // WMDIRECTVOLUMERENDERING_H
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment