MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid local variable shadowing

Browse Source
This commit is contained in:
stickm4n 2023-02-11 22:21:11 -05:00
parent 4647441ad8
commit 7884666136
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/rmodels.c
View File

@ -4287,10 +4287,10 @@ static Model LoadIQM(const char *fileName)
for (unsigned int m = 0; m < iqmHeader->num_meshes; m++) for (unsigned int m = 0; m < iqmHeader->num_meshes; m++)
{ {
int vCounter = 0; int vCounter = 0;
for (unsigned int i = imesh[m].first_vertex*3; i < (imesh[m].first_vertex + imesh[m].num_vertexes)*3; i++) for (unsigned int j = imesh[m].first_vertex*3; j < (imesh[m].first_vertex + imesh[m].num_vertexes)*3; j++)
{ {
model.meshes[m].vertices[vCounter] = vertex[i]; model.meshes[m].vertices[vCounter] = vertex[j];
model.meshes[m].animVertices[vCounter] = vertex[i]; model.meshes[m].animVertices[vCounter] = vertex[j];
vCounter++; vCounter++;
} }
} }
@ -4305,10 +4305,10 @@ static Model LoadIQM(const char *fileName)
for (unsigned int m = 0; m < iqmHeader->num_meshes; m++) for (unsigned int m = 0; m < iqmHeader->num_meshes; m++)
{ {
int vCounter = 0; int vCounter = 0;
for (unsigned int i = imesh[m].first_vertex*3; i < (imesh[m].first_vertex + imesh[m].num_vertexes)*3; i++) for (unsigned int j = imesh[m].first_vertex * 3; j < (imesh[m].first_vertex + imesh[m].num_vertexes) * 3; j++)
{ {
model.meshes[m].normals[vCounter] = normal[i]; model.meshes[m].normals[vCounter] = normal[j];
model.meshes[m].animNormals[vCounter] = normal[i]; model.meshes[m].animNormals[vCounter] = normal[j];
vCounter++; vCounter++;
} }
} }
@ -4323,9 +4323,9 @@ static Model LoadIQM(const char *fileName)
for (unsigned int m = 0; m < iqmHeader->num_meshes; m++) for (unsigned int m = 0; m < iqmHeader->num_meshes; m++)
{ {
int vCounter = 0; int vCounter = 0;
for (unsigned int i = imesh[m].first_vertex*2; i < (imesh[m].first_vertex + imesh[m].num_vertexes)*2; i++) for (unsigned int j = imesh[m].first_vertex * 2; j < (imesh[m].first_vertex + imesh[m].num_vertexes) * 2; j++)
{ {
model.meshes[m].texcoords[vCounter] = text[i]; model.meshes[m].texcoords[vCounter] = text[j];
vCounter++; vCounter++;
} }
} }
@ -4340,9 +4340,9 @@ static Model LoadIQM(const char *fileName)
for (unsigned int m = 0; m < iqmHeader->num_meshes; m++) for (unsigned int m = 0; m < iqmHeader->num_meshes; m++)
{ {
int boneCounter = 0; int boneCounter = 0;
for (unsigned int i = imesh[m].first_vertex*4; i < (imesh[m].first_vertex + imesh[m].num_vertexes)*4; i++) for (unsigned int j = imesh[m].first_vertex * 4; j < (imesh[m].first_vertex + imesh[m].num_vertexes) * 4; j++)
{ {
model.meshes[m].boneIds[boneCounter] = blendi[i]; model.meshes[m].boneIds[boneCounter] = blendi[j];
boneCounter++; boneCounter++;
} }
} }
@ -4357,9 +4357,9 @@ static Model LoadIQM(const char *fileName)
for (unsigned int m = 0; m < iqmHeader->num_meshes; m++) for (unsigned int m = 0; m < iqmHeader->num_meshes; m++)
{ {
int boneCounter = 0; int boneCounter = 0;
for (unsigned int i = imesh[m].first_vertex*4; i < (imesh[m].first_vertex + imesh[m].num_vertexes)*4; i++) for (unsigned int j = imesh[m].first_vertex * 4; j < (imesh[m].first_vertex + imesh[m].num_vertexes) * 4; j++)
{ {
model.meshes[m].boneWeights[boneCounter] = blendw[i]/255.0f; model.meshes[m].boneWeights[boneCounter] = blendw[j] / 255.0f;
boneCounter++; boneCounter++;
} }
} }
@ -4376,9 +4376,9 @@ static Model LoadIQM(const char *fileName)
model.meshes[m].colors = RL_CALLOC(model.meshes[m].vertexCount*4, sizeof(unsigned char)); model.meshes[m].colors = RL_CALLOC(model.meshes[m].vertexCount*4, sizeof(unsigned char));
int vCounter = 0; int vCounter = 0;
for (unsigned int i = imesh[m].first_vertex*4; i < (imesh[m].first_vertex + imesh[m].num_vertexes)*4; i++) for (unsigned int j = imesh[m].first_vertex * 4; j < (imesh[m].first_vertex + imesh[m].num_vertexes) * 4; j++)
{ {
model.meshes[m].colors[vCounter] = color[i]; model.meshes[m].colors[vCounter] = color[j];
vCounter++; vCounter++;
} }
} }

