Merge pull request #1353 from danieldresser-ie/scatterVars

Support "primitiveVariables" argument to distributePoints

Author: johnhaddon

include/IECore/PointDistribution.h

@@ -84,7 +84,7 @@ class IECORE_API PointDistribution : public boost::noncopyable
 		///
 		/// pointEmitter is called for each point generated and must have the signature void( const Imath::V2f &pos ).
 		template<typename DensityFunction, typename PointFunction>
-		void operator () ( const Imath::Box2f &bounds, float density, DensityFunction &densitySampler, PointFunction &pointEmitter ) const;
+		void operator () ( const Imath::Box2f &bounds, float density, DensityFunction &&densitySampler, PointFunction &&pointEmitter ) const;
 		/// Variation on the function above for times when the density function isn't available to be evaluated on a point
 		/// by point basis - perhaps because it is best evaluated in SIMD (as the IECoreRI::SXRenderer would do).
 		///
@@ -94,7 +94,7 @@ class IECORE_API PointDistribution : public boost::noncopyable
 		/// densityThreshold allows for deferred rejection of the points using a density function evaluated later - if the density evaluated
 		/// is less than densityThreshold then that point should be rejected.
 		template<typename PointFunction>
-		void operator () ( const Imath::Box2f &bounds, float density, PointFunction &pointEmitter ) const;
+		void operator () ( const Imath::Box2f &bounds, float density, PointFunction &&pointEmitter ) const;
 
 		/// Returns a reference to a static PointDistribution which can be shared by anyone who needs one. This
 		/// distribution uses the tile set pointed to by the CORTEX_POINTDISTRIBUTION_TILESET environment variable.
@@ -108,10 +108,10 @@ class IECORE_API PointDistribution : public boost::noncopyable
 		struct DensityThresholdedEmitter;
 
 		template<typename PointFunction>
-		void processTile( const Tile &tile, const Imath::V2f &bottomLeft, const Imath::Box2f &bounds, float density, PointFunction &pointEmitter ) const;
+		void processTile( const Tile &tile, const Imath::V2f &bottomLeft, const Imath::Box2f &bounds, float density, PointFunction &&pointEmitter ) const;
 
 		template<typename PointFunction>
-		void recurseTile( const Tile &tile, const Imath::V2f &bottomLeft, unsigned level, const Imath::Box2f &bounds, float density, PointFunction &pointEmitter ) const;
+		void recurseTile( const Tile &tile, const Imath::V2f &bottomLeft, unsigned level, const Imath::Box2f &bounds, float density, PointFunction &&pointEmitter ) const;
 
 		typedef std::vector<Tile> TileVector;
 		TileVector m_tiles;

include/IECore/PointDistribution.inl

@@ -56,7 +56,7 @@ struct PointDistribution::Tile
 template<typename DensityFunction, typename PointFunction>
 struct PointDistribution::DensityThresholdedEmitter
 {
-	DensityThresholdedEmitter( DensityFunction &densitySampler, PointFunction &pointEmitter )
+	DensityThresholdedEmitter( DensityFunction &&densitySampler, PointFunction &&pointEmitter )
 		:	m_densitySampler( densitySampler ), m_pointEmitter( pointEmitter )
 	{
 	}
@@ -77,14 +77,14 @@ struct PointDistribution::DensityThresholdedEmitter
 };
 
 template<typename DensityFunction, typename PointFunction>
-void PointDistribution::operator () ( const Imath::Box2f &bounds, float density, DensityFunction &densitySampler, PointFunction &pointEmitter ) const
+void PointDistribution::operator () ( const Imath::Box2f &bounds, float density, DensityFunction &&densitySampler, PointFunction &&pointEmitter ) const
 {
 	DensityThresholdedEmitter<DensityFunction, PointFunction> thresholdedEmitter( densitySampler, pointEmitter );
 	(*this)( bounds, density, thresholdedEmitter );
 }
 
 template<typename PointFunction>
