simplify: Fix C++ interface wrapper

Destination buffer should have target_index_count elements (unlike the baseline simplifier which needs index_count elements in the worst case).
vcer007 · Feb 10, 2019 · 70a80d0 · 70a80d0
1 parent 54e352a
commit 70a80d0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/demo/main.cpp b/demo/main.cpp
@@ -366,7 +366,7 @@ void simplify(const Mesh& mesh, float threshold = 0.2f)
 	size_t target_index_count = size_t(mesh.indices.size() * threshold);
 	float target_error = 1e-3f;
 
-	lod.indices.resize(mesh.indices.size());
+	lod.indices.resize(mesh.indices.size()); // note: simplify needs space for index_count elements in the destination array, not target_index_count
 	lod.indices.resize(meshopt_simplify(&lod.indices[0], &mesh.indices[0], mesh.indices.size(), &mesh.vertices[0].px, mesh.vertices.size(), sizeof(Vertex), target_index_count, target_error));
 
 	lod.vertices.resize(mesh.vertices.size());
@@ -387,7 +387,7 @@ void simplifySloppy(const Mesh& mesh, float threshold = 0.2f)
 
 	size_t target_index_count = size_t(mesh.indices.size() * threshold);
 
-	lod.indices.resize(mesh.indices.size());
+	lod.indices.resize(target_index_count);
 	lod.indices.resize(meshopt_simplifySloppy(&lod.indices[0], &mesh.indices[0], mesh.indices.size(), &mesh.vertices[0].px, mesh.vertices.size(), sizeof(Vertex), target_index_count));
 
 	lod.vertices.resize(mesh.vertices.size());

diff --git a/src/meshoptimizer.h b/src/meshoptimizer.h
@@ -548,7 +548,7 @@ template <typename T>
 inline size_t meshopt_simplifySloppy(T* destination, const T* indices, size_t index_count, const float* vertex_positions, size_t vertex_count, size_t vertex_positions_stride, size_t target_index_count)
 {
 	meshopt_IndexAdapter<T> in(0, indices, index_count);
-	meshopt_IndexAdapter<T> out(destination, 0, index_count);
+	meshopt_IndexAdapter<T> out(destination, 0, target_index_count);
 
 	return meshopt_simplifySloppy(out.data, in.data, index_count, vertex_positions, vertex_count, vertex_positions_stride, target_index_count);
 }

diff --git a/src/simplifier.cpp b/src/simplifier.cpp
@@ -859,8 +859,9 @@ struct CellHasher
 
 	size_t hash(unsigned int i) const
 	{
-		// MurmurHash2 finalizer
 		unsigned int h = vertex_ids[i];
+
+		// MurmurHash2 finalizer
 		h ^= h >> 13;
 		h *= 0x5bd1e995;
 		h ^= h >> 15;
@@ -881,6 +882,7 @@ struct TriangleHasher
 	{
 		const unsigned int* tri = indices + i * 3;
 
+		// Optimized Spatial Hashing for Collision Detection of Deformable Objects
 		return (tri[0] * 73856093) ^ (tri[1] * 19349663) ^ (tri[2] * 83492791);
 	}