encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler warnings using Visual Studio 2019

This commit is contained in:
Sam Lantinga 2021-09-21 18:15:09 -07:00
parent ce11caa80f
commit eb3bf80f9c
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/render/opengl/SDL_render_gl.c
View File

@ -1459,7 +1459,7 @@ GL_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
} }
{ {
int j; size_t j;
float currentColor[4]; float currentColor[4];
data->glGetFloatv(GL_CURRENT_COLOR, currentColor); data->glGetFloatv(GL_CURRENT_COLOR, currentColor);
data->glBegin(GL_TRIANGLES); data->glBegin(GL_TRIANGLES);

60
test/testsprite2.c
View File

@ -188,22 +188,22 @@ MoveSprites(SDL_Renderer * renderer, SDL_Texture * sprite)
color.b = 0xFF; color.b = 0xFF;
color.a = 0xFF; color.a = 0xFF;
verts[0].position.x = temp.x; verts[0].position.x = (float)temp.x;
verts[0].position.y = temp.y; verts[0].position.y = (float)temp.y;
verts[0].color = color; verts[0].color = color;
verts[1].position.x = temp.x + temp.w; verts[1].position.x = (float)temp.x + temp.w;
verts[1].position.y = temp.y; verts[1].position.y = (float)temp.y;
verts[1].color = color; verts[1].color = color;
verts[2].position.x = temp.x + temp.w; verts[2].position.x = (float)temp.x + temp.w;
verts[2].position.y = temp.y + temp.h; verts[2].position.y = (float)temp.y + temp.h;
verts[2].color = color; verts[2].color = color;
SDL_RenderGeometry(renderer, NULL, verts, 3, NULL, 0); SDL_RenderGeometry(renderer, NULL, verts, 3, NULL, 0);
verts[1].position.x = temp.x; verts[1].position.x = (float)temp.x;
verts[1].position.y = temp.y + temp.h; verts[1].position.y = (float)temp.y + temp.h;
verts[1].color = color; verts[1].color = color;
SDL_RenderGeometry(renderer, NULL, verts, 3, NULL, 0); SDL_RenderGeometry(renderer, NULL, verts, 3, NULL, 0);
@ -289,43 +289,43 @@ MoveSprites(SDL_Renderer * renderer, SDL_Texture * sprite)
for (i = 0; i < num_sprites; ++i) { for (i = 0; i < num_sprites; ++i) {
position = &positions[i]; position = &positions[i];
/* 0 */ /* 0 */
verts->position.x = position->x; verts->position.x = (float)position->x;
verts->position.y = position->y; verts->position.y = (float)position->y;
verts->color = color; verts->color = color;
verts->tex_coord.x = 0.0f; verts->tex_coord.x = 0.0f;
verts->tex_coord.y = 0.0f; verts->tex_coord.y = 0.0f;
verts++; verts++;
/* 1 */ /* 1 */
verts->position.x = position->x + position->w; verts->position.x = (float)position->x + position->w;
verts->position.y = position->y; verts->position.y = (float)position->y;
verts->color = color; verts->color = color;
verts->tex_coord.x = 1.0f; verts->tex_coord.x = 1.0f;
verts->tex_coord.y = 0.0f; verts->tex_coord.y = 0.0f;
verts++; verts++;
/* 2 */ /* 2 */
verts->position.x = position->x + position->w; verts->position.x = (float)position->x + position->w;
verts->position.y = position->y + position->h; verts->position.y = (float)position->y + position->h;
verts->color = color; verts->color = color;
verts->tex_coord.x = 1.0f; verts->tex_coord.x = 1.0f;
verts->tex_coord.y = 1.0f; verts->tex_coord.y = 1.0f;
verts++; verts++;
/* 0 */ /* 0 */
verts->position.x = position->x; verts->position.x = (float)position->x;
verts->position.y = position->y; verts->position.y = (float)position->y;
verts->color = color; verts->color = color;
verts->tex_coord.x = 0.0f; verts->tex_coord.x = 0.0f;
verts->tex_coord.y = 0.0f; verts->tex_coord.y = 0.0f;
verts++; verts++;
/* 2 */ /* 2 */
verts->position.x = position->x + position->w; verts->position.x = (float)position->x + position->w;
verts->position.y = position->y + position->h; verts->position.y = (float)position->y + position->h;
verts->color = color; verts->color = color;
verts->tex_coord.x = 1.0f; verts->tex_coord.x = 1.0f;
verts->tex_coord.y = 1.0f; verts->tex_coord.y = 1.0f;
verts++; verts++;
/* 3 */ /* 3 */
verts->position.x = position->x; verts->position.x = (float)position->x;
verts->position.y = position->y + position->h; verts->position.y = (float)position->y + position->h;
verts->color = color; verts->color = color;
verts->tex_coord.x = 0.0f; verts->tex_coord.x = 0.0f;
verts->tex_coord.y = 1.0f; verts->tex_coord.y = 1.0f;
@ -360,36 +360,36 @@ MoveSprites(SDL_Renderer * renderer, SDL_Texture * sprite)
for (i = 0; i < num_sprites; ++i) { for (i = 0; i < num_sprites; ++i) {
position = &positions[i]; position = &positions[i];
/* 0 */ /* 0 */
verts->position.x = position->x; verts->position.x = (float)position->x;
verts->position.y = position->y; verts->position.y = (float)position->y;
verts->color = color; verts->color = color;
verts->tex_coord.x = 0.0f; verts->tex_coord.x = 0.0f;
verts->tex_coord.y = 0.0f; verts->tex_coord.y = 0.0f;
verts++; verts++;
/* 1 */ /* 1 */
verts->position.x = position->x + position->w; verts->position.x = (float)position->x + position->w;
verts->position.y = position->y; verts->position.y = (float)position->y;
verts->color = color; verts->color = color;
verts->tex_coord.x = 1.0f; verts->tex_coord.x = 1.0f;
verts->tex_coord.y = 0.0f; verts->tex_coord.y = 0.0f;
verts++; verts++;
/* 2 */ /* 2 */
verts->position.x = position->x + position->w / 2.0f; verts->position.x = (float)position->x + position->w / 2.0f;
verts->position.y = position->y + position->h / 2.0f; verts->position.y = (float)position->y + position->h / 2.0f;
verts->color = color; verts->color = color;
verts->tex_coord.x = 0.5f; verts->tex_coord.x = 0.5f;
verts->tex_coord.y = 0.5f; verts->tex_coord.y = 0.5f;
verts++; verts++;
/* 3 */ /* 3 */
verts->position.x = position->x; verts->position.x = (float)position->x;
verts->position.y = position->y + position->h; verts->position.y = (float)position->y + position->h;
verts->color = color; verts->color = color;
verts->tex_coord.x = 0.0f; verts->tex_coord.x = 0.0f;
verts->tex_coord.y = 1.0f; verts->tex_coord.y = 1.0f;
verts++; verts++;
/* 4 */ /* 4 */
verts->position.x = position->x + position->w; verts->position.x = (float)position->x + position->w;
verts->position.y = position->y + position->h; verts->position.y = (float)position->y + position->h;
verts->color = color; verts->color = color;
verts->tex_coord.x = 1.0f; verts->tex_coord.x = 1.0f;
verts->tex_coord.y = 1.0f; verts->tex_coord.y = 1.0f;