Max/nunuhara_xsystem4
1
0
Fork 0
mirror of https://github.com/nunuhara/xsystem4.git synced 2026-09-30 02:48:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use standard pixel format for CGs

Browse Source 
Don't use explicit masks.
This commit is contained in:
Nunuhara Cabbage
2019-11-21 20:39:09 -08:00
parent ee0f72ae2e
commit eef6eb5580
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qnt.c
+4 -13
View File
@@ -248,18 +248,13 @@ bool qnt_checkfmt(uint8_t *data)
*/
SDL_Surface *qnt_extract(uint8_t *data)
{
// FIXME: endianness?
uint32_t amask = 0x0;
uint32_t rmask = 0xFF;
uint32_t bmask = 0xFF00;
uint32_t gmask = 0xFF0000;
struct qnt_header *qnt = extract_header(data);
uint8_t *pixels = malloc(sizeof(uint8_t) * ((qnt->width+10) * (qnt->height+10) * 3));
extract_pixel(qnt, pixels, data + qnt->hdr_size);
if (!qnt->alpha_size)
return SDL_CreateRGBSurfaceFrom(pixels, qnt->width, qnt->height, 24, qnt->width * 3,
rmask, gmask, bmask, amask);
return SDL_CreateRGBSurfaceWithFormatFrom(pixels, qnt->width, qnt->height, 24,
qnt->width * 3, SDL_PIXELFORMAT_RGB24);
// combine color/alpha data
uint8_t *alpha = malloc(sizeof(uint8_t) * ((qnt->width+10) * (qnt->height+10)));
@@ -274,11 +269,7 @@ SDL_Surface *qnt_extract(uint8_t *data)
free(alpha);
free(pixels);
pixels = tmp;
amask = 0xFF;
rmask = 0xFF00;
gmask = 0xFF0000;
bmask = 0xFF000000;
return SDL_CreateRGBSurfaceFrom(pixels, qnt->width, qnt->height, 32, qnt->width * 4,
rmask, gmask, bmask, amask);
return SDL_CreateRGBSurfaceWithFormatFrom(pixels, qnt->width, qnt->height, 32,
qnt->width * 4, SDL_PIXELFORMAT_ARGB32);
}
sdl_draw.c
+1 -1
View File
@@ -39,7 +39,7 @@ void sdl_update_screen(void)
SDL_Surface *sdl_make_rectangle(int w, int h, SDL_Color *color)
{
Rectangle rect = { .x = 0, .y = 0, .w = w, .h = w };
SDL_Surface *s = SDL_CreateRGBSurface(0, w, h, 32, 0xFF00, 0xFF0000, 0xFF000000, 0xFF);
SDL_Surface *s = SDL_CreateRGBSurfaceWithFormat(0, w, h, 32, SDL_PIXELFORMAT_ARGB32);
uint32_t c = SDL_MapRGBA(s->format, color->r, color->g, color->b, color->a);
SDL_FillRect(s, &rect, c);
return s;