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

Make OpenFlipper build with xcode 4.3. refs #465

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14010 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 94220c3b
......@@ -249,6 +249,16 @@ distPointLineSquared( const Vec& _p,
const Vec& _v1,
Vec* _min_v=0);
/// squared distance from point _p to triangle (_v0, _v1, _v2)
template <class Vec>
typename Vec::value_type
distPointTriangleSquared( const Vec& _p,
const Vec& _v0,
const Vec& _v1,
const Vec& _v2,
Vec& _nearestPoint );
/// distance from point _p to triangle (_v0, _v1, _v2)
template <class Vec>
typename Vec::value_type
......@@ -259,16 +269,6 @@ distPointTriangle( const Vec& _p,
Vec& _nearestPoint )
{ return sqrt(distPointTriangleSquared(_p, _v0, _v1, _v2, _nearestPoint)); }
/// squared distance from point _p to triangle (_v0, _v1, _v2)
template <class Vec>
typename Vec::value_type
distPointTriangleSquared( const Vec& _p,
const Vec& _v0,
const Vec& _v1,
const Vec& _v2,
Vec& _nearestPoint );
/** \brief Checks the distance from a point to a plane
*
*
......@@ -491,6 +491,16 @@ int isObtuse(const VectorT& _p0,
//===========================================================================
/** \brief return squared area of triangle (_v0, _v1, _v2)
*
*/
template <class Vec>
typename Vec::value_type
triangleAreaSquared( const Vec& _v0,
const Vec& _v1,
const Vec& _v2 );
/** \brief return area of triangle (_v0, _v1, _v2)
*
*/
......@@ -504,17 +514,6 @@ triangleArea( const Vec& _v0,
}
/** \brief return squared area of triangle (_v0, _v1, _v2)
*
*/
template <class Vec>
typename Vec::value_type
triangleAreaSquared( const Vec& _v0,
const Vec& _v1,
const Vec& _v2 );
/** \brief return aspect ratio (length/height) of triangle
*
*/
......
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