- fix

Author: janbender

SPlisHSPlasH/Utilities/SDFFunctions.cpp

@@ -66,7 +66,7 @@ Discregrid::CubicLagrangeDiscreteGrid* SDFFunctions::generateSDF(const unsigned
 	Discregrid::TriangleMesh sdfMesh(&doubleVec[0], faces, numVertices, numFaces);
 #endif
 
-	Discregrid::MeshDistance md(sdfMesh);
+	Discregrid::TriangleMeshDistance md(sdfMesh);
 	Eigen::AlignedBox3d domain;
 	domain.extend(bbox.min().cast<double>());
 	domain.extend(bbox.max().cast<double>());
@@ -78,7 +78,7 @@ Discregrid::CubicLagrangeDiscreteGrid* SDFFunctions::generateSDF(const unsigned
 	Real factor = 1.0;
 	if (invert)
 		factor = -1.0;
-	func = [&md,&factor](Eigen::Vector3d const& xi) {return factor * md.signedDistanceCached(xi); };
+	func = [&md,&factor](Eigen::Vector3d const& xi) {return factor * md.signed_distance(xi).distance; };
 
 	distanceField->addFunction(func, false);
 	STOP_TIMING_PRINT;

Simulator/PositionBasedDynamicsWrapper/PBDWrapper.cpp

@@ -267,7 +267,7 @@ void PBDWrapper::readScene(const std::string &sceneFileName, const std::vector<
 								doubleVec[3 * i + j] = vd.getPosition(i)[j];
 						Discregrid::TriangleMesh sdfMesh(&doubleVec[0], faces.data(), vd.size(), nFaces);
 #endif
-						Discregrid::MeshDistance md(sdfMesh);
+						Discregrid::TriangleMeshDistance md(sdfMesh);
 						Eigen::AlignedBox3d domain;
 						for (auto const& x : sdfMesh.vertices())
 						{
@@ -279,7 +279,7 @@ void PBDWrapper::readScene(const std::string &sceneFileName, const std::vector<
 						LOG_INFO << "Set SDF resolution: " << rbd.m_resolutionSDF[0] << ", " << rbd.m_resolutionSDF[1] << ", " << rbd.m_resolutionSDF[2];
 						distanceFields[sdfFileName] = std::make_shared<PBD::CubicSDFCollisionDetection::Grid>(domain, std::array<unsigned int, 3>({ rbd.m_resolutionSDF[0], rbd.m_resolutionSDF[1], rbd.m_resolutionSDF[2] }));
 						auto func = Discregrid::DiscreteGrid::ContinuousFunction{};
-						func = [&md](Eigen::Vector3d const& xi) {return md.signedDistanceCached(xi); };
+						func = [&md](Eigen::Vector3d const& xi) {return md.signed_distance(xi).distance; };
 						LOG_INFO << "Generate SDF for " << rbd.m_modelFile;
 						distanceFields[sdfFileName]->addFunction(func, true);
 						if (Utilities::FileSystem::makeDir(cachePath) == 0)

Simulator/SimulatorBase.cpp

@@ -2391,7 +2391,7 @@ void SimulatorBase::initDensityMap(std::vector<Vector3r> &x, std::vector<unsigne
 		Discregrid::TriangleMesh sdfMesh(&doubleVec[0], faces.data(), x.size(), faces.size() / 3);
 #endif
 
-		Discregrid::MeshDistance md(sdfMesh);
+		Discregrid::TriangleMeshDistance md(sdfMesh);
 		Eigen::AlignedBox3d domain;
 		for (auto const& x_ : x)
 		{
@@ -2411,7 +2411,7 @@ void SimulatorBase::initDensityMap(std::vector<Vector3r> &x, std::vector<unsigne
 		Real sign = 1.0;
 		if (boundaryData->mapInvert)
 			sign = -1.0;
-		func = [&md, &sign, &tolerance](Eigen::Vector3d const& xi) {return sign * (md.signedDistanceCached(xi) - tolerance); };
+		func = [&md, &sign, &tolerance](Eigen::Vector3d const& xi) {return sign * (md.signed_distance(xi).distance - tolerance); }; 
 
 		LOG_INFO << "Generate SDF";
 		START_TIMING("SDF Construction");
@@ -2579,7 +2579,7 @@ void SimulatorBase::initVolumeMap(std::vector<Vector3r> &x, std::vector<unsigned
 		Discregrid::TriangleMesh sdfMesh(&doubleVec[0], faces.data(), x.size(), faces.size() / 3);
 #endif
 
-		Discregrid::MeshDistance md(sdfMesh);
+		Discregrid::TriangleMeshDistance md(sdfMesh);
 		Eigen::AlignedBox3d domain;
 		for (auto const& x_ : x)
 		{
@@ -2603,7 +2603,7 @@ void SimulatorBase::initVolumeMap(std::vector<Vector3r> &x, std::vector<unsigned
 			sign = -1.0;
 		const Real particleRadius = sim->getParticleRadius();
 		// subtract 0.5 * particle radius to prevent penetration of particles and the boundary
-		func = [&md, &sign, &tolerance, &particleRadius](Eigen::Vector3d const& xi) {return sign * (md.signedDistanceCached(xi) - tolerance ); };
+		func = [&md, &sign, &tolerance, &particleRadius](Eigen::Vector3d const& xi) {return sign * (md.signed_distance(xi).distance - tolerance ); };
 
 		LOG_INFO << "Generate SDF";
 		START_TIMING("SDF Construction");

Tools/VolumeSampling/SamplingBase.cpp

@@ -334,7 +334,7 @@ void SamplingBase::generateSDF(SPH::TriangleMesh& mesh)
 	Discregrid::TriangleMesh sdfMesh(&doubleVec[0], mesh.getFaces().data(), mesh.numVertices(), mesh.numFaces());
 #endif
 
-	Discregrid::MeshDistance md(sdfMesh);
+	Discregrid::TriangleMeshDistance md(sdfMesh);
 	Eigen::AlignedBox3d domain;
 	domain.extend(m_bbmin.cast<double>());
 	domain.extend(m_bbmax.cast<double>());
@@ -347,9 +347,9 @@ void SamplingBase::generateSDF(SPH::TriangleMesh& mesh)
 
 	// invert the distance field since the particles should stay inside
 	if (!m_invert)
-		func = [&md](Eigen::Vector3d const& xi) {return -md.signedDistanceCached(xi); };
+		func = [&md](Eigen::Vector3d const& xi) {return -md.signed_distance(xi).distance; };
 	else
-		func = [&md](Eigen::Vector3d const& xi) {return md.signedDistanceCached(xi); };
+		func = [&md](Eigen::Vector3d const& xi) {return md.signed_distance(xi).distance; };
 
 	LOG_INFO << "Generate SDF";
 	m_distanceField->addFunction(func, false);

Tools/VolumeSampling/main.cpp

@@ -418,7 +418,7 @@ void generateSDF(SPH::TriangleMesh &mesh)
 	Discregrid::TriangleMesh sdfMesh(&doubleVec[0], mesh.getFaces().data(), mesh.numVertices(), mesh.numFaces());
 #endif
 
-	Discregrid::MeshDistance md(sdfMesh);
+	Discregrid::TriangleMeshDistance md(sdfMesh);
 	Eigen::AlignedBox3d domain;
 	domain.extend(bbmin.cast<double>());
 	domain.extend(bbmax.cast<double>());
@@ -432,7 +432,7 @@ void generateSDF(SPH::TriangleMesh &mesh)
 	auto func = Discregrid::DiscreteGrid::ContinuousFunction{};
 
 	// invert the distance field since the particles should stay inside
-	func = [&md](Eigen::Vector3d const& xi) {return -md.signedDistanceCached(xi); };
+	func = [&md](Eigen::Vector3d const& xi) {return -md.signed_distance(xi).distance; };
 
 	LOG_INFO << "Generate SDF";
 	distanceField->addFunction(func, false);