bugfix : weldVert and array_push (bkaradzic#2769)

mipek · Mar 2, 2024 · d56b608 · d56b608
1 parent fa64f5c
commit d56b608
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/examples/42-bunnylod/bunnylod.cpp b/examples/42-bunnylod/bunnylod.cpp
@@ -65,19 +65,29 @@ class ExampleBunnyLOD : public entry::AppI
 		}
 	}
 
+	static void mergeIndices(uint32_t* _indices, uint32_t _num)
+	{
+		uint32_t target = 0;
+		for (uint32_t i = 0; i < _num; i++) {
+			uint32_t map = _indices[i];
+			while (_indices[map] != map)
+				map = _indices[map];
+			if (i != map) {
+				_indices[i] = map;
+			} else {
+				_indices[i] = target;
+				++target;
+			}
+		}
+	}
+
 	static const bgfx::Memory* mergeVertices(const uint8_t* _vb, uint16_t _stride, const uint32_t* _indices, uint32_t _num, uint32_t _numMerged)
 	{
 		const bgfx::Memory* mem = bgfx::alloc(_stride * _numMerged);
 
-		uint32_t target = 0;
-
 		for (uint32_t ii = 0; ii < _num; ++ii)
 		{
-			if (_indices[ii] == target)
-			{
-				bx::memCopy(mem->data + target*_stride, _vb + ii*_stride, _stride);
-				++target;
-			}
+			bx::memCopy(mem->data + _indices[ii]*_stride, _vb + ii*_stride, _stride);
 		}
 
 		return mem;
@@ -143,6 +153,7 @@ class ExampleBunnyLOD : public entry::AppI
 			m_cacheWeld = (uint32_t*)BX_ALLOC(entry::getAllocator(), numVertices * sizeof(uint32_t) );
 
 			m_totalVertices	= bgfx::weldVertices(m_cacheWeld, _mesh->m_layout, vbData, numVertices, true, 0.00001f);
+			mergeIndices(m_cacheWeld, numVertices);
 		}
 
 		const bgfx::Memory* vb = mergeVertices(

diff --git a/examples/42-bunnylod/progmesh.c b/examples/42-bunnylod/progmesh.c
@@ -138,7 +138,8 @@ static void
 array_push(struct array *a, int v) {
 	if (a->n >= a->cap) {
 		int *old = a->buffer;
-		a->buffer = (int *)malloc(a->cap * 2 * sizeof(int));
+		a->cap *= 2;
+		a->buffer = (int *)malloc(a->cap * sizeof(int));
 		int i;
 		for (i=0;i<a->n;i++) {
 			a->buffer[i] = old[i];