Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graphics: actually that seems to indicate A is after RGB

This commit is contained in:
K. Lange 2020-03-27 23:03:31 +09:00
parent d6ed670213
commit 2fbf92329d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/graphics.c
View File

@ -429,7 +429,7 @@ int load_sprite(sprite_t * sprite, char * filename) {
sprite->bitmap = malloc(sizeof(uint32_t) * width * height);
sprite->masks = NULL;
int bgr = ((unsigned char *)&bufferi[13])[2] == 0xFF;
int alpha_after = ((unsigned char *)&bufferi[13])[2] == 0xFF;
#define _BMP_A 0x1000000
#define _BMP_R 0x1
@ -445,16 +445,16 @@ int load_sprite(sprite_t * sprite, char * filename) {
color = (bufferb[i + 3 * x] & 0xFF) +
(bufferb[i+1 + 3 * x] & 0xFF) * 0x100 +
(bufferb[i+2 + 3 * x] & 0xFF) * 0x10000 + 0xFF000000;
} else if (bpp == 32 && bgr == 0) {
} else if (bpp == 32 && alpha_after == 0) {
color = (bufferb[i + 4 * x] & 0xFF) * _BMP_A +
(bufferb[i+1 + 4 * x] & 0xFF) * _BMP_R +
(bufferb[i+2 + 4 * x] & 0xFF) * _BMP_G +
(bufferb[i+3 + 4 * x] & 0xFF) * _BMP_B;
color = premultiply(color);
} else if (bpp == 32 && bgr == 1) {
color = (bufferb[i + 4 * x] & 0xFF) * _BMP_B +
} else if (bpp == 32 && alpha_after == 1) {
color = (bufferb[i + 4 * x] & 0xFF) * _BMP_R +
(bufferb[i+1 + 4 * x] & 0xFF) * _BMP_G +
(bufferb[i+2 + 4 * x] & 0xFF) * _BMP_R +
(bufferb[i+2 + 4 * x] & 0xFF) * _BMP_B +
(bufferb[i+3 + 4 * x] & 0xFF) * _BMP_A;
color = premultiply(color);
} else {