Commit df11a218 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[CHANGE] - all modules compile properly now

parent 3f2447c3
......@@ -347,7 +347,7 @@ void WMDatasetManipulator::manipulatorRotMoved()
WPosition_2 p2 = ( m_posRotCenter - m_posRot );
osg::Matrixf rot;
rot.makeRotate( p2, p1 );
rot.makeRotate( p2.as< osg::Vec3f >(), p1.as< osg::Vec3f >() );
// m_transform->rotate( rot, m_posRotCenter );
} // write lock goes out of scope and is released
......
......@@ -466,8 +466,8 @@ osg::ref_ptr< osg::Geode > WMDatasetProfile::createGraphGeode()
for ( size_t k = 0; k < knobs.size() - 1 ; ++k )
{
WPosition_2 p = ( knobs[k+1]->getPosition() - knobs[k]->getPosition() );
segmentLengths.push_back( p.length() );
overallLength += p.length();
segmentLengths.push_back( length( p ) );
overallLength += length( p );
}
float x = 12;
......
......@@ -314,7 +314,7 @@ void WMDirectVolumeRendering::moduleMain()
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
rootNode->setMatrix( wge::toOSGMatrix( grid->getTransformationMatrix() ) );
rootNode->setMatrix( static_cast< WMatrix4d_2 >( grid->getTransform() ) );
m_shader->apply( cube );
......
......@@ -315,7 +315,7 @@ void WMFiberDisplaySimple::clipPlaneCallback( osg::Node* node ) const
WPosition_2 p = m_clipPlanePoint->get();
// the point p can be interpreted as translation:
osg::Matrix translation = osg::Matrix::translate( p );
osg::Matrix translation = osg::Matrix::translate( p.as< osg::Vec3d >() );
// the geometry that was specified has the normal ( 1.0, 0.0, 0.0 ). So it is possible to interpret any other normal as a rotation
osg::Matrix rotation = osg::Matrix::rotate( osg::Vec3d( 1.0, 0.0, 0.0 ), v );
......@@ -430,7 +430,7 @@ osg::ref_ptr< osg::Node > WMFiberDisplaySimple::createFiberGeode( boost::shared_
osg::Vec3 tangent = osg::Vec3( fibTangents->at( ( 3 * k ) + sidx ),
fibTangents->at( ( 3 * k ) + sidx + 1 ),
fibTangents->at( ( 3 * k ) + sidx + 2 ) );
tangent = normalize( tangent );
tangent.normalize();
vertices->push_back( vert );
colors->push_back( color );
......
......@@ -126,13 +126,13 @@ void WMGpView::moduleMain()
osg::Matrixd WMGpView::generateMatrix() const
{
osg::Matrixd trans;
trans.makeTranslate( m_pos->get() );
trans.makeTranslate( m_pos->get().as< osg::Vec3d >() );
osg::Matrixd scale;
scale.makeScale( m_scale->get(), m_scale->get(), m_scale->get() );
osg::Matrixd rot;
rot.makeRotate( WVector3d_2( 0.0, 0.0, 1.0 ), m_normal->get() );
rot.makeRotate( osg::Vec3d( 0.0, 0.0, 1.0 ), m_normal->get().as< osg::Vec3d >() );
return scale * rot * trans; // order is important: first scale, then rotate and finally translate, since matrix multiply
}
......
# ADD_SUBDIRECTORY( eegView )
ADD_SUBDIRECTORY( eegView )
# ADD_SUBDIRECTORY( gaussFiltering )
# ADD_SUBDIRECTORY( histogramEqualization )
# ADD_SUBDIRECTORY( spatialDerivation )
ADD_SUBDIRECTORY( gaussFiltering )
ADD_SUBDIRECTORY( histogramEqualization )
ADD_SUBDIRECTORY( spatialDerivation )
# ADD_SUBDIRECTORY( exportGeometry )
# ADD_SUBDIRECTORY( readMesh )
# ADD_SUBDIRECTORY( readSphericalHarmonics )
# ADD_SUBDIRECTORY( writeDendrogram )
# ADD_SUBDIRECTORY( writeMesh )
# ADD_SUBDIRECTORY( writeNIfTI )
# ADD_SUBDIRECTORY( writeTracts )
ADD_SUBDIRECTORY( exportGeometry )
ADD_SUBDIRECTORY( readMesh )
ADD_SUBDIRECTORY( readSphericalHarmonics )
ADD_SUBDIRECTORY( writeDendrogram )
ADD_SUBDIRECTORY( writeMesh )
ADD_SUBDIRECTORY( writeNIfTI )
ADD_SUBDIRECTORY( writeTracts )
# ADD_SUBDIRECTORY( applyMask )
# ADD_SUBDIRECTORY( arbitraryPlane )
# ADD_SUBDIRECTORY( atlasCreator )
# ADD_SUBDIRECTORY( atlasSurfaces )
# ADD_SUBDIRECTORY( calculateGFA )
# ADD_SUBDIRECTORY( clusterDisplay )
# ADD_SUBDIRECTORY( clusterDisplayVoxels )
# ADD_SUBDIRECTORY( clusterParamDisplay )
# ADD_SUBDIRECTORY( clusterSlicer )
# ADD_SUBDIRECTORY( contourTree )
# ADD_SUBDIRECTORY( datasetManipulator )
# ADD_SUBDIRECTORY( datasetProfile )
# ADD_SUBDIRECTORY( dataTypeConversion )
# ADD_SUBDIRECTORY( deterministicFTMori )
# ADD_SUBDIRECTORY( detTractClustering )
# ADD_SUBDIRECTORY( detTractCulling )
# ADD_SUBDIRECTORY( directVolumeRendering )
# ADD_SUBDIRECTORY( effectiveConnectivityCluster )
# ADD_SUBDIRECTORY( eigenSystem )
# ADD_SUBDIRECTORY( fiberDisplaySimple )
# ADD_SUBDIRECTORY( fiberParameterColoring )
# ADD_SUBDIRECTORY( fiberResampling )
# ADD_SUBDIRECTORY( fiberSelection )
# ADD_SUBDIRECTORY( fiberTransform )
# ADD_SUBDIRECTORY( gaussProcesses )
# ADD_SUBDIRECTORY( imageExtractor )
# ADD_SUBDIRECTORY( lineGuidedSlice )
# ADD_SUBDIRECTORY( probTractDisplay )
# ADD_SUBDIRECTORY( probTractDisplaySP )
# ADD_SUBDIRECTORY( scalarOperator )
# ADD_SUBDIRECTORY( scalarSegmentation )
# ADD_SUBDIRECTORY( splineSurface )
# ADD_SUBDIRECTORY( subtractDataSetScalar )
# ADD_SUBDIRECTORY( surfaceParameterAnimator )
# ADD_SUBDIRECTORY( textureMapper )
# ADD_SUBDIRECTORY( vectorOperator )
ADD_SUBDIRECTORY( applyMask )
ADD_SUBDIRECTORY( arbitraryPlane )
ADD_SUBDIRECTORY( atlasCreator )
ADD_SUBDIRECTORY( atlasSurfaces )
ADD_SUBDIRECTORY( calculateGFA )
ADD_SUBDIRECTORY( clusterDisplay )
ADD_SUBDIRECTORY( clusterDisplayVoxels )
ADD_SUBDIRECTORY( clusterParamDisplay )
ADD_SUBDIRECTORY( clusterSlicer )
ADD_SUBDIRECTORY( contourTree )
ADD_SUBDIRECTORY( datasetManipulator )
ADD_SUBDIRECTORY( datasetProfile )
ADD_SUBDIRECTORY( dataTypeConversion )
ADD_SUBDIRECTORY( deterministicFTMori )
ADD_SUBDIRECTORY( detTractClustering )
ADD_SUBDIRECTORY( detTractCulling )
ADD_SUBDIRECTORY( directVolumeRendering )
ADD_SUBDIRECTORY( effectiveConnectivityCluster )
ADD_SUBDIRECTORY( eigenSystem )
ADD_SUBDIRECTORY( fiberDisplaySimple )
ADD_SUBDIRECTORY( fiberParameterColoring )
ADD_SUBDIRECTORY( fiberResampling )
ADD_SUBDIRECTORY( fiberSelection )
ADD_SUBDIRECTORY( fiberTransform )
ADD_SUBDIRECTORY( gaussProcesses )
ADD_SUBDIRECTORY( imageExtractor )
ADD_SUBDIRECTORY( lineGuidedSlice )
ADD_SUBDIRECTORY( probTractDisplay )
ADD_SUBDIRECTORY( probTractDisplaySP )
ADD_SUBDIRECTORY( scalarOperator )
ADD_SUBDIRECTORY( scalarSegmentation )
ADD_SUBDIRECTORY( splineSurface )
ADD_SUBDIRECTORY( subtractDataSetScalar )
ADD_SUBDIRECTORY( surfaceParameterAnimator )
ADD_SUBDIRECTORY( textureMapper )
ADD_SUBDIRECTORY( vectorOperator )
IF( OPENCL_FOUND )
# ADD_SUBDIRECTORY( tensorGlyphs )
ADD_SUBDIRECTORY( tensorGlyphs )
ENDIF()
IF( Teem_FOUND )
IF( OSSIM_FOUND AND OW_USE_OSSIM )
# ADD_SUBDIRECTORY( bermanTracking )
ADD_SUBDIRECTORY( bermanTracking )
ENDIF()
# ADD_SUBDIRECTORY( teemGlyphs )
ADD_SUBDIRECTORY( teemGlyphs )
ENDIF()
IF( OSSIM_FOUND AND OW_USE_OSSIM )
# ADD_SUBDIRECTORY( calculateTensors )
# ADD_SUBDIRECTORY( HARDIToSphericalHarmonics )
ADD_SUBDIRECTORY( calculateTensors )
ADD_SUBDIRECTORY( HARDIToSphericalHarmonics )
ENDIF()
......@@ -724,7 +724,7 @@ void WMTeemGlyphs::GlyphGeneration::operator()( size_t id, size_t numThreads, WB
}
}
}
estimateNormalsAntipodal( glyph, normalize );
estimateNormalsAntipodal( glyph, normalizer );
WPosition_2 glyphPos = m_grid->getPosition( posId );
......@@ -743,7 +743,7 @@ void WMTeemGlyphs::GlyphGeneration::operator()( size_t id, size_t numThreads, WB
( *m_normals )[globalVertexId][0] = glyph->norm[3*vertId];
( *m_normals )[globalVertexId][1] = glyph->norm[3*vertId+1];
( *m_normals )[globalVertexId][2] = glyph->norm[3*vertId+2];
( *m_normals )[globalVertexId] = normalize( ( *m_normals )[globalVertexId] );
( *m_normals )[globalVertexId].normalize();
// ------------------------------------------------
// colors
......
......@@ -116,7 +116,7 @@ T opLength( const WVector3d_2& vec,
const WVector3d_2& /*my*/, const WVector3d_2& /*py*/,
const WVector3d_2& /*mz*/, const WVector3d_2& /*pz*/ )
{
return vec.length();
return length( vec );
}
template< typename T >
......
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