+16 -14

SDL_gpu/OpenGL_common/SDL_gpuShapes_OpenGL.c

reviewed

··· 53 53 54 54 #ifdef SDL_GPU_USE_SDL2 55 55 #define GET_WINDOW(shape_renderer) ((GPU_RendererData_OpenGL*)shape_renderer->renderer->data)->window 56 56 + #define GET_ALPHA(sdl_color) (sdl_color.a) 56 57 #else 57 58 #define GET_WINDOW(shape_renderer) SDL_GetVideoSurface() 59 59 + #define GET_ALPHA(sdl_color) (sdl_color.unused) 58 60 #endif 59 61 60 62 ··· 162 164 { 163 165 BEGIN; 164 166 165 165 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 167 167 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 166 168 167 169 GLfloat glverts[3]; 168 170 ··· 179 181 { 180 182 BEGIN; 181 183 182 182 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 184 184 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 183 185 184 186 GLfloat glverts[6]; 185 187 ··· 250 252 251 253 BEGIN; 252 254 253 253 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 255 255 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 254 256 float t = startAngle; 255 257 float dt = (1 - (endAngle - startAngle)/360) * 5; // A segment every 5 degrees of a full circle 256 258 float dx, dy; ··· 350 352 351 353 BEGIN; 352 354 353 353 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 355 355 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 354 356 float t = startAngle; 355 357 float dt = (1 - (endAngle - startAngle)/360) * 5; // A segment every 5 degrees of a full circle 356 358 float dx, dy; ··· 402 404 { 403 405 BEGIN; 404 406 405 405 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 407 407 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 406 408 float t = 0; 407 409 float dt = 5; // A segment every 5 degrees of a full circle 408 410 float dx, dy; ··· 430 432 { 431 433 BEGIN; 432 434 433 433 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 435 435 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 434 436 float t = 0; 435 437 float dt = 5; // A segment every 5 degrees of a full circle 436 438 float dx, dy; ··· 475 477 { 476 478 BEGIN; 477 479 478 478 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 480 480 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 479 481 480 482 GLfloat glverts[9]; 481 483 ··· 498 500 { 499 501 BEGIN; 500 502 501 501 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 503 503 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 502 504 503 505 GLfloat glverts[9]; 504 506 ··· 521 523 { 522 524 BEGIN; 523 525 524 524 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 526 526 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 525 527 526 528 GLfloat glverts[12]; 527 529 ··· 547 549 { 548 550 BEGIN; 549 551 550 550 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 552 552 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 551 553 552 554 GLfloat glverts[12]; 553 555 ··· 586 588 587 589 BEGIN; 588 590 589 589 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 591 591 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 590 592 591 593 //int numVerts = 8 + (int(M_PI*5)+1)*4; // 8 + (15.7 + 1)*4 592 594 float glverts[120*3]; ··· 624 626 625 627 BEGIN; 626 628 627 627 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 629 629 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 628 630 629 631 //int numVerts = 8 + (int(M_PI*5)+1)*4; // 8 + (15.7 + 1)*4 630 632 float glverts[120*3]; ··· 657 659 { 658 660 BEGIN; 659 661 660 660 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 662 662 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 661 663 662 664 int numIndices = 2*n; 663 665 float glverts[numIndices*3]; ··· 677 679 { 678 680 BEGIN; 679 681 680 680 - glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, color.unused/255.5f); 682 682 + glColor4f(color.r/255.5f, color.g/255.5f, color.b/255.5f, GET_ALPHA(color)/255.5f); 681 683 682 684 int numIndices = 2*n; 683 685 float glverts[numIndices*3];

+4

SDL_gpu/OpenGL_common/SDL_gpu_OpenGL.c

reviewed

··· 1977 1977 result.r = pixels[0]; 1978 1978 result.g = pixels[1]; 1979 1979 result.b = pixels[2]; 1980 1980 + #ifdef SDL_GPU_USE_SDL2 1981 1981 + result.a = pixels[3]; 1982 1982 + #else 1980 1983 result.unused = pixels[3]; 1984 1984 + #endif 1981 1985 1982 1986 return result; 1983 1987 }

+4

SDL_gpu/SDL_gpu.c

reviewed

··· 535 535 if(color == NULL) 536 536 current_renderer->SetRGBA(current_renderer, 255, 255, 255, 255); 537 537 else 538 538 + #ifdef SDL_GPU_USE_SDL2 539 539 + current_renderer->SetRGBA(current_renderer, color->r, color->g, color->b, color->a); 540 540 + #else 538 541 current_renderer->SetRGBA(current_renderer, color->r, color->g, color->b, color->unused); 542 542 + #endif 539 543 } 540 544 541 545 void GPU_SetRGB(Uint8 r, Uint8 g, Uint8 b)