36
src/rtextures.c
View File

@ -1115,11 +1115,11 @@ void ImageFormat(Image *image, int newFormat)
{ {
image->data = (unsigned char *)RL_MALLOC(image->width*image->height*3*sizeof(unsigned char)); image->data = (unsigned char *)RL_MALLOC(image->width*image->height*3*sizeof(unsigned char));
for (int i = 0, k = 0; i < image->width*image->height*3; i += 3, k++) for (int i = 0, j = 0; i < image->width * image->height * 3; i += 3, j++)
{ {
((unsigned char *)image->data)[i] = (unsigned char)(pixels[k].x*255.0f); ((unsigned char *)image->data)[i] = (unsigned char)(pixels[j].x * 255.0f);
((unsigned char *)image->data)[i + 1] = (unsigned char)(pixels[k].y*255.0f); ((unsigned char *)image->data)[i + 1] = (unsigned char)(pixels[j].y * 255.0f);
((unsigned char *)image->data)[i + 2] = (unsigned char)(pixels[k].z*255.0f); ((unsigned char *)image->data)[i + 2] = (unsigned char)(pixels[j].z * 255.0f);
} }
} break; } break;
case PIXELFORMAT_UNCOMPRESSED_R5G5B5A1: case PIXELFORMAT_UNCOMPRESSED_R5G5B5A1:
@ -1166,12 +1166,12 @@ void ImageFormat(Image *image, int newFormat)
{ {
image->data = (unsigned char *)RL_MALLOC(image->width*image->height*4*sizeof(unsigned char)); image->data = (unsigned char *)RL_MALLOC(image->width*image->height*4*sizeof(unsigned char));
for (int i = 0, k = 0; i < image->width*image->height*4; i += 4, k++) for (int i = 0, j = 0; i < image->width * image->height * 4; i += 4, j++)
{ {
((unsigned char *)image->data)[i] = (unsigned char)(pixels[k].x*255.0f); ((unsigned char *)image->data)[i] = (unsigned char)(pixels[j].x * 255.0f);
((unsigned char *)image->data)[i + 1] = (unsigned char)(pixels[k].y*255.0f); ((unsigned char *)image->data)[i + 1] = (unsigned char)(pixels[j].y * 255.0f);
((unsigned char *)image->data)[i + 2] = (unsigned char)(pixels[k].z*255.0f); ((unsigned char *)image->data)[i + 2] = (unsigned char)(pixels[j].z * 255.0f);
((unsigned char *)image->data)[i + 3] = (unsigned char)(pixels[k].w*255.0f); ((unsigned char *)image->data)[i + 3] = (unsigned char)(pixels[j].w * 255.0f);
} }
} break; } break;
case PIXELFORMAT_UNCOMPRESSED_R32: case PIXELFORMAT_UNCOMPRESSED_R32:
@ -1189,23 +1189,23 @@ void ImageFormat(Image *image, int newFormat)
{ {
image->data = (float *)RL_MALLOC(image->width*image->height*3*sizeof(float)); image->data = (float *)RL_MALLOC(image->width*image->height*3*sizeof(float));
for (int i = 0, k = 0; i < image->width*image->height*3; i += 3, k++) for (int i = 0, j = 0; i < image->width * image->height * 3; i += 3, j++)
{ {
((float *)image->data)[i] = pixels[k].x; ((float *)image->data)[i] = pixels[j].x;
((float *)image->data)[i + 1] = pixels[k].y; ((float *)image->data)[i + 1] = pixels[j].y;
((float *)image->data)[i + 2] = pixels[k].z; ((float *)image->data)[i + 2] = pixels[j].z;
} }
} break; } break;
case PIXELFORMAT_UNCOMPRESSED_R32G32B32A32: case PIXELFORMAT_UNCOMPRESSED_R32G32B32A32:
{ {
image->data = (float *)RL_MALLOC(image->width*image->height*4*sizeof(float)); image->data = (float *)RL_MALLOC(image->width*image->height*4*sizeof(float));
for (int i = 0, k = 0; i < image->width*image->height*4; i += 4, k++) for (int i = 0, j = 0; i < image->width * image->height * 4; i += 4, j++)
{ {
((float *)image->data)[i] = pixels[k].x; ((float *)image->data)[i] = pixels[j].x;
((float *)image->data)[i + 1] = pixels[k].y; ((float *)image->data)[i + 1] = pixels[j].y;
((float *)image->data)[i + 2] = pixels[k].z; ((float *)image->data)[i + 2] = pixels[j].z;
((float *)image->data)[i + 3] = pixels[k].w; ((float *)image->data)[i + 3] = pixels[j].w;
} }
} break; } break;
default: break; default: break;