Commit 5b11d645 authored by reichenbach's avatar reichenbach

[FIX] changes needed for the latest version of eigen3

parent d8801b11
......@@ -123,7 +123,7 @@ void computeSVD( const WMatrix< T >& A,
WMatrix< T >& V,
WValue< T >& S )
{
Eigen::Matrix< T, Eigen::Dynamic, Eigen::Dynamic > eigenA( A );
Eigen::Matrix< T, Eigen::Dynamic, Eigen::Dynamic > eigenA = A;
Eigen::JacobiSVD< Eigen::Matrix< T, Eigen::Dynamic, Eigen::Dynamic > > svd( eigenA, Eigen::ComputeFullU | Eigen::ComputeFullV );
U = WMatrix< T >( svd.matrixU() );
V = WMatrix< T >( svd.matrixV() );
......
......@@ -65,7 +65,10 @@ WDataTexture3D::WDataTexture3D( boost::shared_ptr< WValueSetBase > valueSet, boo
offset( 3, 1 ) = 0.5 / grid->getNbCoordsY();
offset( 3, 2 ) = 0.5 / grid->getNbCoordsZ();
transformation()->set( invert( static_cast< WMatrix4d >( grid->getTransform() ) ) * scale * offset );
WMatrix4d const m = grid->getTransform(); // implicit cast
Eigen::Matrix4d em = m;
transformation()->set( WMatrix4d( em ) * scale * offset );
// set the size
WGETexture3D::initTextureSize( this, grid->getNbCoordsX(), grid->getNbCoordsY(), grid->getNbCoordsZ() );
......
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