-void PointDistribution::operator () ( const Imath::Box2f &bounds, float density, PointFunction &pointEmitter ) const
+void PointDistribution::operator () ( const Imath::Box2f &bounds, float density, PointFunction &&pointEmitter ) const
 {
 	Imath::Box2i bi;
 	bi.min.x = fastFloatFloor( bounds.min.x );
@@ -117,7 +117,7 @@ void PointDistribution::operator () ( const Imath::Box2f &bounds, float density,
 }
 
 template<typename PointFunction>
-void PointDistribution::processTile( const Tile &tile, const Imath::V2f &bottomLeft, const Imath::Box2f &bounds, float density, PointFunction &pointEmitter ) const
+void PointDistribution::processTile( const Tile &tile, const Imath::V2f &bottomLeft, const Imath::Box2f &bounds, float density, PointFunction &&pointEmitter ) const
 {
 	unsigned potentialPoints = std::min( tile.points.size(), (size_t)density );
 	float factor = 1.0f / density;
@@ -136,7 +136,7 @@ void PointDistribution::processTile( const Tile &tile, const Imath::V2f &bottomL
 }
 
 template<typename PointFunction>
-void PointDistribution::recurseTile( const Tile &tile, const Imath::V2f &bottomLeft, unsigned level, const Imath::Box2f &bounds, float density, PointFunction &pointEmitter ) const
+void PointDistribution::recurseTile( const Tile &tile, const Imath::V2f &bottomLeft, unsigned level, const Imath::Box2f &bounds, float density, PointFunction &&pointEmitter ) const
 {
 	float tileSize = 1.0f / powf( (float)m_numSubTiles, (float)level );
 

include/IECore/TriangleAlgo.inl

@@ -77,30 +77,34 @@ Vec trianglePoint( const Vec &v0, const Vec &v1, const Vec &v2, const Imath::Vec
 
 /// Implementation derived from Wild Magic (Version 2) Software Library, available
 /// from http://www.geometrictools.com/Downloads/WildMagic2p5.zip under free license
+/// This link is now offline, but it was presumably similar to the code now found here:
+/// https://www.geometrictools.com/GTE/Mathematics/DistPointTriangle.h
+/// with explanation here:
+/// https://www.geometrictools.com/Documentation/DistancePoint3Triangle3.pdf
 template<class Vec>
 typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0, const Vec &v1, const Vec &v2, const Vec &p, Imath::Vec3<typename VectorTraits<Vec>::BaseType> &barycentric )
 {
 	typedef typename VectorTraits<Vec>::BaseType Real;
 
-	Vec triOrigin = v0;
 	Vec triEdge0, triEdge1;
 
+	// \todo - do we really need to support vector types that don't have a subtraction operator?
+	// This would be clearer if rewritten to use the operators on the types instead of these VectorOps,
+	// and more consistent with everything else we do.
 	vecSub( v1, v0, triEdge0 );
 	vecSub( v2, v0, triEdge1 );
 
 	Vec kDiff;
-	vecSub( triOrigin, p, kDiff );
+	vecSub( v0, p, kDiff );
 
 	Real a00 = vecDot( triEdge0, triEdge0 );
 	Real a01 = vecDot( triEdge0, triEdge1 );
 	Real a11 = vecDot( triEdge1, triEdge1 );
 	Real b0 = vecDot( kDiff, triEdge0 );
 	Real b1 = vecDot( kDiff, triEdge1 );
-	Real c = vecDot( kDiff, kDiff );
 	Real det = Real(fabs(a00*a11-a01*a01));
 	Real s = a01*b1-a11*b0;
 	Real t = a01*b0-a00*b1;
-	Real distSqrd;
 
 	if ( s + t <= det )
 	{
@@ -114,12 +118,10 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 					if ( -b0 >= a00 )
 					{
 						s = Real(1.0);
-						distSqrd = a00+Real(2.0)*b0+c;
 					}
 					else
 					{
 						s = -b0/a00;
-						distSqrd = b0*s+c;
 					}
 				}
 				else
@@ -128,17 +130,14 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 					if ( b1 >= Real(0.0) )
 					{
 						t = Real(0.0);
-						distSqrd = c;
 					}
 					else if ( -b1 >= a11 )
 					{
 						t = Real(1.0);
-						distSqrd = a11+Real(2.0)*b1+c;
 					}
 					else
 					{
 						t = -b1/a11;
-						distSqrd = b1*t+c;
 					}
 				}
 			}
@@ -148,17 +147,14 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 				if ( b1 >= Real(0.0) )
 				{
 					t = Real(0.0);
-					distSqrd = c;
 				}
 				else if ( -b1 >= a11 )
 				{
 					t = Real(1.0);
-					distSqrd = a11+Real(2.0)*b1+c;
 				}
 				else
 				{
 					t = -b1/a11;
-					distSqrd = b1*t+c;
 				}
 			}
 		}
