mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix : weldVert and array_push (#2769)

Browse Source
This commit is contained in:
云风 2022-04-15 22:22:43 +08:00 committed by GitHub
parent c084dd2616
commit cae7c83f89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
examples/42-bunnylod/bunnylod.cpp
View File

@ -65,19 +65,29 @@ public:
} }
} }
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) 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); const bgfx::Memory* mem = bgfx::alloc(_stride * _numMerged);
uint32_t target = 0;
for (uint32_t ii = 0; ii < _num; ++ii) for (uint32_t ii = 0; ii < _num; ++ii)
{ {
if (_indices[ii] == target) bx::memCopy(mem->data + _indices[ii]*_stride, _vb + ii*_stride, _stride);
{
bx::memCopy(mem->data + target*_stride, _vb + ii*_stride, _stride);
++target;
}
} }
return mem; return mem;
@ -143,6 +153,7 @@ public:
m_cacheWeld = (uint32_t*)BX_ALLOC(entry::getAllocator(), numVertices * sizeof(uint32_t) ); 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); m_totalVertices = bgfx::weldVertices(m_cacheWeld, _mesh->m_layout, vbData, numVertices, true, 0.00001f);
mergeIndices(m_cacheWeld, numVertices);
} }
const bgfx::Memory* vb = mergeVertices( const bgfx::Memory* vb = mergeVertices(

3
examples/42-bunnylod/progmesh.c
View File

@ -138,7 +138,8 @@ static void
array_push(struct array *a, int v) { array_push(struct array *a, int v) {
if (a->n >= a->cap) { if (a->n >= a->cap) {
int *old = a->buffer; 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; int i;
for (i=0;i<a->n;i++) { for (i=0;i<a->n;i++) {
a->buffer[i] = old[i]; a->buffer[i] = old[i];