From 688b5f42e9bfe498d7af7075d4d8f4429867f3a3 Mon Sep 17 00:00:00 2001
From: Miles Macklin <miles.macklin@gmail.com>
Date: Fri, 9 Jun 2017 13:41:15 +1200
Subject: 1.2.0.beta.1

---
 extensions/flexExtRigid.cpp | 51 +++++++++++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 13 deletions(-)

(limited to 'extensions/flexExtRigid.cpp')

diff --git a/extensions/flexExtRigid.cpp b/extensions/flexExtRigid.cpp
index 9c37c28..897d009 100644
--- a/extensions/flexExtRigid.cpp
+++ b/extensions/flexExtRigid.cpp
@@ -68,11 +68,26 @@ Vec3 SampleSDFGrad(const float* sdf, int dim, int x, int y, int z)
 
 NvFlexExtAsset* NvFlexExtCreateRigidFromMesh(const float* vertices, int numVertices, const int* indices, int numTriangleIndices, float spacing, float expand)
 {
+	// Switch to relative coordinates by computing the mean position of the vertices and subtracting the result from every vertex position
+	// The increased precision will prevent ghost forces caused by inaccurate center of mass computations
+	Vec3 meshOffset(0.0f);
+	for (int i = 0; i < numVertices; i++)
+	{
+		meshOffset += ((Vec3*)vertices)[i];
+	}
+	meshOffset /= float(numVertices);
+
+	Vec3* relativeVertices = new Vec3[numVertices];
+	for (int i = 0; i < numVertices; i++)
+	{
+		relativeVertices[i] += ((Vec3*)vertices)[i] - meshOffset;
+	}
+
 	std::vector<Vec4> particles;
 	std::vector<Vec4> normals;
 	std::vector<int> phases;
 
-	const Vec3* positions = (Vec3*)vertices;
+	const Vec3* positions = relativeVertices;
 
 	Vec3 meshLower(FLT_MAX), meshUpper(-FLT_MAX);
 	for (int i=0; i < numVertices; ++i)
@@ -105,11 +120,11 @@ NvFlexExtAsset* NvFlexExtCreateRigidFromMesh(const float* vertices, int numVerti
 	// lie symmetrically to the center of the object. this reduces the 
 	// chance of missing features, and also better aligns the particles
 	// with the mesh
-	Vec3 meshOffset;
-	meshOffset.x = 0.5f * (spacing - (edges.x - (dx-1)*spacing));
-	meshOffset.y = 0.5f * (spacing - (edges.y - (dy-1)*spacing));
-	meshOffset.z = 0.5f * (spacing - (edges.z - (dz-1)*spacing));
-	meshLower -= meshOffset;
+	Vec3 meshShift;
+	meshShift.x = 0.5f * (spacing - (edges.x - (dx-1)*spacing));
+	meshShift.y = 0.5f * (spacing - (edges.y - (dy-1)*spacing));
+	meshShift.z = 0.5f * (spacing - (edges.z - (dz-1)*spacing));
+	meshLower -= meshShift;
 
 	// don't allow samplings with > 64 per-side	
 	if (maxDim > 64)
@@ -117,7 +132,9 @@ NvFlexExtAsset* NvFlexExtCreateRigidFromMesh(const float* vertices, int numVerti
 
 	std::vector<uint32_t> voxels(maxDim*maxDim*maxDim);
 
-	Voxelize(vertices, numVertices, indices, numTriangleIndices, maxDim, maxDim, maxDim, &voxels[0], meshLower, meshLower + Vec3(maxDim*spacing));
+	Voxelize(relativeVertices, numVertices, indices, numTriangleIndices, maxDim, maxDim, maxDim, &voxels[0], meshLower, meshLower + Vec3(maxDim*spacing));
+
+	delete[] relativeVertices;
 
 	std::vector<float> sdf(maxDim*maxDim*maxDim);
 	MakeSDF(&voxels[0], maxDim, maxDim, maxDim, &sdf[0]);
@@ -153,23 +170,27 @@ NvFlexExtAsset* NvFlexExtCreateRigidFromMesh(const float* vertices, int numVerti
 			}
 		}
 	}
+	const int numParticles = int(particles.size());
+
+	// Switch back to absolute coordinates by adding meshOffset to the center of mass and to each particle positions
+	center /= float(numParticles);
+	center += meshOffset;
+
+	for (int i = 0; i < numParticles; i++) {
+		particles[i] += Vec4(meshOffset, 0.0f);
+	}
 
 	NvFlexExtAsset* asset = new NvFlexExtAsset();
 	memset(asset, 0, sizeof(*asset));
 
-	if (particles.size())
+	if (numParticles)
 	{
-		const int numParticles = int(particles.size());
-
 		asset->numParticles = numParticles;
 		asset->maxParticles = numParticles;
 
 		asset->particles = new float[numParticles*4];
 		memcpy(asset->particles, &particles[0], sizeof(Vec4)*numParticles);
 
-		// store center of mass
-		center /= float(numParticles);
-
 		asset->numShapes = 1;
 		asset->numShapeIndices = numParticles;
 		
@@ -179,11 +200,15 @@ NvFlexExtAsset* NvFlexExtCreateRigidFromMesh(const float* vertices, int numVerti
 		for (int i = 0; i < numParticles; ++i)
 			asset->shapeIndices[i] = i;
 
+		// store center of mass
 		asset->shapeCenters = new float[4];
 		asset->shapeCenters[0] = center.x;
 		asset->shapeCenters[1] = center.y;
 		asset->shapeCenters[2] = center.z;
 
+		asset->shapePlasticThresholds = NULL;
+		asset->shapePlasticCreeps = NULL;
+
 		asset->shapeCoefficients = new float[1];
 		asset->shapeCoefficients[0] = 1.0f;
 
-- 
cgit v1.2.3