- bugfix

Author: janbender

Demos/SceneLoaderDemo/SceneLoaderDemo.cpp

@@ -468,8 +468,8 @@ CubicSDFCollisionDetection::GridPtr generateSDF(const std::string &modelFile, co
 			{
 				domain.extend(x);
 			}
-			domain.max() += 1.0e-3 * domain.diagonal().norm() * Eigen::Vector3d::Ones();
-			domain.min() -= 1.0e-3 * domain.diagonal().norm() * Eigen::Vector3d::Ones();
+			domain.max() += 0.1 * Eigen::Vector3d::Ones();
+			domain.min() -= 0.1 * Eigen::Vector3d::Ones();
 
 			LOG_INFO << "Set SDF resolution: " << resolutionSDF[0] << ", " << resolutionSDF[1] << ", " << resolutionSDF[2];
 			distanceField = std::make_shared<CubicSDFCollisionDetection::Grid>(domain, std::array<unsigned int, 3>({ resolutionSDF[0], resolutionSDF[1], resolutionSDF[2] }));
@@ -626,8 +626,8 @@ void readScene(const bool readFile)
 						{
 							domain.extend(x);
 						}
-						domain.max() += 1.0e-3 * domain.diagonal().norm() * Eigen::Vector3d::Ones();
-						domain.min() -= 1.0e-3 * domain.diagonal().norm() * Eigen::Vector3d::Ones();
+						domain.max() += 0.1 * Eigen::Vector3d::Ones();
+						domain.min() -= 0.1 * Eigen::Vector3d::Ones();
 
 						LOG_INFO << "Set SDF resolution: " << rbd.m_resolutionSDF[0] << ", " << rbd.m_resolutionSDF[1] << ", " << rbd.m_resolutionSDF[2];
 						distanceFields[sdfFileName] = std::make_shared<CubicSDFCollisionDetection::Grid>(domain, std::array<unsigned int, 3>({ rbd.m_resolutionSDF[0], rbd.m_resolutionSDF[1], rbd.m_resolutionSDF[2] }));

Demos/StiffRodsDemos/DirectPositionBasedSolverForStiffRodsDemo.cpp

@@ -506,8 +506,8 @@ CubicSDFCollisionDetection::GridPtr generateSDF(const std::string &modelFile, co
 			{
 				domain.extend(x);
 			}
-			domain.max() += 1.0e-3 * domain.diagonal().norm() * Eigen::Vector3d::Ones();
-			domain.min() -= 1.0e-3 * domain.diagonal().norm() * Eigen::Vector3d::Ones();
+			domain.max() += 0.1 * Eigen::Vector3d::Ones();
+			domain.min() -= 0.1 * Eigen::Vector3d::Ones();
 
 			LOG_INFO << "Set SDF resolution: " << resolutionSDF[0] << ", " << resolutionSDF[1] << ", " << resolutionSDF[2];
 			distanceField = std::make_shared<CubicSDFCollisionDetection::Grid>(domain, std::array<unsigned int, 3>({ resolutionSDF[0], resolutionSDF[1], resolutionSDF[2] }));
@@ -665,8 +665,8 @@ void readScene()
 						{
 							domain.extend(x);
 						}
-						domain.max() += 1.0e-3 * domain.diagonal().norm() * Eigen::Vector3d::Ones();
-						domain.min() -= 1.0e-3 * domain.diagonal().norm() * Eigen::Vector3d::Ones();
+						domain.max() += 0.1 * Eigen::Vector3d::Ones();
+						domain.min() -= 0.1 * Eigen::Vector3d::Ones();
 
 						LOG_INFO << "Set SDF resolution: " << rbd.m_resolutionSDF[0] << ", " << rbd.m_resolutionSDF[1] << ", " << rbd.m_resolutionSDF[2];
 						distanceFields[sdfFileName] = std::make_shared<CubicSDFCollisionDetection::Grid>(domain, std::array<unsigned int, 3>({ rbd.m_resolutionSDF[0], rbd.m_resolutionSDF[1], rbd.m_resolutionSDF[2] }));

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = PositionBasedDynamics
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.6.0
+PROJECT_NUMBER         = 1.7.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Simulation/CubicSDFCollisionDetection.cpp

@@ -32,6 +32,7 @@ void CubicSDFCollisionDetection::addCubicSDFCollisionObject(const unsigned int b
  	co->m_bvh.init(vertices, numVertices);
  	co->m_bvh.construct();
 	co->m_testMesh = testMesh;
+	co->m_invertSDF = 1.0;
 	if (invertSDF)
 		co->m_invertSDF = -1.0;
 	m_collisionObjects.push_back(co);
@@ -48,6 +49,7 @@ void PBD::CubicSDFCollisionDetection::addCubicSDFCollisionObject(const unsigned
 	co->m_bvh.init(vertices, numVertices);
 	co->m_bvh.construct();
 	co->m_testMesh = testMesh;
+	co->m_invertSDF = 1.0;
 	if (invertSDF)
 		co->m_invertSDF = -1.0;
 	m_collisionObjects.push_back(co);