nzp-team/glquake
0
0
Fork 0
mirror of https://github.com/nzp-team/glquake.git synced 2024-11-10 06:31:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for PNG and JPEG internally

Browse source
This commit is contained in:
Ian 2023-10-11 12:55:29 -04:00
parent 0d918e6be6
commit a05cf67b4b
2 changed files with 7216 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
source/gl_draw.c
View file

@ -2228,6 +2228,26 @@ PixEncode:
return data;
}
/*small function to read files with stb_image - single-file image loader library.
** downloaded from: https://raw.githubusercontent.com/nothings/stb/master/stb_image.h
** only use jpeg+png formats, because tbh there's not much need for the others.
** */
#define STB_IMAGE_IMPLEMENTATION
#define STBI_ONLY_JPEG
#define STBI_ONLY_PNG
#include "stb_image.h"
byte* LoadSTBI(FILE *f, int width, int height)
{
int bpp;
int inwidth, inheight;
byte* image = stbi_load_from_file(f, &inwidth, &inheight, &bpp, 4);
// wtf?
image_width = inwidth;
image_height = inheight;
fclose(f);
return image;
}
byte* loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight)
{
@ -2248,16 +2268,30 @@ byte* loadimagepixels (char* filename, qboolean complain, int matchwidth, int ma
c++;
}
//Try TGA
sprintf (name, "%s.tga", basename);
COM_FOpenFile (name, &f);
if (f)
return LoadTGA (f, matchwidth, matchheight);
//Try PCX
sprintf (name, "%s.pcx", basename);
COM_FOpenFile (name, &f);
if (f)
return LoadPCX (f, matchwidth, matchheight);
//Try TGA
sprintf (name, "%s.tga", basename);
COM_FOpenFile (name, &f);
if (f)
return LoadTGA (f, matchwidth, matchheight);
//Try PNG
sprintf (name, "%s.png", basename);
COM_FOpenFile (name, &f);
if (f)
return LoadSTBI (f, matchwidth, matchheight);
//Try JPEG
sprintf (name, "%s.jpeg", basename);
COM_FOpenFile (name, &f);
if (f)
return LoadSTBI (f, matchwidth, matchheight);
sprintf (name, "%s.jpg", basename);
COM_FOpenFile (name, &f);
if (f)
return LoadSTBI (f, matchwidth, matchheight);
//if (complain)
// Con_Printf ("Couldn't load %s.tga or %s.pcx \n", filename);

7177
source/stb_image.h Normal file
View file

File diff suppressed because it is too large Load diff