Commit 447c42b1 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed documentation warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14209 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 0b9b7c01
......@@ -149,34 +149,35 @@ perpendicular( const VectorT<Scalar,3>& _v );
template<typename Vec>
bool
triangleIntersection( const Vec& _o,
const Vec& _dir,
const Vec& _v0,
const Vec& _v1,
const Vec& _v2,
typename Vec::value_type& _t,
typename Vec::value_type& _u,
typename Vec::value_type& _v );
const Vec& _dir,
const Vec& _v0,
const Vec& _v1,
const Vec& _v2,
typename Vec::value_type& _t,
typename Vec::value_type& _u,
typename Vec::value_type& _v );
/** \brief Intersect a ray and an axis aligned bounding box
*
* Computes the intersection point between a ray and an axis aligned bounding box
*
* @param _dir direction vector of the ray
* @param _o Origin of the ray
* @param _dir direction vector of the ray
* @param _bbmin lower left front corner of the bounding box
* @param _bbmax upper right back corner of the bounding box
* @param _t0 if there was an intersection, this value marks the entry point
* @param _t1 if there was an intersection, this value marks the exit point
* @return true if an intersection was found
* @return true if an intersection was found
*/
template<typename Vec>
bool
axisAlignedBBIntersection( const Vec& _o,
const Vec& _dir,
const Vec& _bbmin,
const Vec& _bbmax,
typename Vec::value_type& _t0,
typename Vec::value_type& _t1 );
const Vec& _dir,
const Vec& _bbmin,
const Vec& _bbmax,
typename Vec::value_type& _t0,
typename Vec::value_type& _t1 );
//== 2D STUFF =================================================================
......
......@@ -76,7 +76,7 @@ inline bool isNan(double x) {
template < typename VectorT , typename ValueT >
ValueT
getFullangle( VectorT _vector1 , VectorT _vector2 , const VectorT& _normal , bool& skip )
getFullangle( VectorT _vector1 , VectorT _vector2 , const VectorT& _normal , bool& _skip )
{
//Project vectors into tangent plane defined by _normal
_vector1 = _vector1 - _normal * ( _vector1 | _normal );
......@@ -101,7 +101,7 @@ getFullangle( VectorT _vector1 , VectorT _vector2 , const VectorT& _normal , boo
double angle = acos(sp);
// catch some possible nans
skip = ( isNan(right) || isNan(angle) ) ;
_skip = ( isNan(right) || isNan(angle) ) ;
if ( right < 0 ) {
angle = 2 * M_PI - angle;
......
......@@ -73,7 +73,7 @@ namespace Geometry {
@param _vector1 vector pointing away from center, angle = 0
@param _vector2 vector for which the angle should be calculated
@param _normal the normal used to compute if vector2 is left or right of vecor1
@param _skip Flag to catch nan. If true nan occured and value should not be used
@param _skip Flag to catch nan. If true nan occurred and value should not be used
@return the angle (0 .. 2 * PI)
*/
template < typename VectorT , typename ValueT >
......@@ -81,7 +81,7 @@ ValueT
getFullangle( VectorT _vector1,
VectorT _vector2,
const VectorT& _normal,
bool& skip );
bool& _skip );
/** Calculate the difference between two angles ( minimum distance )
......
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