Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix : example 42 #2769

Merged
merged 1 commit into from
Apr 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions examples/42-bunnylod/bunnylod.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion examples/42-bunnylod/progmesh.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down