diff options
| author | Dennis E. Hamilton <[email protected]> | 2023-10-09 00:49:58 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-09 09:49:58 +0200 |
| commit | 7ab911b9a4fb0ba3798bb8f117e69475a4fb89bc (patch) | |
| tree | 28b453cfc09d79051af22ad630d2b72cd0b7aec2 /src/rmodels.c | |
| parent | d309b1eaa7712dc0d15431bfb6efc0508e6ecbc8 (diff) | |
| download | raylib-7ab911b9a4fb0ba3798bb8f117e69475a4fb89bc.tar.gz raylib-7ab911b9a4fb0ba3798bb8f117e69475a4fb89bc.zip | |
Ensure m3d faces in non-decreasing materialid sequence (#3385)
This modification replaces the expensive qsort protection with an
insertion sort that is near-instantaneous in the expected ordered case.
Diffstat (limited to 'src/rmodels.c')
| -rw-r--r-- | src/rmodels.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/rmodels.c b/src/rmodels.c index 490eac55..77c89b6e 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -5614,19 +5614,26 @@ static Model LoadM3D(const char *fileName) // We always need a default material, so we add +1 model.materialCount++; - // WARNING: Sorting is not needed, valid M3D model files should already be sorted - // faces should already by grouped by material - // Just keeping the sorting function for reference (Check PR #3363) - /* - static int m3d_compare_faces(const void *a, const void *b) + // Faces must be in non-decreasing materialid order + // Verify that quickly, sorting them otherwise. + for (i = 1; i < m3d->numface; i++) { - m3df_t *fa = (m3df_t *)a; - m3df_t *fb = (m3df_t *)b; - return (fa->materialid - fb->materialid); + if ( m3d->face[i-1].materialid <= m3d->face[i].materialid ) + continue; + + // face[i-1] > face[i]. slide face[i] lower. + m3df_t slider = m3d->face[i]; + j = i-1; + + do + { // face[j] > slider, face[j+1] is svailable vacant gap. + m3d->face[j+1] = m3d->face[j]; + j = j-1; + } + while (j >= 0 && m3d->face[j].materialid > slider.materialid); + + m3d->face[j+1] = slider; } - - qsort(m3d->face, m3d->numface, sizeof(m3df_t), m3d_compare_faces); - */ model.meshes = (Mesh *)RL_CALLOC(model.meshCount, sizeof(Mesh)); model.meshMaterial = (int *)RL_CALLOC(model.meshCount, sizeof(int)); |
