diff options
| author | Laurentino Luna <[email protected]> | 2021-10-03 07:11:20 -0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-03 12:11:20 +0200 |
| commit | 9fce26bb068dc327735d0cdba35b8ef011a7b815 (patch) | |
| tree | f0ff7456d490e1a8674dfe1c967bab92b706fe94 /src/rmodels.c | |
| parent | f869229b7ff187a5f18feb0ba82e7e80c9c98a7b (diff) | |
| download | raylib-9fce26bb068dc327735d0cdba35b8ef011a7b815.tar.gz raylib-9fce26bb068dc327735d0cdba35b8ef011a7b815.zip | |
Supress most warnings on rmodels.c (#2029)
* Supress most warnings on rmodels.c
NOTE: unused symbols have been deleted and the following report will show in what location they were previously.
Unused symbols:
- ArrayInt - vox_loader.h: line 84
- initArrayInt - vox_loader.h: line 168
- insertArrayInt - vox_loader.h: line 175
- freeArrayInt - vox_loader.h: line 186
- offsetX, offsetY, offsetZ - vox_loader.h: line 610
- chunkTotalChildSize - vox_loader.h: line 623
Other warnings:
- initialization discards 'const' qualifier - vox_loader.h: line 572
- incompatible types for VoxVector3 and Vector3 - rmodels.c: line 5748
- incompatible types for VoxColor and Color - rmodels: line 5749
* Remove ToVector3 and ToColor functions and assign values directly
Diffstat (limited to 'src/rmodels.c')
| -rw-r--r-- | src/rmodels.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/rmodels.c b/src/rmodels.c index 8ccd26b5..11778901 100644 --- a/src/rmodels.c +++ b/src/rmodels.c @@ -5745,8 +5745,18 @@ static Model LoadVOX(const char *fileName) int verticesRemain = voxarray.vertices.used; int verticesMax = 65532; // 5461 voxels x 12 vertices per voxel -> 65532 (must be inf 65536) - Vector3 *pvertices = voxarray.vertices.array; // 6*4 = 12 vertices per voxel - Color *pcolors = voxarray.colors.array; + // 6*4 = 12 vertices per voxel + Vector3 *pvertices = { 0 }; + pvertices->x = voxarray.vertices.array->x; + pvertices->y = voxarray.vertices.array->y; + pvertices->z = voxarray.vertices.array->z; + + Color *pcolors = { 0 }; + pcolors->r = voxarray.colors.array->r; + pcolors->g = voxarray.colors.array->g; + pcolors->b = voxarray.colors.array->b; + pcolors->a = voxarray.colors.array->a; + unsigned short *pindices = voxarray.indices.array; // 5461*6*6 = 196596 indices max per mesh int size = 0; |
