Commit b8351def authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[DOC][STYLE]

parent fcacc102
......@@ -379,7 +379,8 @@ osg::ref_ptr< osg::Node > WMFiberDisplaySimple::createFiberGeode( boost::shared_
osg::Vec4 color = osg::Vec4( fibColors->at( ( fibColorMode * k ) + csidx + ( 0 % fibColorMode ) ),
fibColors->at( ( fibColorMode * k ) + csidx + ( 1 % fibColorMode ) ),
fibColors->at( ( fibColorMode * k ) + csidx + ( 2 % fibColorMode ) ),
( fibColorMode == WDataSetFibers::ColorScheme::RGBA ) ? fibColors->at( ( fibColorMode * k ) + csidx + ( 3 % fibColorMode ) ) : 1.0 );
( fibColorMode == WDataSetFibers::ColorScheme::RGBA ) ?
fibColors->at( ( fibColorMode * k ) + csidx + ( 3 % fibColorMode ) ) : 1.0 );
osg::Vec3 tangent = osg::Vec3( fibTangents->at( ( 3 * k ) + sidx ),
fibTangents->at( ( 3 * k ) + sidx + 1 ),
fibTangents->at( ( 3 * k ) + sidx + 2 ) );
......@@ -401,7 +402,6 @@ osg::ref_ptr< osg::Node > WMFiberDisplaySimple::createFiberGeode( boost::shared_
texcoords->push_back( 1.0 );
texcoords->push_back( -1.0 );
}
}
// add the above line-strip
......
......@@ -191,10 +191,11 @@ private:
/**
* Creates a geode containing the fiber geometry
*
* \param fibers the fiber dataset to render
*
* \return the geode
*/
osg::ref_ptr< osg::Node > createFiberGeode( boost::shared_ptr< WDataSetFibers > fibers ) const;
};
#endif // WMFIBERDISPLAYSIMPLE_H
......
......@@ -127,7 +127,7 @@ void main()
// with the tangent and the view vector we got the offset vector. We can noch get the normal using the tangent and the offset.
v_normal = cross( offset, tangent );
v_normal *= sign( dot( v_normal, vec3(0.0, 0.0, 1.0 ) ) );
v_normal *= sign( dot( v_normal, vec3( 0.0, 0.0, 1.0 ) ) );
#endif // ( defined ILLUMINATION_ENABLED || defined TUBE_ENABLED )
// Simply project the vertex afterwards
......
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