@@ -168,17 +164,14 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 			if ( b0 >= Real(0.0) )
 			{
 				s = Real(0.0);
-				distSqrd = c;
 			}
 			else if ( -b0 >= a00 )
 			{
 				s = Real(1.0);
-				distSqrd = a00+Real(2.0)*b0+c;
 			}
 			else
 			{
 				s = -b0/a00;
-				distSqrd = b0*s+c;
 			}
 		}
 		else  // region 0
@@ -188,15 +181,12 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 			{
 				s = Real(0.0);
 				t = Real(0.0);
-				distSqrd = std::numeric_limits<Real>::max();
 			}
 			else
 			{
 				Real invDet = Real(1.0)/det;
 				s *= invDet;
 				t *= invDet;
-				distSqrd = s*(a00*s+a01*t+Real(2.0)*b0) +
-				           t*(a01*s+a11*t+Real(2.0)*b1)+c;
 			}
 		}
 	}
@@ -216,14 +206,11 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 				{
 					s = Real(1.0);
 					t = Real(0.0);
-					distSqrd = a00+Real(2.0)*b0+c;
 				}
 				else
 				{
 					s = numer/denom;
 					t = Real(1.0) - s;
-					distSqrd = s*(a00*s+a01*t+Real(2.0)*b0) +
-					           t*(a01*s+a11*t+Real(2.0)*b1)+c;
 				}
 			}
 			else
@@ -232,17 +219,14 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 				if ( tmp1 <= Real(0.0) )
 				{
 					t = Real(1.0);
-					distSqrd = a11+Real(2.0)*b1+c;
 				}
 				else if ( b1 >= Real(0.0) )
 				{
 					t = Real(0.0);
-					distSqrd = c;
 				}
 				else
 				{
 					t = -b1/a11;
-					distSqrd = b1*t+c;
 				}
 			}
 		}
@@ -258,14 +242,11 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 				{
 					t = Real(1.0);
 					s = Real(0.0);
-					distSqrd = a11+Real(2.0)*b1+c;
 				}
 				else
 				{
 					t = numer/denom;
 					s = Real(1.0) - t;
-					distSqrd = s*(a00*s+a01*t+Real(2.0)*b0) +
-					           t*(a01*s+a11*t+Real(2.0)*b1)+c;
 				}
 			}
 			else
@@ -274,17 +255,14 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 				if ( tmp1 <= Real(0.0) )
 				{
 					s = Real(1.0);
-					distSqrd = a00+Real(2.0)*b0+c;
 				}
 				else if ( b0 >= Real(0.0) )
 				{
 					s = Real(0.0);
-					distSqrd = c;
 				}
 				else
 				{
 					s = -b0/a00;
-					distSqrd = b0*s+c;
 				}
 			}
 		}
@@ -295,7 +273,6 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 			{
 				s = Real(0.0);
 				t = Real(1.0);
-				distSqrd = a11+Real(2.0)*b1+c;
 			}
 			else
 			{
@@ -304,14 +281,11 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 				{
 					s = Real(1.0);
 					t = Real(0.0);
-					distSqrd = a00+Real(2.0)*b0+c;
 				}
 				else
 				{
 					s = numer/denom;
 					t = Real(1.0) - s;
-					distSqrd = s*(a00*s+a01*t+Real(2.0)*b0) +
-					           t*(a01*s+a11*t+Real(2.0)*b1)+c;
 				}
 			}
 		}
@@ -321,7 +295,9 @@ typename VectorTraits<Vec>::BaseType triangleClosestBarycentric( const Vec &v0,
 	barycentric.z = t;
 	barycentric.x = 1 - s - t;
 
-	return Real(fabs(distSqrd));
+	Vec closest = vecAdd( vecAdd( v0, vecMul( triEdge0, s ) ), vecMul(triEdge1, t ) );
+	Vec diff = vecSub( closest, p );
+	return vecDot( diff, diff );
 }
 
 template<class Vec>
@@ -399,13 +375,13 @@ bool triangleContainsPoint( const Vec &v0, const Vec &v1, const Vec &v2, const V
 	Real d = Real( 1 ) / ( dotAA * dotBB - dotAB * dotAB );
 
 	barycentric.z = (dotBB * dotAC - dotAB * dotBC) * d;
-	if( barycentric.z < Real( 0 ) || barycentric.z > Real( 1 ) )
+	if( !( barycentric.z >= Real( 0 ) && barycentric.z <= Real( 1 ) ) )
 	{
 		return false;
 	}
 
 	barycentric.y = (dotAA * dotBC - dotAB * dotAC) * d;
-	if( barycentric.y < Real( 0 ) || barycentric.z + barycentric.y > Real( 1 ) )
+	if( !( barycentric.y >= Real( 0 ) && barycentric.z + barycentric.y <= Real( 1 ) ) )
 	{
 		return false;
 	}

include/IECoreScene/MeshAlgo.h

@@ -37,6 +37,7 @@
 
 #include "IECore/Canceller.h"
 #include "IECore/ImathHash.h"
+#include "IECore/StringAlgo.h"
 #include "IECoreScene/MeshPrimitive.h"
 #include "IECoreScene/PointsPrimitive.h"
 #include "IECoreScene/PrimitiveVariable.h"
@@ -94,7 +95,10 @@ IECORESCENE_API void reorderVertices( MeshPrimitive *mesh, int id0, int id1, int
 /// Distributes points over a mesh using an IECore::PointDistribution in UV space
 /// and mapping it to 3d space. It gives a fairly even distribution regardless of
 /// vertex spacing, provided the UVs are well layed out.
-IECORESCENE_API PointsPrimitivePtr distributePoints( const MeshPrimitive *mesh, float density = 100.0, const Imath::V2f &offset = Imath::V2f( 0 ), const std::string &densityMask = "density", const std::string &uvSet = "uv", const std::string &position = "P", const IECore::Canceller *canceller = nullptr );
+IECORESCENE_API PointsPrimitivePtr distributePoints( const MeshPrimitive *mesh, float density = 100.0, const Imath::V2f &offset = Imath::V2f( 0 ), const std::string &densityMask = "density", const std::string &uvSet = "uv", const std::string &refPosition = "P", const IECore::StringAlgo::MatchPattern &primitiveVariables = "", const IECore::Canceller *canceller = nullptr );
+
+// Deprecated signature without support for primitiveVariables
+IECORESCENE_API PointsPrimitivePtr distributePoints( const MeshPrimitive *mesh, float density = 100.0, const Imath::V2f &offset = Imath::V2f( 0 ), const std::string &densityMask = "density", const std::string &uvSet = "uv", const std::string &refPosition = "P", const IECore::Canceller *canceller = nullptr );
 
 
 /// Split the input mesh in to N meshes based on the N unique values contained in a segment primitive variable.